Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

src/api/process.js

@@ -804,3 +804,223 @@ export function upFile(data) {
     data
   })
 }
+// 工作组协会信息数据统计导出
+export function exportAssocInfos(params) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-assoc-info/exportAllAssocInfos',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组参与外部标准制修订信息统计导出
+export function exportAllWbxds(params) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-wbxd/exportAllWbxds',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组委员信息数据统计导出
+export function exportAllCommiInfos(params) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-commi-info/exportAllCommiInfos',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组协会费用信息统计导出
+export function exportAllAssocCosts(params) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-assoc-cost/exportAllAssocCosts',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组参与外部协会会议统计导出
+export function exportAllWbtjs(params) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-wbtj/exportAllWbtjs',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组参会费用信息统计导出
+export function exportAllMeetCosts(params) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-meet-cost/exportAllMeetCosts',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组采购费用信息统计导出
+export function exportAllCgfys(params) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-cgfy/exportAllCgfys',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组参与外部标准制修订费用统计导出
+export function exportAllExReviseCost(params) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-ex-revise-cost/exportAllExReviseCost',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组翻译费用信息统计导出
+export function exportAllFyfys(params) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-fyfy/exportAllFyfys',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组标准制修订补助资金收支统计收入表导出
+export function exportAllSrbs(params) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-srb/exportAllSrbs',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 工作组标准制修订补助资金收支统计支出表导出
+export function exportAllZcbs(params) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-zcb/exportAllZcbs',
+    params,
+    method: 'get',
+    responseType: 'blob',
+    header: {
+      'content-type': 'application/x-www-form-urlencoded'
+    }
+  })
+}
+// 协会信息数据统计导入
+export function importAllAssocInfos(data) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-assoc-info/importAllAssocInfos',
+    method: 'post',
+    data
+  })
+}
+// 委员信息数据统计导入
+export function importAllCommiInfos(data) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-commi-info/importAllCommiInfos',
+    method: 'post',
+    data
+  })
+}
+// 参与外部协会会议统计导入
+export function importAllAllWbtjs(data) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-wbtj/importAllAllWbtjs',
+    method: 'post',
+    data
+  })
+}
+// 参与外部标准制修订信息统计导入
+export function importAllWbxds(data) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-wbxd/importAllWbxds',
+    method: 'post',
+    data
+  })
+}
+// 协会费用信息统计导入
+export function importAssocCosts(data) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-assoc-cost/importAssocCosts',
+    method: 'post',
+    data
+  })
+}
+//参会费用信息统计导入
+export function importMeetCost(data) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-meet-cost/importMeetCost',
+    method: 'post',
+    data
+  })
+}
+//参与外部标准制修订费用统计导入
+export function importExReviseCost(data) {
+  return axios({
+    url: '/api/wgdCensusZ/wgd-ex-revise-cost/importExReviseCost',
+    method: 'post',
+    data
+  })
+}
+//采购费用信息统计导入
+export function importAllCgfys(data) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-cgfy/importAllCgfys',
+    method: 'post',
+    data
+  })
+}
+//翻译费用信息统计导入
+export function importAllFyfys(data) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-fyfy/importAllFyfys',
+    method: 'post',
+    data
+  })
+}
+//标准制修订补助资金收支统计收入表导入
+export function importAllSrbs(data) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-srb/importAllSrbs',
+    method: 'post',
+    data
+  })
+}
+//标准制修订补助资金收支统计支出表导入
+export function importAllZcbs(data) {
+  return axios({
+    url: '/api/wgdCensusLeo/wgd-zcb/importAllZcbs',
+    method: 'post',
+    data
+  })
+}

src/components/CustomFormComponents/Input.vue

@@ -62,6 +62,9 @@ export default {
       const value = event
       this.$emit('input', value)
     }
+  },
+  mounted() {
+    console.log(this.config);
   }
 }
 </script>

src/components/CustomFormComponents/InputForStandardsForForeign.vue

@@ -254,7 +254,7 @@ export default {
         this.quoteIdList1 = []
         this.replaceLawsNumForm.quoteIdList = ''
       }
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', this.replaceLawsNumForm, {
         _this: this,
         loading: 'replaceLoading'
       }, res => {

src/components/mechanismTree/index.vue

@@ -49,7 +49,6 @@
         <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="handleTreeDrawerCancel">取消
         </el-button>
       </div>
@@ -103,15 +102,13 @@ export default {
     }
   },
   methods: {
-    treeClass() {
-
-    },
     handleTreeDrawerCancel() {
       this.filterText = ''
       this.isVisible2 = false
     },
     saveUserInfo() {
       let arr = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+        this.filterText = ''
       this.isVisible2 = false
       this.$emit('checkedRole', arr)
     },

src/components/phoneHistortTable/index.vue

@@ -88,6 +88,8 @@
     }
 </script>
 
-<style scoped>
+<style lang="less" scoped>
-
+.phoneHistortTable{
+  height: 100%;
+}
 </style>

src/components/roleTree/index.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="roleTree">
         <el-drawer
-                :title="isTitle"
+            :title="isTitle"
-                :visible.sync="isVisible2"
+            :visible.sync="visible"
-                :wrapperClosable="false"
+            :wrapperClosable="false"
-                @close="handleTreeDrawerCancel"
+            @close="handleTreeDrawerCancel"
-                size="400px">
+            size="460px">
             <el-form
                     ref="attributeEO"
                     class="label-input-form"
@@ -22,7 +22,7 @@
             </el-form>
             <div class="divTree">
                 <el-tree
-                        v-if="open1 && isVisible2"
+                        v-if="open1 && isVisible"
                         node-key="id"
                         style="height: 100%; overflow: auto;"
                         class="filter-tree tree-line"
@@ -30,7 +30,7 @@
                         @check-change="checkChange"
                         :data="treeData"
                         :props="defaultProps"
-                        :default-checked-keys="nodeList"
+                        :default-checked-keys="nodeList2"
                         highlight-current
                         check-strictly
                         @check="drawerCheck"
@@ -45,7 +45,7 @@
                   </span>
                 </el-tree>
                 <el-tree
-                        v-if="!open1 && isVisible2"
+                        v-if="!open1 && isVisible"
                         node-key="id"
                         style="height: 100%; overflow: auto;"
                         class="filter-tree tree-line"
@@ -53,7 +53,7 @@
                         :data="treeData1"
                         :props="defaultProps"
                         @check-change="checkChange2"
-                        :default-checked-keys="nodeList"
+                        :default-checked-keys="nodeList2"
                         highlight-current
                         check-strictly
                         @check="drawerCheck"
@@ -78,11 +78,11 @@
                             closable>
                         {{tag.name}}
                     </el-tag>
-                    <el-tag v-show="delList.length > 0" type="danger" closable size="mini" @close="handleCloseAll()">全部删除</el-tag>
+                    <el-tag v-show="delList.length > 0 && !checkBox" type="danger" closable size="mini" @close="handleCloseAll()">全部删除</el-tag>
                 </div>
             </div>
             <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 :disabled="delList.length < 1" 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="handleTreeDrawerCancel">取消</el-button>
             </div>
@@ -124,9 +124,10 @@
         },
         data () {
             return {
+                visible: false,
+                nodeList2: [],
                 delList: [],
                 roleList: [],
-                isVisible2: false,
                 filterText: '',
                 defaultProps: {
                     children: 'children',
@@ -146,14 +147,24 @@
         },
         methods: {
             handleClose (tag) {
+                let arr = []
                 for (let a = 0; a < this.delList.length; a++) {
                     if (tag.id === this.delList[a].id) {
                         this.delList.splice(a, 1)
                     }
                 }
-                for (let b = 0; b < this.nodeList.length; b++) {
+                this.delList.map(item => {
-                    if (tag.id === this.nodeList[b]) {
+                    arr.push(item)
-                        this.nodeList.splice(b, 1)
+                })
+                this.$refs.tree.setCheckedKeys(arr);
+                for (let b = 0; b < this.nodeList2.length; b++) {
+                    if (tag.id === this.nodeList2[b]) {
+                        this.nodeList2.splice(b, 1)
+                    }
+                }
+                for (let c = 0; c < this.roleList.length; c++) {
+                    if (tag.id === this.roleList[c].id) {
+                        this.roleList.splice(c, 1)
                     }
                 }
             },
@@ -166,7 +177,9 @@
                     cancelButtonText: '取消',
                 }).then(() => {
                     this.delList = []
-                    this.nodeList = []
+                    this.nodeList2 = []
+                    this.roleList = []
+                    this.$refs.tree.setCheckedKeys([]);
                 }).catch(() => {
                         this.$message({
                             type: 'info',
@@ -193,11 +206,17 @@
                 if (this.checkBox) {
                 } else {
                     if (type) {
-                        this.nodeList.push(row.id)
+                        this.nodeList2.push(row.id)
+                        this.delList.push(row)
                     } else {
-                        for (let a = 0; a < this.nodeList.length; a ++) {
+                        for (let a = 0; a < this.nodeList2.length; a ++) {
-                            if (row.id === this.nodeList[a]) {
+                            if (row.id === this.nodeList2[a]) {
-                                this.nodeList.splice(a, 1)
+                                this.nodeList2.splice(a, 1)
+                            }
+                        }
+                        for (let b = 0; b < this.delList.length; b++) {
+                            if (row.id === this.delList[b].id) {
+                                this.delList.splice(b, 1)
                             }
                         }
                     }
@@ -207,30 +226,36 @@
                 if (this.checkBox) {
                 } else {
                     if (type) {
-                        this.nodeList.push(row.id)
+                        this.nodeList2.push(row.id)
+                        this.delList.push(row)
                     } else {
-                        for (let a = 0; a < this.nodeList.length; a ++) {
+                        for (let a = 0; a < this.nodeList2.length; a++) {
-                            if (row.id === this.nodeList[a]) {
+                            if (row.id === this.nodeList2[a]) {
-                                this.nodeList.splice(a, 1)
+                                this.nodeList2.splice(a, 1)
+                            }
+                        }
+                        for (let b = 0; b < this.delList.length; b++) {
+                            if (row.id === this.delList[b].id) {
+                                this.delList.splice(b, 1)
                             }
                         }
                     }
                 }
-
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
-                this.isVisible2 = false
                 this.open1 = true
+                this.visible = false
             },
             saveUserInfo () {
                 if (this.checkBox) {
-                    this.isVisible2 = false
                     this.$emit('checkedRole', this.roleList)
+                    this.nodeList2 = []
+                    this.$emit('update:isVisible', false)
                 } else {
-                    if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
+                    if (this.nodeList2.length > 0 && this.nodeList2[0].length !== 0) {
                         let ids = ''
-                        this.nodeList.forEach(item => {
+                        this.nodeList2.forEach(item => {
                             if (ids.length > 0) {
                                 ids += ','
                                 ids += item
@@ -243,12 +268,14 @@
                         }, {
                             _this: this
                         }, res => {
-                            this.isVisible2 = false
                             this.$emit('checkedRole', res)
+                            this.nodeList2 = []
+                            this.$emit('update:isVisible', false)
                         })
                     } else {
-                        this.isVisible2 = false
                         this.$emit('checkedRole', this.roleList)
+                        this.nodeList2 = []
+                        this.$emit('update:isVisible', false)
                     }
                 }
                 this.open1 = true
@@ -261,10 +288,13 @@
                         this.$refs.tree.setCheckedKeys([])
                         this.$refs.tree.setCheckedKeys([data.id])
                         this.roleList = [data]
+                        this.delList = [data]
                     } else if (getlist.length === 0) {
                         this.roleList = [{}]
+                        this.delList = []
                     } else if (getlist.length === 1) {
                         this.roleList = [data]
+                        this.delList = [data]
                     }
                 } else { // 多选
                     this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
@@ -294,12 +324,13 @@
         },
         watch: {
             isVisible (val) {
-                this.isVisible2 = val
+                this.visible = val
                 if (val) {
-                    if (this.nodeList.length > 0 && this.nodeList[0].length !== 0) {
+                    this.nodeList2 = this.nodeList
+                    if (this.nodeList2.length && this.nodeList2[0].length) {
                         let ids = ''
-                        this.nodeList.forEach(item => {
+                        this.nodeList2.forEach(item => {
-                            if (ids.length > 0) {
+                            if (ids.length) {
                                 ids += ','
                                 ids += item
                             } else {
@@ -320,9 +351,9 @@
                     this.delList = []
                 }
             },
-            isVisible2 (val) {
+            visible(val) {
                 this.$emit('update:isVisible', val)
-            },
+            }
         },
         mounted () {
             this.getTree()
@@ -348,6 +379,7 @@
             flex-wrap: wrap;
             overflow: auto;
             margin: 10px;
+           align-content: flex-start;
             span {
                 margin: 0px 5px 5px 0;
             }

src/components/workTree/index.vue

@@ -175,6 +175,7 @@ export default {
       this.filterText = ''
       this.isVisible2 = false
       this.open1 = true
+      this.nodeList = []
     },
     saveUserInfo () {
       if (this.checkBox) {

src/pages/config/pages/attributeCustom/components/laws.vue

@@ -282,7 +282,7 @@
 </template>
 
 <script>
-const sarType = 'LAWS_STAND'
+const sarType = 'FOREIGN_LAWS'
 export default {
   name: 'attribute-custom',
   data () {
@@ -352,7 +352,7 @@ export default {
         showRegionId: '',
         selVal: '',
         isSearch: '1',
-        sarType: 'LAWS_STAND',
+        sarType: 'FOREIGN_LAWS',
         isWarn: '1'
       },
       attrTypeOptions: [
@@ -367,12 +367,12 @@ export default {
       ],
       sarTypeOptions: [
         // { label: '国内政策', value: 'INLAND_LAWS' },
-        { label: '国内外政策', value: 'LAWS_STAND' }
+        { label: '国内外政策', value: 'FOREIGN_LAWS' }
         // { label: '国内外政策', value: 'LAWS' }
       ],
       sarTypeLocationOptions: [
         // { label: '国内政策', value: 'INLAND_LAWS' },
-        { label: '国内外政策', value: 'LAWS_STAND' }
+        { label: '国内外政策', value: 'FOREIGN_LAWS' }
       ],
       isMustOptions: [
         { label: '是', value: '0' },
@@ -710,7 +710,7 @@ export default {
       let texts = ''
       if (type === 'INLAND_LAWS') {
         texts = '国内政策'
-      } else if (type === 'LAWS_STAND') {
+      } else if (type === 'FOREIGN_LAWS') {
         texts = '国内外政策'
       } else if (type === 'LAWS') {
         texts = '国内外通用政策'

src/pages/config/pages/mechanismManage/index.vue

@@ -9,6 +9,9 @@
         <el-tab-pane label="工作组" name="workgroup">
           <workgroup></workgroup>
         </el-tab-pane>
+        <el-tab-pane label="技术委员会" name="committee">
+          <committee></committee>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -16,11 +19,13 @@
 <script>
 import workgroup from "@/pages/config/pages/mechanismManage/pages/workgroup";
 import mechanism from "@/pages/config/pages/mechanismManage/pages/mechanism";
+import committee from "@/pages/config/pages/mechanismManage/pages/committee"
 export default {
   name: 'MechanismManage',
   components: {
     workgroup,
     mechanism,
+    committee
   },
   data () {
     return {

src/pages/config/pages/mechanismManage/pages/committee.vue

@@ -0,0 +1,425 @@
+<template>
+  <div id="committee">
+    <div class="committee-content">
+      <div class="search-area">
+        <el-form :model="committeeSearch" inline class="label-input-form">
+          <el-form-item label="委员会名称" class="search-item">
+            <el-input v-model="committeeSearch.committeeName"
+                      placeholder="请输入委员会名称"
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-primary" type="primary" size="mini" @click="search"
+                       v-btn-permission="">查询
+            </el-button>
+          </el-form-item>
+          <el-form-item label="" class="search-item btn-box">
+            <el-button class="common-button-default" @click="resetSelect" size="mini"
+                       v-btn-permission="">清空
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="table-content">
+        <div class="table-button">
+          <el-button type="primary" size="mini"
+                     class="common-button-primary" @click="committeeAdd">
+            新增
+          </el-button>
+          <el-button type="primary" size="mini"
+                     class="common-button-primary" @click="committeeEdit">
+            编辑
+          </el-button>
+          <el-button type="primary" size="mini"
+                     class="common-button-primary" @click="committeeDel">
+            批量删除
+          </el-button>
+        </div>
+        <el-table
+          ref="committee"
+          tooltip-effect="dark"
+          style="width: 100%; flex: auto;"
+          :data="committeeData"
+          @selection-change="committeeChange"
+          border
+          class="drag-table"
+
+          height="100%"
+          :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
+            prop="committeeName"
+            align="center"
+            label="委员会名称"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="committeeDirectorName"
+            label="主任"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="committeeSecretaryName"
+            align="center"
+            label="秘书长">
+          </el-table-column>
+          <el-table-column
+            prop="committor"
+            align="center"
+            label="委员">
+          </el-table-column>
+        </el-table>
+        <loading :loading="Loading">加载中...</loading>
+        <pagination :page="page" :total="total" :pageSize="pageSize" @pageChange="pageChange"
+                    @pageSizeChange="pageSizeChange"></pagination>
+      </div>
+      <el-dialog
+        :title="dialogTitle"
+        :visible.sync="addModel"
+        :wrapperClosable="false"
+        @close="cancelModel"
+        width="800px"
+      >
+        <div class="myDialog">
+          <el-form
+            ref="addForm"
+            :model="addForm"
+            :rules="addFormRules"
+            class="label-input-form"
+
+          >
+            <el-form-item label="委员会名称" prop="committeeName" label-width="100px" class="add-form-item">
+              <el-input v-model="addForm.committeeName"
+                        placeholder="请输入委员会名称"
+                        clearable></el-input>
+            </el-form-item>
+            <el-form-item label="主任" prop="committeeDirector" label-width="100px" class="add-form-item">
+              <el-input
+                v-model="addForm.committeeDirectorName"
+                placeholder="请选择主任"
+                @click.native="choiceZRR('committeeDirector', '选择主任', addForm.committeeDirector)"
+              />
+            </el-form-item>
+            <el-form-item label="秘书长" prop="committeeSecretary" label-width="100px" class="add-form-item">
+              <el-input v-model="addForm.committeeSecretaryName"
+                        placeholder="请选择秘书长"
+                        @click.native="choiceZRR('committeeSecretary', '选择秘书长', addForm.committeeSecretary)"
+                        clearable></el-input>
+            </el-form-item>
+            <el-form-item label="委员" prop="committor" label-width="100px" class="add-form-item">
+              <el-input v-model="addForm.committor"
+                        placeholder="请选择委员"
+                        @click.native="choiceZRRS"
+                        clearable></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div slot="footer">
+          <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelModel">取消</el-button>
+          <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="addOk">确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <!--    单选人-->
+      <Role-tree
+        check-box
+        :is-title="drawerTitle"
+        :is-visible.sync="modalshowflag"
+        @checkedRole="drawerCheck"
+        :nodeList="nodeList"
+      ></Role-tree>
+      <!--    多选择人-->
+      <Role-tree
+        is-title="选择委员"
+        :is-visible.sync="modalshowflag2"
+        @checkedRole="drawerCheck2"
+        :nodeList="nodeList2"
+      ></Role-tree>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "committee",
+  data() {
+    return {
+      nodeList: [],
+      nodeList2: [],
+      drawerTitle: "",
+      modalshowflag: false,
+      modalshowflag2: false,
+      Loading: false, //加载loading
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      committeeSearch: {
+        committeeName: "", //委员会名称
+      },
+      addForm: {
+        committeeName: "", //委员会名称
+        committeeDirector: "", //主任
+        committeeDirectorName: "", //主任
+        committeeSecretary: "", //秘书长
+        committeeSecretaryName: "", //秘书长
+        committor: "", //委员
+        committeeIds: "" //委员
+      },
+      addFormRules: {
+        committeeName: [
+          { required: true, message: "请输入委员会名称", trigger: "blur" }
+        ],
+        committeeDirectorName: [
+          { required: true, message: "请填写主任", trigger: "blur" }
+        ],
+        committeeSecretaryName: [
+          { required: true, message: "请填写秘书长", trigger: "blur" }
+        ],
+        committor: [
+          { required: true, message: "请填写委员", trigger: "blur" }
+        ]
+
+      },
+      committeeData: [],
+      dialogTitle: "", //新增/编辑框的title
+      addModel: false,
+      committeeChangeList: []
+    };
+  },
+  mounted() {
+    //获取委员会数据
+    this.getCommittee();
+  },
+  methods: {
+    getCommittee() {
+      this.$http.get("wgCommittee/wg-committee/page", {
+        ...this.committeeSearch,
+        page: this.page,
+        pageSize: this.pageSize
+      }, {
+        _this: this
+      }, res => {
+        this.committeeData = res.data.records;
+        this.total = res.data.total;
+      });
+
+    },
+    //查询
+    search() {
+      this.page = 1
+      this.getCommittee();
+    },
+    //清空
+    resetSelect() {
+      this.committeeSearch = {
+        committeeName: "", //委员会名称
+      };
+      this.getCommittee();
+    },
+    //新增
+    committeeAdd() {
+      this.dialogTitle = "新增";
+      this.addForm =  {
+        committeeName: "", //委员会名称
+        committeeDirector: "", //主任
+        committeeDirectorName: "", //主任
+        committeeSecretary: "", //秘书长
+        committeeSecretaryName: "", //秘书长
+        committor: "", //委员
+        committeeIds: "" //委员
+      }
+      this.addModel = true;
+    },
+    //编辑
+    committeeEdit() {
+      if (!this.committeeChangeList.length) {
+        this.$message.warning("请至少选择一条数据进行编辑");
+      } else if (this.committeeChangeList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行编辑");
+      } else {
+        this.dialogTitle = "编辑";
+        this.addModel = true;
+        this.addForm.id = this.committeeChangeList[0].id;
+        this.addForm.committeer = this.committeeChangeList[0].committeer;
+        this.addForm.committeeName = this.committeeChangeList[0].committeeName;
+        this.addForm.committor = this.committeeChangeList[0].committor;
+        this.addForm.committeeIds = this.committeeChangeList[0].committorId;
+        this.addForm.committeeDirector = this.committeeChangeList[0].committeeDirector;
+        this.addForm.committeeDirectorName = this.committeeChangeList[0].committeeDirectorName;
+        this.addForm.committeeSecretary = this.committeeChangeList[0].committeeSecretary;
+        this.addForm.committeeSecretaryName = this.committeeChangeList[0].committeeSecretaryName;
+      }
+    },
+    //批量删除
+    committeeDel() {
+      if (this.committeeChangeList.length) {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if(this.committeeChangeList.length === 1){
+            let ids =  this.committeeChangeList[0].id
+            this.$http.delete('wgCommittee/wg-committee/deleteBatch',{
+              id: ids,
+            }, {
+              _this: this
+            }, res => {
+              if(res.ok){
+                this.$message.success('删除成功')
+                this.getCommittee()
+              }
+              this.$refs.committee.clearSelection()
+            })
+          }else{
+            let ids = ''
+            this.committeeChangeList.forEach(item => {
+              ids += item.id
+              ids += ','
+            })
+            this.$http.delete('wgCommittee/wg-committee/deleteBatch',{
+              id: ids,
+            }, {
+              _this: this
+            }, res => {
+              if(res.ok){
+                this.$message.success('删除成功')
+                this.getCommittee()
+              }
+              this.$refs.committee.clearSelection()
+            })
+          }
+        }).catch(() => {
+        });
+      } else {
+        this.$message.warning("请至少选择一条数据进行删除");
+      }
+    },
+    //取消新增
+    cancelModel() {
+      this.addModel = false;
+      this.addForm =  {
+          committeeName: "", //委员会名称
+          committeeDirector: "", //主任
+          committeeDirectorName: "", //主任
+          committeeSecretary: "", //秘书长
+          committeeSecretaryName: "", //秘书长
+          committor: "", //委员
+          committeeIds: "" //委员
+      }
+    },
+    //确定新增
+    addOk() {
+      this.$refs["addForm"].validate((valid) => {
+        if (valid) {
+          if (this.dialogTitle === "新增") {
+            this.$http.post("wgCommittee/wg-committee/insert", {
+              ...this.addForm
+            }, {
+              _this: this
+            }, res => {
+              if(res.message === '新增成功'){
+                this.getCommittee();
+                this.addModel = false;
+              }
+            });
+          } else {
+            this.$http.put("wgCommittee/wg-committee/update", {
+              ...this.addForm
+            }, { _this: this },
+              res => {
+              if(res.ok){
+                this.getCommittee();
+                this.addModel = false;
+              }
+            });
+
+          }
+        } else {
+          this.$message.warning("请填写完整信息");
+        }
+      });
+
+    },
+    //表格数据勾选变化
+    committeeChange(data) {
+      this.committeeChangeList = data;
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getCommittee();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getCommittee();
+    },
+    /** 单选人员选择 */
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    /**单选人员选择确定 **/
+    drawerCheck(data) {
+      if (this.type === "committeeDirector") {
+        this.addForm.committeeDirector = data[0].id;
+        this.addForm.committeeDirectorName = data[0].name;
+      } else if (this.type === "committeeSecretary") {
+        this.addForm.committeeSecretary = data[0].id;
+        this.addForm.committeeSecretaryName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    //多选人员
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.addForm.committeeIds.length > 0) {
+        this.nodeList2 = this.addForm.committeeIds.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    drawerCheck2(data) {
+      let idList = "", nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.addForm.committeeIds = idList;
+      this.addForm.committor = nameList;
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#committee {
+  height: 100%;
+  width: 100%;
+
+  .committee-content {
+    .table-content {
+      width: 100%;
+      height: 68.5vh;
+
+      .table-button {
+        margin: 10px;
+      }
+    }
+  }
+}
+
+</style>

src/pages/config/pages/mechanismManage/pages/mechanism.vue

@@ -249,6 +249,7 @@ export default {
   name: 'mechanism',
   data() {
     return {
+      formLoading: true,
       peopleType: '', //1为树结构 2 为全机构
       nodeKeyId: '',
       searchForm: {
@@ -327,6 +328,7 @@ export default {
     searchPostName() {
       this.page = 1;
       this.getTree2();
+      this.sarPost.name = "";
     }, // 查询
     resetSelect() {
       this.sarPost.name = "";
@@ -531,12 +533,17 @@ export default {
     },
 
     selectEdit() {
-      this.userId = []
+      this.getTree2()
-      this.manageData.forEach(item=>{
+      if(this.manageData.length){
-        this.userId.push(item.userId)
+        this.userId = []
-      })
+        this.manageData.forEach(item=>{
-      this.drawerTitle = '批量配置岗位'
+          this.userId.push(item.userId)
-      this.modalPost = true
+        })
+        this.drawerTitle = '批量配置岗位'
+        this.modalPost = true
+      }else{
+        this.$message.warning('请选择需要批量配置岗位的角色')
+      }
     },
   },
   computed: {},

src/pages/config/pages/mechanismManage/pages/workgroup.vue

@@ -244,7 +244,9 @@ export default {
       }, {
         _this: this
       }, res => {
-        res.data.records.map(item => {
+        this.workData = res.data.records
+        let work = res.data.records
+        work.map(item => {
           item.workLeaderGroup = [];
           item.workPeopleGroup = [];
           var workLeaderArray = item.workLeader.split(",");
@@ -258,8 +260,8 @@ export default {
             item.workPeopleGroup.push({ name: workPeopleArray[j], id: workPeopleIdArray[j] });
           }
         });
-        this.workData = res.data.records;
         this.total = res.data.total;
+        this.Loading = false
       }, e => {
       });
     },
@@ -268,7 +270,7 @@ export default {
     },
     //查询
     searchPostName() {
-      this.page = 1;
+      this.workSearch.page = 1;
       this.getWorkData();
     },
     //清空
@@ -340,11 +342,14 @@ export default {
     },
     //取消新增
     cancelModel() {
+      this.Loading = true
       this.addForm = {
         workGroup: "",
         workPeopleGroup: [],
         workLeaderGroup:  []
       };
+      this.getWorkData();
+      this.$refs.workGroup.clearSelection()
       this.addModel = false;
     },
     //确定新增
@@ -357,6 +362,7 @@ export default {
             } else if (!this.addForm.workPeopleGroup.length) {
               this.$message.warning("请选择工作组组员");
             } else {
+              this.Loading = true
               let workLeader = "", workLeaderId = "";
               this.addForm.workLeaderGroup.map(item => {
                 workLeader += item.name;
@@ -390,41 +396,47 @@ export default {
               this.nodeList2 = [];
             }
           } else {
-            let workLeader = "";
+            if (!this.addForm.workLeaderGroup.length) {
-            let workLeaderId = "";
+              this.$message.warning("请选择工作组组长");
-            this.addForm.workLeaderGroup.map(item => {
+            } else if (!this.addForm.workPeopleGroup.length) {
-              workLeader += item.name;
+              this.$message.warning("请选择工作组组员");
-              workLeader += ",";
+            } else {
-              workLeaderId += item.id;
+              this.Loading = true
-              workLeaderId += ",";
+              let workLeader = "";
-            });
+              let workLeaderId = "";
-
+              this.addForm.workLeaderGroup.map(item => {
-            let workPeople = "";
+                workLeader += item.name;
-            let workPeopleId = "";
+                workLeader += ",";
-            this.addForm.workPeopleGroup.map(item => {
+                workLeaderId += item.id;
-              workPeople += item.name;
+                workLeaderId += ",";
-              workPeople += ",";
+              });
-              workPeopleId += item.id;
+              let workPeople = "";
-              workPeopleId += ",";
+              let workPeopleId = "";
-            });
+              this.addForm.workPeopleGroup.map(item => {
-            this.$http.put("workGroup/work-group", {
+                workPeople += item.name;
-              id: this.addForm.id,
+                workPeople += ",";
-              workGroup: this.addForm.workGroup,
+                workPeopleId += item.id;
-              workLeader: workLeader,
+                workPeopleId += ",";
-              workLeaderId: workLeaderId,
+              });
-              workPeople: workPeople,
+              this.$http.put("workGroup/work-group", {
-              workPeopleId: workPeopleId
+                id: this.addForm.id,
-            }, {
+                workGroup: this.addForm.workGroup,
-              _this: this
+                workLeader: workLeader,
-            }, res => {
+                workLeaderId: workLeaderId,
-              if (res.ok) {
+                workPeople: workPeople,
-              } else {
+                workPeopleId: workPeopleId
-                this.$message.warning(res.message);
+              }, {
-              }
+                _this: this
-              this.getWorkData();
+              }, res => {
-            });
+                if (res.ok) {
-            this.addModel = false;
+                } else {
-            this.$refs.workGroup.clearSelection();
+                  this.$message.warning(res.message);
+                }
+                this.getWorkData();
+              });
+              this.addModel = false;
+              this.$refs.workGroup.clearSelection();
+            }
           }
         } else {
           this.$message.warning("请填写整信息");
@@ -448,6 +460,7 @@ export default {
     },
     checkedRole(data) {
         this.addForm = {
+          id: this.addForm.id,
           workGroup: this.addForm.workGroup || "",
           workPeopleGroup:  this.addForm.workPeopleGroup || [],
           workLeaderGroup: this.addForm.workLeaderGroup || []
@@ -463,9 +476,11 @@ export default {
         }
       });
       this.roleModal = false
+      this.nodeList = []
     },
     checkedRole2(data) {
       this.addForm = {
+        id: this.addForm.id,
         workGroup: this.addForm.workGroup || "",
         workPeopleGroup:  this.addForm.workPeopleGroup || [],
         workLeaderGroup: this.addForm.workLeaderGroup || []
@@ -481,6 +496,7 @@ export default {
         }
       });
       this.roleModal2 = false
+      this.nodeList = []
     },
     pageChange(page) {
       this.workSearch.page = page

src/pages/config/pages/operationLog/index.vue

@@ -167,8 +167,11 @@
                     loading: 'dataLoading'
                 }, res => {
                     if (res.ok) {
-                        this.total = res.data.total
+                      this.total = res.data.total;
-                        this.data = res.data.records
+                      res.data.records.forEach(item => {
+                        item.account = "(" + item.account + ")" + item.accountName;
+                      });
+                      this.data = res.data.records;
                     }
                 })
             },

src/pages/config/pages/roleManage/index.vue

@@ -40,6 +40,12 @@
                    v-btn-permission="'bb2571b08179edb36880aae169cb2e54'"
                    size="mini">配置法规库权限
         </el-button>
+        <el-button type="primary"
+                   class="common-button-primary add-button"
+                   @click="roleDataAdd"
+                   v-btn-permission="''"
+                   size="mini">配置法规库数据权限
+        </el-button>
         <el-button type="primary"
                    class="common-button-primary add-button"
                    @click="RolesAdd(1)"
@@ -181,6 +187,37 @@
         </el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      title="标准法规树数据"
+      :visible.sync="modalflag2"
+      :wrapperClosable="false"
+      @close="closeDialogData2"
+      size="800px">
+      <div class="myDialog">
+        <el-tree
+          v-if="modalflag2"
+          node-key="id"
+          class="filter-tree"
+          :data="treeData4"
+          :props="defaultProps3"
+          :default-checked-keys="nodeList4"
+          default-expand-all
+          highlight-current
+          :expand-on-click-node="false"
+          :show-checkbox="true"
+          :check-strictly="true"
+          @check="nodeClick3"
+          ref="tree4">
+        </el-tree>
+      </div>
+      <div slot="footer">
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消
+        </el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData2">
+          确定
+        </el-button>
+      </div>
+    </el-dialog>
     <el-dialog
       :title="addRoleTitle"
       :visible.sync="addModel"
@@ -394,12 +431,15 @@ export default {
       ],
       addModel: false,
       treeData3: [],
+      treeData4: [],
       defaultProps3: {
         children: 'children',
         label: 'menuName'
       },
       nodeList2: [],
+      nodeList4: [],
       modalflag: false,
+      modalflag2: false,
       sideClose: false, // 边栏收展状态
       filterText: '',
       treeData: [],
@@ -606,6 +646,7 @@ export default {
 
       if(list1.length > 0){
         this.treeData3 = this.sortByKey(list1,"displaySeq")
+        this.treeData4 = this.sortByKey(list1,"displaySeq")
       }
 
 
@@ -651,9 +692,27 @@ export default {
         }
       })
     },
+    //配置数据确定按钮
+    confirmDialogData2(){
+      let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
+      this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
+        menuIds: menuIds,
+        roleId: this.id
+      }, {}, res => {
+        if (res.ok) {
+          this.$message.success('设置权限成功')
+          this.modalflag2 = false
+        }else{
+          this.$message.warning(res.message)
+        }
+      })
+    },
     closeDialogData() {
       this.modalflag = false
     },
+    closeDialogData2() {
+      this.modalflag2 = false
+    },
     /** 父子节点的级联 */
     nodeClick(currentObj, treeStatus) {
       // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。
@@ -671,6 +730,30 @@ export default {
         }
       }
     },
+    /** 父子节点的级联 */
+    nodeClick3(currentObj, treeStatus) {
+      // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。
+      let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中
+      // 选中
+      if (selected !== -1) {
+        // 子节点只要被选中父节点就被选中
+        this.selectedParent4(currentObj)
+        // 统一处理子节点为相同的勾选状态
+        this.uniteChildSame4(currentObj, true)
+      } else {
+        // 未选中 处理子节点全部未选中
+        if (currentObj.children.length !== 0) {
+          this.uniteChildSame4(currentObj, false)
+        }
+      }
+    },
+    // 统一处理子节点为相同的勾选状态
+    uniteChildSame4(treeList, isSelected) {
+      this.$refs.tree4.setChecked(treeList.id, isSelected)
+      for (let i = 0; i < treeList.children.length; i++) {
+        this.uniteChildSame4(treeList.children[i], isSelected)
+      }
+    },
     // 统一处理子节点为相同的勾选状态
     uniteChildSame(treeList, isSelected) {
       this.$refs.tree3.setChecked(treeList.id, isSelected)
@@ -686,6 +769,14 @@ export default {
         this.selectedParent(currentNode.parent)
       }
     },
+    // 统一处理父节点为选中
+    selectedParent4(currentObj) {
+      let currentNode = this.$refs.tree4.getNode(currentObj)
+      if (currentNode.parent.key !== undefined) {
+        this.$refs.tree4.setChecked(currentNode.parent, true)
+        this.selectedParent4(currentNode.parent)
+      }
+    },
     nodeClick2(currentObj, treeStatus) {
       // 用于：父子节点严格互不关联时，父节点勾选变化时通知子节点同步变化，实现单向关联。
       let selected = treeStatus.checkedKeys.indexOf(currentObj.id) // -1未选中
@@ -726,6 +817,16 @@ export default {
         }
       })
     },
+    roleDataAdd(){
+      this.$http.get('tsRoleMeunData/ts-role-menu-data/list', {
+        ids: this.id
+      }, {}, res => {
+        if (res.ok) {
+          this.nodeList4 = res.data
+          this.modalflag2 = true
+        }
+      })
+    },
     closeDialog() {
       this.treeData2 = []
       this.modalshowflag = false

src/pages/details/otherBussStandardDetails/index.vue

@@ -363,14 +363,14 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                             />
                             <i
                                 title="下载带水印"
                                 v-show="file.fileSuffix === 'pdf' || file.fileSuffix === 'PDF'"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="QFTP ? '797062ee00c826466eb9c40cac2ecaa0' : '9bab2662fbd9d0507b39be813371a597'"
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                             />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
@@ -384,13 +384,13 @@
                                 title="下载"
                                 @click="downloadFile(file.id)"
                                 class="icon-download"
-                                v-btn-permission="QFTP ? '9d42af4ee6d03b028eaa0c417532d79e' : '9882f477aad895ec56a7464f3e9c0b11'"
+                                v-btn-permission="QFTP ? '7f13a22a53f9f76f56f5193f9a04389d' : '9882f477aad895ec56a7464f3e9c0b11'"
                               />
                               <i
                                 title="下载带水印"
                                 @click="downloadFileByWater(file.id, file.fileSuffix)"
                                 class="icon-download2"
-                                v-btn-permission="QFTP ? '797062ee00c826466eb9c40cac2ecaa0' : '9bab2662fbd9d0507b39be813371a597'"
+                                v-btn-permission="QFTP ? '6dbbd2d6b808cc0f02b22c97e9d34c54' : '9bab2662fbd9d0507b39be813371a597'"
                               />
                             </span>
                         <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
@@ -902,7 +902,7 @@
     </el-drawer>
     <!-- 更新LOG -->
     <el-dialog
-        title="更新LOG"
+        title="更新记录"
         :visible.sync="relateDialog"
         width="60%"
         class="relateClass"

src/pages/details/otherLawsDetails/index.vue

@@ -14,7 +14,7 @@
           <div class="modular-header-btn">
             <el-button v-if="SarLawsInfoEO.collectId" @click="collectClick(SarLawsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
             <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
+            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
             <el-button class="relation-btn" @click="knowledgeSharing">知识点分享</el-button>
             <el-button class="relation-btn" @click="statusClick">符合性状态</el-button>
             <put-question-button
@@ -647,7 +647,7 @@
 
     <!-- 更新LOG -->
     <el-dialog
-      title="更新LOG"
+      title="更新记录"
       :visible.sync="relateDialog"
       width="60%"
       class="relateClass"

src/pages/details/otherLawsStandDetails/index.vue

@@ -13,7 +13,6 @@
           class="details-content-modular clearfix"
           v-for="(item, index) in dynamicFormField"
           :key="index"
-          v-if="item.isShowImp === '0'"
       >
         <el-collapse v-model="activeNames" @change="handleChange">
           <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
@@ -22,7 +21,7 @@
               <div class="modular-header-btn">
                 <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>
                 <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-                <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
+                <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
               </div>
             </div>
           </div>
@@ -57,7 +56,7 @@
                     <p class="half"><label style=" margin-right: 157px;">信息简报</label><span>{{ sarStandardsInfoEO.lawsBulletin || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">适用区域</label><span>{{ sarStandardsInfoEO.lawsSyqy || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 157px;">适用车型</label><span>{{ sarStandardsInfoEO.lawsSycx || '-' }}</span></p>
-                    <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess || '-' }}</span></p>
+                    <p class="half"><label style=" margin-right: 97px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? '是' : (sarStandardsInfoEO.isRelateAccess ? '否':'-')}}</span></p>
                     <p class="half"><label style=" margin-right: 97px;">福田转发通知文号</label><span>{{ sarStandardsInfoEO.lawsNotisyncNum || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 192px;">年度</label><span>{{ sarStandardsInfoEO.lawsYear || '-' }}</span></p>
                     <p class="half"><label style=" margin-right: 192px;">标签</label><span>{{ sarStandardsInfoEO.lawsLabel || '-' }}</span></p>
@@ -151,7 +150,6 @@
                       <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
                       <i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="''"/>
                       <i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="''"/>
-                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                     </p>
                     <!--                <el-button-->
                     <!--                  @click="showItemsModel(child.attrField)"-->
@@ -167,7 +165,7 @@
         </el-collapse>
       </div>
     </div>
-    <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>
+<!--    <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>-->
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
     <!--查看标准条目列表-->
     <el-drawer
@@ -525,7 +523,7 @@
     </el-drawer>
     <!-- 更新LOG -->
     <el-dialog
-        title="更新LOG"
+        title="更新记录"
         :visible.sync="relateDialog"
         width="60%"
         class="relateClass"
@@ -897,7 +895,7 @@ import {dateFormat} from '../../../common/date'
 import { getBusStandFileByAttId } from 'api/process'
 
 
-const sarType = 'LAWS_STAND'
+const sarType = 'FOREIGN_LAWS'
 export default {
   name: 'OtherLawsStandDetails',
   components: {
@@ -1125,6 +1123,7 @@ export default {
       console.log(val)
     },
     handleChange1(val) {
+      console.log(val)
       if(val && val === '基础信息'){
         this.activeState = true
       }
@@ -2150,6 +2149,7 @@ export default {
           }
         })
       })
+      console.log(displayLocation)
       displayLocation.forEach(location => {
 
         // 动态属性字段-SYRZ 单独添加至基础信息
@@ -2158,17 +2158,9 @@ export default {
           if (!list2[0].child) {
             location['child2'] = []
           }else {
-            const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
+            if(list2[0].child){
-            location['child2'] = childList
+              const childList = list2[0].child.filter ( item => item.attrField === 'YYRZLAWS');
-          }
+              location['child2'] = childList
-        }
-
-        for (let i = 0; i < displayLocation.length; i++) {
-          //  sss
-          if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
-            const childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
-            if(childList.length === 0){
-              displayLocation.splice(i,1)
             }
           }
         }
@@ -2183,8 +2175,24 @@ export default {
         })
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
       })
-
+      for (let i = 0; i < displayLocation.length; i++) {
+        //  sss
+        if(displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件'){
+          if(displayLocation[i].child !== undefined){
+            let childList = displayLocation[i].child.filter ( item => item.value !== null && item.value !== '');
+            if(childList.length === 0){
+              displayLocation.splice(i,1)
+              i -= 1
+            }
+          }else {
+            displayLocation.splice(i,1)
+            i -= 1
+          }
+        }
+      }
+      console.log(displayLocation)
       this.dynamicFormField = displayLocation
+      console.log(this.dynamicFormField)
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
     })
@@ -2395,7 +2403,7 @@ export default {
             display: inline-block;
             width: calc(~'100% - 225px');
             & > .files-title{
-              width: calc(~'100% - 120px');
+              /*width: calc(~'100% - 120px');*/
               min-height: 50px;
               line-height: 50px;
               font-size: 16px;

src/pages/details/otherStandardDetails/index.vue

@@ -65,32 +65,32 @@
                       }}</span></p>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
-                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
+                      <div class="files-titles" style="border-bottom: 1px solid #E5E5E5">
                         <label style="margin-right: 164px;">{{ child.attrName }}</label>
-                        <template v-if="child.value && child.value.length > 0"
+                        <template v-if="child.value && child.value.length > 0">
-                                  v-for="(file, fileIndex) in child1Func(child.value)">
                           <!--                          单个文件时-->
-                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
+                          <div v-for="(file, fileIndex) in child1Func(child.value)">
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer;margin-left: -60px"
+                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer;"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                                @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                          <i
+                                :title="file.oldFileName">{{ file.oldFileName }}</a>
-                            title="下载"
+                            <i
-                            @click="downloadFile(file.id)"
+                                  title="下载"
-                            class="icon-download"
+                                  @click="downloadFile(file.id)"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                                  class="icon-download"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
                           />
-                          <i
+                            <i
-                            title="下载带水印"
+                                  title="下载带水印"
-                            @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                  @click="downloadFileByWater(file.id, file.fileSuffix)"
-                            class="icon-download2"
+                                  class="icon-download2"
-                            v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                                  v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                           />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <!--                          多个文件时-->
                           <div v-else-if="child.value && child.value.length > 0">
-                            <span style="margin-left: 19%">
+                            <span style="margin-left: 19%;display: flex; align-items: center;">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -116,10 +116,9 @@
                               @click="showItemsModel(child.attrField)"
                               class="decomposition-btn"
                               style="right:62px"
-                              icon="icon-separate"
                             >标准分解单
                           </el-button>
-
+                          </div>
                           <!--                          <el-button v-if="child.value && child.value.length > 1"-->
                           <!--                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"-->
                           <!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">-->
@@ -158,7 +157,6 @@
                                 @click="showItemsModel(child.attrField)"
                                 class="decomposition-btn"
                                 style="right:62px"
-                                icon="icon-separate"
                               >标准分解单
                               </el-button>
                               <el-button v-if="child.value && child.value.length > 1"
@@ -201,7 +199,6 @@
                                 @click="showItemsModel(child.attrField)"
                                 class="decomposition-btn"
                                 style="right:62px"
-                                icon="icon-separate"
                               >标准分解单
                               </el-button>
                               <el-button v-if="child.value && child.value.length > 1"
@@ -244,7 +241,6 @@
                                 @click="showItemsModel(child.attrField)"
                                 class="decomposition-btn"
                                 style="right:62px"
-                                icon="icon-separate"
                               >标准分解单
                               </el-button>
                               <el-button v-if="child.value && child.value.length > 1"
@@ -324,7 +320,7 @@
                     <p class="modular-content-p-val">
                       <span v-for="(item, index) in child.value.split(',')" :key="index">
                         <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                           class="span-line">{{ item }}</a>
+                           class="span-line" :title="item">{{ item }}</a>
                       </span>
                     </p>
                   </template>
@@ -343,7 +339,7 @@
                   <template v-else>
                     <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                       class="span-line">{{ item }}</a>
+                       class="span-line" :title="item">{{ item }}</a>
                   </span>
                   </template>
                 </div>
@@ -397,7 +393,7 @@
                     >
                       <!--发布稿、增补件单独设置下载权限-->
                       <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
                             file.oldFileName
                           }}</a>
                         <i
@@ -415,7 +411,7 @@
                         <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                       <template v-else>
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
                             file.oldFileName
                           }}</a>
                         <i
@@ -456,7 +452,7 @@
                     <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                   <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                     class="span-line">{{ item }}</a>
+                     class="span-line" :title="item">{{ item }}</a>
                   </span>
                     </p>
                   </template>
@@ -466,7 +462,7 @@
                     <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                       class="span-line">{{ item }}</a>
+                       class="span-line" :title="item">{{ item }}</a>
                   </span>
                     </p>
                     <span class="modular-content-p-val" v-else>-</span>
@@ -497,7 +493,7 @@
                       <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
                   || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
                             file.oldFileName
                           }}</a>
                         <i
@@ -517,7 +513,7 @@
                         <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                       <template v-else>
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
                             file.oldFileName
                           }}</a>
                         <i
@@ -620,7 +616,6 @@
                       :key="index"
                       @click="showItemsModel(child.attrField)"
                       class="decomposition-btn"
-                      icon="icon-separate"
                     >标准分解单
                     </el-button>
 
@@ -641,7 +636,7 @@
                     <p class="modular-content-p-val">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                   <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                     class="span-line">{{ item }}</a>
+                     class="span-line" :title="item">{{ item }}</a>
                 </span>
                     </p>
                   </template>
@@ -651,7 +646,7 @@
                     <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                       class="span-line">{{ item }}</a>
+                       class="span-line" :title="item">{{ item }}</a>
                   </span>
                     </p>
                     <span class="modular-content-p-val" v-else>-</span>
@@ -679,7 +674,7 @@
                       <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
                       <!--发布稿、增补件单独设置下载权限-->
                       <template v-if="child.attrField === 'GLWJ'">
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
                             file.oldFileName
                           }}</a>
                         <i
@@ -702,7 +697,7 @@
                         <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                       </template>
                       <template v-else>
-                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
                             file.oldFileName
                           }}</a>
                         <i
@@ -726,7 +721,6 @@
                       :key="index"
                       @click="showItemsModel(child.attrField)"
                       class="decomposition-btn"
-                      icon="icon-separate"
                     >标准分解单
                     </el-button>
 
@@ -847,7 +841,6 @@
           :height="tableHeight"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
        fontWeight: 'bold', height: '48px'}"
-          @select="select"
           @selection-change="selectAllStand">
           <el-table-column
             type="selection"
@@ -954,7 +947,6 @@
         </el-table>
         <loading :loading="tableLoading">数据加载中...</loading>
       </div>
-
       <pagination
         :page="page7"
         :total="total7"
@@ -1461,7 +1453,7 @@
     </el-dialog>
     <!-- 更新LOG -->
     <el-dialog
-      title="更新LOG"
+      title="更新记录"
       :visible.sync="relateDialog"
       class="relateClass"
       width="60%"
@@ -1747,13 +1739,9 @@
       </div>
       <div class="demo-drawer-footer">
         <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading"
-                   @click="handleRelatedTermsDrawerSubmit">
+                   @click="handleRelatedTermsDrawerSubmit">提交</el-button>
-          {{ $t('m.submit') }}
-        </el-button>
         <el-button class="common-button-default" size="mini" icon="el-icon-close"
-                   @click="handleRelatedTermsDrawerCancel">
+                   @click="handleRelatedTermsDrawerCancel">取消</el-button>
-          {{ $t('m.cancel') }}
-        </el-button>
       </div>
     </el-drawer>
     <!--内容简介-->
@@ -2759,8 +2747,19 @@ export default {
       }
     },
     choiceZRRS(type, title, id) {
-      this.nodeList = []
+      this.nodeList2 = []
-      this.nodeList.push(id)
+      if (id) {
+        let ids = id.split(',')
+        let idList = []
+        ids.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList2.push(idList)
+      }
       this.userType = type
       this.drawerTitle = title
       this.modalShowRoleFlag = true
@@ -2779,31 +2778,30 @@ export default {
       if (this.drawerTitle === '查询责任工程师') {
         this.resolveListForm.dutyEngineer = nameList
       }
-
-    },
-    select(selection, row) {
-      // 清除 所有勾选项
-      this.$refs.multipleTable.clearSelection()
-      // 当表格数据都没有被勾选的时候 就返回
-      // 主要用于将当前勾选的表格状态清除
-      if (selection.length === 0) return
-      this.$refs.multipleTable.toggleRowSelection(row, true)
     },
+    // select(selection, row) {
+    //   // 清除 所有勾选项
+    //   this.$refs.multipleTable.clearSelection()
+    //   // 当表格数据都没有被勾选的时候 就返回
+    //   // 主要用于将当前勾选的表格状态清除
+    //   if (selection.length === 0) return
+    //   this.$refs.multipleTable.toggleRowSelection(row, true)
+    // },
     selectAllStand(alldata) {
-      this.selectedItemList = []
+      this.selectedItemList = alldata
-      this.selectedItemList.push(alldata[alldata.length - 1])
     },
     editResolveList() {
-      if (this.selectedItemList.length > 0) {
+      if (this.selectedItemList.length < 1) {
-        this.editResolveListShowflag = true
+        this.$message.warning('请选择一条数据')
-        let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
+      } else if (this.selectedItemList.length === 1) {
-        this.resolveListForm = editItem
+        this.resolveListForm = JSON.parse(JSON.stringify(this.selectedItemList[0]))
         this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
         // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
         this.resolveListForm.xccssrq = this.resolveListForm.xccssrq ? this.resolveListForm.xccssrq.split(',') : ''
         this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : ''
+        this.editResolveListShowflag = true
       } else {
-        this.$message.warning('请选择一条数据')
+        this.$message.warning('仅可选择一条数据')
       }
     },
     saveEditInfo() {
@@ -2832,6 +2830,8 @@ export default {
       )
     },
     resetEditResolveListForm() {
+      this.resolveListForm.applyArctic = ''
+      this.resolveListForm.dutyEngineer = ''
       this.editResolveListShowflag = false
     },
     // 分页点击后方法
@@ -2851,7 +2851,6 @@ export default {
         this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
           _this: this
         }, res => {
-          console.log(res.data);
           this.sarStandardsInfoEO = res.data || {}
           this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList;
           if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
@@ -3114,7 +3113,9 @@ export default {
       }
     },
     showItemsModel(attField) {
-      this.fileType = attField
+      if (attField) {
+        this.fileType = attField
+      }
       this.getOrgTreeSource()
       this.selectedItemList = []
       this.selectSarStandItems()
@@ -3229,12 +3230,13 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     searchSarStandItems() {
-      this.standItemSearch.page = 1
+      this.page7 = 1
       this.selectSarStandItems()
     },
     // 清空搜索框
     clearAllSearch() {
       // 标准条款搜索
+      this.page7 = 1
       this.standItemSearch.responsibleUnit = ''
       this.standItemSearch.orgName = ''
       this.standItemSearch.parts = ''
@@ -3643,6 +3645,7 @@ export default {
 
     },
     handleRelatedTermsDrawerSubmit() {
+
       this.btnLoading = true
       this.$refs['relatedTermsSelect'].handleSubmit(() => {
         this.selectSarStandItems()
@@ -3652,8 +3655,6 @@ export default {
           type: 'success'
         });
       })
-
-
     },
     closeRelatedTermsDrawer() {
       this.$refs['relatedTermsDrawer'].closeDrawer()
@@ -3845,7 +3846,6 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
-        console.log(displayLocation);
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
@@ -3872,7 +3872,26 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
-
+.files-title {
+  display: flex;
+  align-items: center;
+  a {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: calc(~'100% - 40px');
+    white-space: nowrap;
+    display: block;
+  }
+}
+.files-titles {
+  a {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: calc(~'100% - 40px');
+    white-space: nowrap;
+    display: block;
+  }
+}
 /deep/ .el-icon-circle-close:before {
   margin-left: 250px;
 }

src/pages/details/process/ruku/index.vue

@@ -12,7 +12,7 @@
           <div class="modular-header-btn">
             <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
             <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
+            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
             <el-button class="relation-btn" @click="knowledgeSharing">知识点分享</el-button>
             <el-button class="relation-btn" @click="comparisonDialogOpen">比对</el-button>
           </div>
@@ -656,7 +656,7 @@
     </el-drawer>
     <!-- 更新LOG -->
     <el-dialog
-        title="更新LOG"
+        title="更新记录"
         :visible.sync="relateDialog"
         class="relateClass"
         width="60%"

src/pages/home2/components/todoList/index.vue

@@ -205,7 +205,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '起草单位高级经理审核'){
+          }else if (row.taskInfo === '批准'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {
@@ -238,7 +238,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '批准'){
+          }else if (row.taskInfo === '培训'){
             this.$router.push({
               name: 'bussLibrary11',
               query: {

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -90,7 +90,7 @@
                 <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('m.operation')" align="center" width="50" :resizable="false" fixed="right">
+            <el-table-column label="操作" align="center" width="50" :resizable="false" fixed="right">
               <template slot-scope="scope">
                 <div @click.stop style="display: inline-block">
                   <el-dropdown trigger="click" @command="handleCommand">
@@ -108,13 +108,13 @@
             </el-table-column>
           </el-table>
         </div>
-        <loading :loading="loading">{{$t('m.getting')}}……</loading>
+        <loading :loading="loading">正在获取中……</loading>
         <pagination :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
       </div>
     </div>
     <!--              分享           -->
     <el-drawer
-      :title="$t('m.sharingStandards')"
+      title="分享标准"
       :visible.sync="drawerModal"
       size="300px"
       @close="drawerModal = false"
@@ -128,8 +128,8 @@
                  style="padding: 0 15px">
       </dept-tree>
       <div class="demo-drawer-footer">
-        <el-button style="margin-right: 8px" @click="drawerModal = false">{{$t('m.cancel')}}</el-button>
+        <el-button style="margin-right: 8px" @click="drawerModal = false">取消</el-button>
-        <el-button type="primary" @click="shareStandardBt">{{$t('m.push')}}</el-button>
+        <el-button type="primary" @click="shareStandardBt">推送</el-button>
       </div>
     </el-drawer>
     <!--    内容简介-->
@@ -169,7 +169,7 @@
         </div>
       </div>
       <div class="demo-drawer-footer">
-        <el-button icon="el-icon-close" size="mini" @click="cancleUpdateContent">{{$t('m.cancel')}}</el-button>
+        <el-button icon="el-icon-close" size="mini" @click="cancleUpdateContent">取消</el-button>
       </div>
     </el-drawer>
     <!-- 编辑条目 -->
@@ -273,7 +273,7 @@
           <div style="border:1px dashed #999;margin-bottom:20px;padding:10px">
             <el-row type="flex" class="row-bg" justify="space-between">
               <el-col :span="6">
-                <el-button size="small" icon="el-icon-plus" @click="showAddContentInfo('noIndex')">{{$t('m.addTo')}}</el-button>
+                <el-button size="small" icon="el-icon-plus" @click="showAddContentInfo('noIndex')">添加</el-button>
               </el-col>
             </el-row>
             <div v-for="(item, index) in itemsContentList" :key="index">
@@ -296,9 +296,9 @@
                   </div>
                 </el-col>
                 <el-col :span="item.type === 'TABLE' ? 8 : 6" style="display:flex;justify-content: flex-end;">
-                  <el-button size="mini" class="updateContentBtn" icon="el-icon-plus" @click="showAddContentInfo(index)">{{$t('m.addTo')}}</el-button>
+                  <el-button size="mini" class="updateContentBtn" icon="el-icon-plus" @click="showAddContentInfo(index)">添加</el-button>
-                  <el-button size="mini" v-if="item.type === 'TABLE'" class="updateContentBtn" icon="el-icon-edit" @click="editContentInfo(item, index)">{{$t('m.update')}}</el-button>
+                  <el-button size="mini" v-if="item.type === 'TABLE'" class="updateContentBtn" icon="el-icon-edit" @click="editContentInfo(item, index)">修改</el-button>
-                  <el-button size="mini" class="updateContentBtn" icon="el-icon-minus" @click="removeContentInfo(index, item.id)">{{$t('m.delete')}}</el-button>
+                  <el-button size="mini" class="updateContentBtn" icon="el-icon-minus" @click="removeContentInfo(index, item.id)">删除</el-button>
                 </el-col>
               </el-row>
             </div>
@@ -306,8 +306,8 @@
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button size="mini" icon="el-icon-close"  style="margin-right: 8px" @click="modalItemaddShowflag = false">{{$t('m.cancel')}}</el-button>
+        <el-button size="mini" icon="el-icon-close"  style="margin-right: 8px" @click="modalItemaddShowflag = false">取消</el-button>
-        <el-button size="mini" icon="el-icon-check"  type="primary" @click="updateItemInfo" :loading="isSubmit">{{$t('m.submit')}}</el-button>
+        <el-button size="mini" icon="el-icon-check"  type="primary" @click="updateItemInfo" :loading="isSubmit">提交</el-button>
       </div>
     </el-drawer>
     <!-- 查看属性 -->
@@ -480,7 +480,7 @@
     </el-drawer>
     <!--编辑条款内容-->
     <el-drawer
-      :title="$t('m.editTerms')"
+      title="编辑条款内容"
       :wrapperClosable="false"
       :visible.sync="editItemsContentModel"
       size="800px"
@@ -491,7 +491,7 @@
         <div class="otherStandardDetails-drawer-content">
           <el-row>
             <el-col :span="6">
-              <el-button icon="md-add" @click="showAddContentInfo('noIndex')">{{$t('m.addTo')}}</el-button>
+              <el-button icon="md-add" @click="showAddContentInfo('noIndex')">添加</el-button>
             </el-col>
           </el-row>
           <div v-for="(item, index) in itemsContentList" :key="index">
@@ -521,37 +521,37 @@
                 </div>
               </el-col>
               <el-col :span="8">
-                <el-button class="updateContentBtn" icon="md-add" @click="showAddContentInfo(index)">{{$t('m.addContent')}}</el-button>
+                <el-button class="updateContentBtn" icon="md-add" @click="showAddContentInfo(index)">添加内容</el-button>
-                <el-button class="updateContentBtn" icon="md-remove" @click="removeContentInfo(index, item.id)">{{$t('m.delete')}}</el-button>
+                <el-button class="updateContentBtn" icon="md-remove" @click="removeContentInfo(index, item.id)">删除</el-button>
               </el-col>
             </el-row>
           </div>
         </div>
       </div>
       <div class="demo-drawer-footer">
-        <el-button style="margin-right: 8px" @click="editItemsContentModel = false">{{$t('m.cancel')}}</el-button>
+        <el-button style="margin-right: 8px" @click="editItemsContentModel = false">取消</el-button>
-        <el-button type="primary" @click="updateItemInfo('content')" :loading="isSubmit">{{$t('m.save')}}</el-button>
+        <el-button type="primary" @click="updateItemInfo('content')" :loading="isSubmit">保存</el-button>
       </div>
     </el-drawer>
     <!-- 选择添加内容类型-->
-    <el-dialog :visible.sync="chooseAddTypeModel" :title="$t('m.selectAddContentType')" width="700px" :show-close="false">
+    <el-dialog :visible.sync="chooseAddTypeModel" title="选择添加内容类型" width="700px" :show-close="false">
       <el-row>
         <el-col :span="8">
-          <el-button icon="el-icon-plus" @click="chooseType('TEXT')" class="chooseBtn">{{$t('m.addText')}}</el-button>
+          <el-button icon="el-icon-plus" @click="chooseType('TEXT')" class="chooseBtn">添加文本</el-button>
         </el-col>
         <el-col :span="8">
-          <el-button icon="el-icon-plus" @click="chooseType('IMG')" class="chooseBtn">{{$t('m.addPicture')}}</el-button>
+          <el-button icon="el-icon-plus" @click="chooseType('IMG')" class="chooseBtn">添加图片</el-button>
         </el-col>
         <el-col :span="8">
-          <el-button icon="el-icon-plus" @click="chooseType('TABLE')">{{$t('m.addTable')}}</el-button>
+          <el-button icon="el-icon-plus" @click="chooseType('TABLE')">添加表格</el-button>
         </el-col>
       </el-row>
       <div slot="footer">
-        <el-button size="small" @click="chooseAddTypeModel = false">{{$t('m.cancel')}}</el-button>
+        <el-button size="small" @click="chooseAddTypeModel = false">取消</el-button>
-        <el-button size="small" type="primary" @click="addContentInfo">{{$t('m.sure')}}</el-button>
+        <el-button size="small" type="primary" @click="addContentInfo">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="showUploadModelFlag" :title="$t('m.uploadPictures')" width="700px">
+    <el-dialog :visible.sync="showUploadModelFlag" title="上传图片" width="700px">
       <el-upload
         :action="importImgUrl"
         ref="importImg"
@@ -561,25 +561,25 @@
         :before-upload="imgBeforeUpload"
         :show-file-list="showUploadlist"
         :file-list="defaultFileList">
-        <el-button icon="el-icon-upload">{{$t('m.uploadPictures')}}</el-button>
+        <el-button icon="el-icon-upload">上传图片</el-button>
       </el-upload>
     </el-dialog>
-    <el-dialog :visible.sync="showTableModelFlag" :title="$t('m.tableProperties')" width="700px">
+    <el-dialog :visible.sync="showTableModelFlag" title="表格属性" width="700px">
       <el-row>
         <el-col :span="16">
-          <span>{{$t('m.numberOfRows')}}:</span>
+          <span>行数:</span>
-          <el-input class="updateContentInput" v-model.trim="rowCount" placeholder="$t('m.pleaseEnterAPositiveInteger')" clearable :maxlength="2"></el-input>
+          <el-input class="updateContentInput" v-model.trim="rowCount" placeholder="请输入正整数" clearable :maxlength="2"></el-input>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="16">
-          <span>{{$t('m.numberOfColumns')}}</span>
+          <span>列数</span>
-          <el-input class="updateContentInput" v-model.trim="colCount" :placeholder="$t('m.pleaseEnterAPositiveInteger')" clearable :maxlength="2"></el-input>
+          <el-input class="updateContentInput" v-model.trim="colCount" placeholder="请输入正整数" clearable :maxlength="2"></el-input>
         </el-col>
       </el-row>
       <div slot="footer">
-        <el-button size="mini" @click="showTableModelFlag = false">{{$t('m.cancel')}}</el-button>
+        <el-button size="mini" @click="showTableModelFlag = false">取消</el-button>
-        <el-button size="mini" type="primary" @click="addTableInfo">{{$t('m.sure')}}</el-button>
+        <el-button size="mini" type="primary" @click="addTableInfo">确定</el-button>
       </div>
     </el-dialog>
     <!-- 树结构添加树组织-->
@@ -607,44 +607,44 @@
         <el-button class="common-button-default" icon="el-icon-close" @click="menuModalFlag = false">取消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="$t('m.confirmDeletion')" width="300px" :visible.sync="deleteMenuModal">
+    <el-dialog title="确认删除" width="300px" :visible.sync="deleteMenuModal">
       <p>该节点下有记录，是否删除？</p>
       <div slot="footer">
-        <el-button size="mini" @click="deleteMenuModal = false">{{$t('m.cancel')}}</el-button>
+          <el-button size="mini" @click="deleteMenuModal = false">取消</el-button>
-        <el-button type="primary" size="mini" @click="sureDeleteSarMenu">{{$t('m.sure')}}</el-button>
+        <el-button type="primary" size="mini" @click="sureDeleteSarMenu">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="$t('m.confirmDeletion')" width="300px" :visible.sync="deleteItemsModal">
+    <el-dialog title="确认删除" width="300px" :visible.sync="deleteItemsModal">
       <p>选择条款关联节点下包含子节点，是否全部删除？</p>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" @click="deleteItemsModal = false">{{$t('m.cancel')}}</el-button>
+        <el-button class="common-button-default" @click="deleteItemsModal = false">取消</el-button>
-        <el-button calss="common-button-primary" type="primary" @click="batchDeleteItem">{{$t('m.sure')}}</el-button>
+        <el-button calss="common-button-primary" type="primary" @click="batchDeleteItem">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="importModalshowflagtemp" :title="$t('m.importFile')" width="400px">
+<!--    <el-dialog :visible.sync="importModalshowflagtemp" :title="$t('m.importFile')" width="400px">-->
-      <el-upload
+<!--      <el-upload-->
-        :multiple="false"
+<!--        :multiple="false"-->
-        drag
+<!--        drag-->
-        show-file-list
+<!--        show-file-list-->
-        :on-success="uploadSuccess"
+<!--        :on-success="uploadSuccess"-->
-        :on-remove="removeOneFile"
+<!--        :on-remove="removeOneFile"-->
-        :action="importImgUrl"
+<!--        :action="importImgUrl"-->
-        :file-list="defaultFilesList"
+<!--        :file-list="defaultFilesList"-->
-        accept=".PDF, .doc, .docx, .ppt, .pptx"
+<!--        accept=".PDF, .doc, .docx, .ppt, .pptx"-->
-        :before-upload="editBeforeUpload"
+<!--        :before-upload="editBeforeUpload"-->
-        name="file"
+<!--        name="file"-->
-        ref="importFileAboutLaws"
+<!--        ref="importFileAboutLaws"-->
-      >
+<!--      >-->
-        <div style="padding: 20px 0">
+<!--        <div style="padding: 20px 0">-->
-          <i class="el-icon-upload" style="color: #3399ff; font-size: 52px;"></i>
+<!--          <i class="el-icon-upload" style="color: #3399ff; font-size: 52px;"></i>-->
-          <p>点击或拖拽上传文件</p>
+<!--          <p>点击或拖拽上传文件</p>-->
-        </div>
+<!--        </div>-->
-      </el-upload>
+<!--      </el-upload>-->
-    </el-dialog>
+<!--    </el-dialog>-->
-    <el-dialog :title="$t('m.showPictures')" width="600px" style="height: 800px;" :visible.sync="showImg">
+    <el-dialog title="展示图片" width="600px" style="height: 800px;" :visible.sync="showImg">
       <div v-html="preImgContent" class="preImgStyle"></div>
     </el-dialog>
-    <el-dialog :visible.sync="importModalshowflag" :title="$t('m.importFile')" width="400px">
+    <el-dialog :visible.sync="importModalshowflag" title="导入文件" width="400px">
       <el-upload
         multiple
         :action="importExcelUrl"
@@ -667,18 +667,18 @@
         <span>{{ importForm.content }}</span>
       </div>
       <div slot="footer">
-        <el-button type="primary" size="large" @click="importFailed = false">{{$t('m.confirm')}}</el-button>
+        <el-button type="primary" size="large" @click="importFailed = false">确认</el-button>
       </div>
     </el-dialog>
     <!--  修改模态框  -->
     <el-drawer
       :visible.sync="editInfoModal"
-      :title="$t('m.modifyInformation')"
+      title="修改信息"
       size="700px">
       <UEditor :content="ueContent" :config="config" ref="ueditor" @editor-onChange="uEditorChange"></UEditor>
       <div class="demo-drawer-footer">
-        <el-button size="mini" @click="editInfoModal = false">{{$t('m.cancel')}}</el-button>
+        <el-button size="mini" @click="editInfoModal = false">取消</el-button>
-        <el-button size="mini" type="primary" @click="editInfoModalSave">{{$t('m.save')}}</el-button>
+        <el-button size="mini" type="primary" @click="editInfoModalSave">保存</el-button>
       </div>
     </el-drawer>
     <!--内容简介-->
@@ -1289,7 +1289,7 @@ export default {
       this.selectSarMenu = JSON.parse(JSON.stringify(treeNode))
       if (undefined !== this.selectSarMenu.id) { // 当前有选中节点
         if (name === 'newMenu') {
-          this.menuModalTitle = this.$t('m.newContents')
+          this.menuModalTitle = '新增目录'
           this.menuModalFlag = true
           this.menuAddOrUpdateFlag = 1
           this.sarMenu.infoId = this.infoId
@@ -1299,7 +1299,7 @@ export default {
           })
         } else if (name === 'editMenu') {
           this.menuAddOrUpdateFlag = 2
-          this.menuModalTitle = this.$t('m.editDirectory')
+          this.menuModalTitle = '编辑目录'
           this.menuModalFlag = true
           this.$nextTick(() => {
             this.$refs.addMenuForm.resetFields()

src/pages/localTool/standCalendar/index.vue

@@ -354,9 +354,9 @@ export default {
     let yy = new Date().getFullYear();
     let mm = new Date().getMonth() + 1;
     let dd = new Date().getDate();
-    if (mm < 10) {
+    // if (mm < 10) {
-      mm = this.padding0(mm, 2)
+    //   mm = this.padding0(mm, 2)
-    }
+    // }
     if (dd < 10) {
       dd = this.padding0(dd, 2)
     }
@@ -443,9 +443,9 @@ export default {
       let yy = new Date().getFullYear();
       let mm = new Date().getMonth() + 1;
       let dd = new Date().getDate();
-      if (mm < 10) {
+      // if (mm < 10) {
-        mm = this.padding0(mm, 2)
+      //   mm = this.padding0(mm, 2)
-      }
+      // }
       this.formData.month = mm + '月'
       if (dd < 10) {
         dd = this.padding0(dd, 2)
@@ -800,12 +800,12 @@ export default {
           let yy = new Date().getFullYear();
           let mm = new Date().getMonth() + 1;
           let dd = new Date().getDate();
-          if (mm < 10) {
+          // if (mm < 10) {
-            mm = this.padding0(mm, 2)
+          //   mm = this.padding0(mm, 2)
-          }
+          // }
-          if (dd < 10) {
+          // if (dd < 10) {
-            dd = this.padding0(dd, 2)
+          //   dd = this.padding0(dd, 2)
-          }
+          // }
           this.nowDate = yy + '-' + mm + '-' + dd
           this.formData.year = yy + '年'
           this.formData.month = mm + '月'

src/pages/localTool/standardRecognition/index.vue

@@ -749,7 +749,7 @@ export default {
       title: "",
       total: 0,
       page: 1,
-      pageSize: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       // uploadPath: '/api/ocr/OCRRestful/upload',
       uploadPath: "api/att/attFile/upload",
       defaultFileList: [],
@@ -1076,6 +1076,7 @@ export default {
     // 修改成表格样式后，选择项勾选改变
     standSelectChange(data) {
       this.selectTableData = [];
+      this.selectTableDatas = []
       for (let i = 0; i < data.length; i++) {
         this.selectTableData.push(data[i].id);
         this.selectTableDatas.push(data[i])

src/pages/localTool/standardWarning.vue

@@ -3,7 +3,7 @@
   <div id="dynamicInformation" class="dynamic-information v-class">
     <div class="dynamic-content">
       <!-- 实施预警 -->
-      <div class="dynamic" style="overflow-y: auto;">
+      <div class="dynamic">
         <div class="container">
           <!--          <el-tabs v-model="activeName" @tab-click="handleClick">-->
           <!--            <el-tab-pane label="标准预警" name="STANDARD">-->
@@ -689,11 +689,11 @@ export default {
         this.$http.get('sys/EarlyWarning/ChangePermissions', {
             id: row.id,
           }, {}, res => {
-              this.pageConfig.page = 1
+            this.pageConfig.page = 1
-              this.pageConfig.newPolicyPage = 1
+            this.pageConfig.newPolicyPage = 1
-              this.pageConfig.oldPolicyPage = 1
+            this.pageConfig.oldPolicyPage = 1
-              this.searchBtnClick()
+            this.searchBtnClick()
-              this.getEarlyDate()
+            this.getEarlyDate()
           }
         )
       }).catch(() => {
@@ -1049,7 +1049,7 @@ export default {
 
         .content {
           padding-bottom: 10px;
-          height: calc(~'100% - 7%');
+          height: calc(~'100% - 25%') ;
 
           /deep/ .el-button--mini {
             padding: 5px 7px;

src/pages/loginVerify/index.vue

@@ -138,8 +138,15 @@
                     if(res.respCode && res.respCode === 'r0011'){
                         this.$message.warning('系统无权限访问')
                         this.$store.dispatch('logout')
+                        this.$alert('您没有系统访问权限，请联系管理员进行授权', '提示', {
+                            confirmButtonText: '确定',
+                            type: 'warning',
+                            showClose: false,
+                            showCancelButton: false,
+                        }).then(() => {
+                            window.location.href = ssoLogoutUrlDev
+                        })
                         // window.location.href = 'http://sso.foton.com.cn/logout?service='
-                        window.location.href = ssoLogoutUrlDev
                     }
                 }
             })

src/pages/personal/pages/individual-plate/index.vue

@@ -121,7 +121,7 @@ export default {
           for (var i = 0; i < this.selected.length; i++) {
             this.targetKeys.push(this.selected[i].id)
           }
-          //  左侧数据会筛选出右侧数据进行显示
+                //  左侧数据会筛选出右侧数据进行显示
           var j
           for (j = 0; j < res.data.records.length; j++) {
             let moduleLabel = {}

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -559,7 +559,7 @@ export default {
         this.saveLoading = false
       })
     },
-    handleSubmit() {
+    handleSubmit(username) {
       this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
@@ -611,6 +611,9 @@ export default {
           return this.$message.warning('请完善基础信息')
         }
       })
+    },
+    aa () {
+      return 11111
     }
   },
   mounted () {

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -201,7 +201,6 @@
                 approval
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
                 show-transfer
                 @transfer="handleTransfer"
                 @submit="handleSubmit"
@@ -375,7 +374,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -375,7 +375,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -169,14 +169,14 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column-->
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                        v-if="sarType === 'FOREIGN' && form.itemsNum1"-->
-                        prop="changePoint"
+<!--                        prop="changePoint"-->
-                        width="150"
+<!--                        width="150"-->
-                        label="相对于国行标差异点"
+<!--                        label="相对于国行标差异点"-->
-                        show-overflow-tooltip
+<!--                        show-overflow-tooltip-->
-                        align="center">
+<!--                        align="center">-->
-                </el-table-column>
+<!--                </el-table-column>-->
                 <el-table-column
                         label="操作"
                         width="240"
@@ -411,8 +411,8 @@
                             <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
                             <div style="overflow: auto;display: flex;" class="BDclass">
-                                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                                <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                                <div v-html="rightData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                             </div>
                         </div>
                     </div>

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准解读流程</template>
-      <template slot="proNode"></template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -220,14 +220,14 @@
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column-->
-                v-show="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
-                prop="changePoint"
+<!--                prop="changePoint"-->
-                width="150"
+<!--                width="150"-->
-                label="相对于国行标差异点"
+<!--                label="相对于国行标差异点"-->
-                show-overflow-tooltip
+<!--                show-overflow-tooltip-->
-                align="center">
+<!--                align="center">-->
-        </el-table-column>
+<!--        </el-table-column>-->
         <el-table-column
                 label="责任人"
                 width="170"

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -170,14 +170,14 @@
                 show-overflow-tooltip
                 align="center">
         </el-table-column>
-        <el-table-column
+<!--        <el-table-column-->
-                v-if="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                v-if="sarType === 'FOREIGN' && form.itemsNum1"-->
-                prop="changePoint"
+<!--                prop="changePoint"-->
-                width="150"
+<!--                width="150"-->
-                label="相对于国行标差异点"
+<!--                label="相对于国行标差异点"-->
-                show-overflow-tooltip
+<!--                show-overflow-tooltip-->
-                align="center">
+<!--                align="center">-->
-        </el-table-column>
+<!--        </el-table-column>-->
         <el-table-column
           label="责任人"
           width="170"
@@ -419,8 +419,8 @@
               <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
               <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
               <div style="overflow: auto;display: flex;" class="BDclass">
-                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                <div v-html="rightData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
               </div>
             </div>
           </div>

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -154,14 +154,14 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column-->
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                        v-if="sarType === 'FOREIGN' && form.itemsNum1"-->
-                        prop="changePoint"
+<!--                        prop="changePoint"-->
-                        width="150"
+<!--                        width="150"-->
-                        label="相对于国行标差异点"
+<!--                        label="相对于国行标差异点"-->
-                        show-overflow-tooltip
+<!--                        show-overflow-tooltip-->
-                        align="center">
+<!--                        align="center">-->
-                </el-table-column>
+<!--                </el-table-column>-->
                 <el-table-column
                         label="责任人"
                         width="170"

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -169,14 +169,14 @@
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column-->
-                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                        v-if="sarType === 'FOREIGN' && form.itemsNum1"-->
-                        prop="changePoint"
+<!--                        prop="changePoint"-->
-                        width="150"
+<!--                        width="150"-->
-                        label="相对于国行标差异点"
+<!--                        label="相对于国行标差异点"-->
-                        show-overflow-tooltip
+<!--                        show-overflow-tooltip-->
-                        align="center">
+<!--                        align="center">-->
-                </el-table-column>
+<!--                </el-table-column>-->
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -378,8 +378,8 @@
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
                             <div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
                             <div style="overflow: auto;display: flex;" class="BDclass">
-                                <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                                <div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
-                                <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+                                <div v-html="rightData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
                             </div>
                         </div>
                     </div>

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -158,19 +158,19 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column-->
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                        v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
-                        prop="changePoint"
+<!--                        prop="changePoint"-->
-                        width="150"
+<!--                        width="150"-->
-                        label="相对于国行标差异点"
+<!--                        label="相对于国行标差异点"-->
-                        show-overflow-tooltip
+<!--                        show-overflow-tooltip-->
-                        align="center">
+<!--                        align="center">-->
-                </el-table-column>
+<!--                </el-table-column>-->
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -191,7 +191,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -158,19 +158,19 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column-->
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                        v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
-                        prop="changePoint"
+<!--                        prop="changePoint"-->
-                        width="150"
+<!--                        width="150"-->
-                        label="相对于国行标差异点"
+<!--                        label="相对于国行标差异点"-->
-                        show-overflow-tooltip
+<!--                        show-overflow-tooltip-->
-                        align="center">
+<!--                        align="center">-->
-                </el-table-column>
+<!--                </el-table-column>-->
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -191,7 +191,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -158,19 +158,19 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
-                <el-table-column
+<!--                <el-table-column-->
-                        v-show="sarType === 'FOREIGN' && form.itemsNum1"
+<!--                        v-show="sarType === 'FOREIGN' && form.itemsNum1"-->
-                        prop="changePoint"
+<!--                        prop="changePoint"-->
-                        width="150"
+<!--                        width="150"-->
-                        label="相对于国行标差异点"
+<!--                        label="相对于国行标差异点"-->
-                        show-overflow-tooltip
+<!--                        show-overflow-tooltip-->
-                        align="center">
+<!--                        align="center">-->
-                </el-table-column>
+<!--                </el-table-column>-->
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
@@ -191,7 +191,7 @@
                 <el-table-column
                         label="操作"
                         width="140"
-                        v-show="form.itemsNum1"
+                        v-if="form.itemsNum1"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -528,6 +528,7 @@ export default {
       // 查询相关参数
       searching: false,
       fileType: "",
+      subFlag: 0,
       projectSearch: {
         managementHostName: "", //管理主体
         developmentHostName: "", //开发主体
@@ -644,6 +645,9 @@ export default {
   },
   methods: {
     optionsChange(){
+        this.managementHostName =  [] //管理主体名称下拉框
+       this.developmentHostName = [] //开发主体名称下拉框
+        this.categoryName = [] //项目细分类下拉框
       /**
        * 获取项目群筛选项的值
        */
@@ -844,8 +848,13 @@ export default {
           this.projectList.forEach(items => {
             if(!proData.includes(items.projectGroup)){
               this.dataList.push(items)
+            }else{
+              this.subFlag++
             }
           })
+          if(this.subFlag > 0){
+            this.$message.warning('请勿重复添加数据')
+          }
         }else{
           this.dataList = this.projectList
         }
@@ -1055,11 +1064,15 @@ export default {
       this.projectList = data;
     },
     choiceZRR(scope, type, title, id) {
+      console.log(scope);
       if (scope != null) {
         this.currentIndex = scope.$index;
+        this.nodeList = [];
+        this.nodeList.push(scope.row.distributePersonId);
+      }else{
+        this.nodeList = [];
+        this.nodeList.push(id);
       }
-      this.nodeList = [];
-      this.nodeList.push(id);
       this.type = type;
       this.drawerTitle = title;
       this.modalshowflag = true;

src/pages/processCenter/pages/creatProcess/bzpg/step4.vue

@@ -148,12 +148,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="200px"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           align="center"
           width="200px"

src/pages/processCenter/pages/creatProcess/bzpg/step5.vue

@@ -200,12 +200,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step6.vue

@@ -193,12 +193,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step7.vue

@@ -202,12 +202,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue

@@ -202,12 +202,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzpg/step8.vue

@@ -202,12 +202,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"

src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue

@@ -83,7 +83,14 @@
                     clearable
                   ></el-input>
                   <el-button type="primary" @click="choiceZRR">选择责任人</el-button>
-                  <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
+                  <div @click="choiceZRR">
+                    <div v-if="form.responUserListName" style="color: #666;">
+                      {{ form.responUserListName }}
+                    </div>
+                    <div v-else style="color: #ccc;">
+                      请选择责任人
+                    </div>
+                  </div>
                 </el-form-item>
               </el-col>
             </el-row>

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -103,6 +103,7 @@
                         tooltip-effect="dark"
                         border
                         style="width: 100%; flex: auto;"
+                        header-cell-class-name="zTable_style"
                         class="drag-table"
                         :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
@@ -470,7 +471,7 @@
                     query: {
                         standId: this.standId,
                         attId: this.form.fjList[0].attId,
-                        fileType: this.form.fjList[0].standFileClassify,
+                        fileType: this.form.textType,
                     }
                 });
                 window.open(routeData.href, '_blank')
@@ -734,6 +735,9 @@
     @import '~@/assets/styles/style';
 
     .bzdyStep3 {
+        /deep/.zTable_style {
+            border-bottom: 1px solid #d1d1d1;
+        }
         /deep/ .el-drawer__container {
             .prc-content-border {
                 border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -97,6 +97,7 @@
                         tooltip-effect="dark"
                         border
                         style="width: 100%; flex: auto;"
+                        header-cell-class-name="zTable_style"
                         class="drag-table"
                         :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
                         :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -479,6 +480,9 @@
     @import '~@/assets/styles/style';
 
     .bzzqyjStep4-1 {
+        /deep/.zTable_style {
+            border-bottom: 1px solid #d1d1d1;
+        }
         /deep/ .el-drawer__container {
             .prc-content-border {
                 border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue

@@ -89,6 +89,7 @@
                         tooltip-effect="dark"
                         border
                         style="width: 100%; flex: auto;"
+                        header-cell-class-name="zTable_style"
                         class="drag-table"
                         :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
                         :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -462,6 +463,9 @@
     @import '~@/assets/styles/style';
 
     .bzzqyjStep4-2 {
+        /deep/.zTable_style {
+            border-bottom: 1px solid #d1d1d1;
+        }
         /deep/ .el-drawer__container {
             .prc-content-border {
                 border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bzdyStep4">
-    <!--    标准调研流程-->
+    <!--    标准征求意见流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
       <template slot="proNode">意见汇总报批</template>
@@ -111,6 +111,7 @@
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
+          header-cell-class-name="zTable_style"
           class="drag-table"
           :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -511,7 +512,7 @@ export default {
         query: {
           standId: this.standId,
           attId: this.form.fjList[0].attId,
-          fileType: this.form.fjList[0].standFileClassify,
+          fileType: this.form.textType,
         }
       });
       window.open(routeData.href, '_blank')
@@ -711,6 +712,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .bzdyStep4 {
+  /deep/.zTable_style {
+    border-bottom: 1px solid #d1d1d1;
+  }
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -87,6 +87,7 @@
                 ref="multipleTable"
                 :data="data"
                 tooltip-effect="dark"
+                header-cell-class-name="zTable_style"
                 border
                 style="width: 100%; flex: auto;"
                 class="drag-table"
@@ -643,6 +644,9 @@
   @import '~@/assets/styles/style';
 
   .bzdyStep5 {
+    /deep/.zTable_style {
+      border-bottom: 1px solid #d1d1d1;
+    }
     /deep/ .el-drawer__container {
       .prc-content-border {
         border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -109,6 +109,7 @@
                 tooltip-effect="dark"
                 border
                 style="width: 100%; flex: auto;"
+                header-cell-class-name="zTable_style"
                 class="drag-table"
                 :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
                 :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -563,6 +564,9 @@
   @import '~@/assets/styles/style';
 
   .bzdyStep6 {
+    /deep/.zTable_style {
+      border-bottom: 1px solid #d1d1d1;
+    }
     /deep/ .el-drawer__container {
       .prc-content-border {
         border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -101,6 +101,7 @@
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
+          header-cell-class-name="zTable_style"
           class="drag-table"
           :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -522,6 +523,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .bzdyStep7 {
+  /deep/.zTable_style {
+    border-bottom: 1px solid #d1d1d1;
+  }
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -101,6 +101,7 @@
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
+          header-cell-class-name="zTable_style"
           class="drag-table"
           :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -525,6 +526,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .bzdyStep8 {
+  /deep/.zTable_style {
+    border-bottom: 1px solid #d1d1d1;
+  }
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -101,6 +101,7 @@
           tooltip-effect="dark"
           border
           style="width: 100%; flex: auto;"
+          header-cell-class-name="zTable_style"
           class="drag-table"
           :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
@@ -525,6 +526,9 @@ export default {
 @import '~@/assets/styles/style';
 
 .bzdyStep9 {
+  /deep/.zTable_style {
+    border-bottom: 1px solid #d1d1d1;
+  }
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -9,9 +9,9 @@
           <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
             <el-select v-model="form.standSort" filterable clearable :disabled="form.standStatus && form.standStatus === '3'">
               <el-option
-                      v-for="item in standSortOptions"
+                      v-for="(item, index) in standSortOptions"
                       placeholder="请选择企标类别"
-                      :key="item.value"
+                      :key="index"
                       :value="item.value"
                       :label="item.label"
               ></el-option>

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue

@@ -9,8 +9,8 @@
           <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
             <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
               <el-option
-                      v-for="item in standSortOptions"
+                      v-for="(item, index) in standSortOptions"
-                      :key="item.value"
+                      :key="index"
                       :value="item.value"
                       :label="item.label"
               ></el-option>

src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -27,9 +27,9 @@
                                 <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.standSort" filterable clearable>
                                         <el-option
-                                                v-for="item in standSortOptions"
+                                                v-for="(item, index) in standSortOptions"
                                                 placeholder="请选择企标类别"
-                                                :key="item.value"
+                                                :key="index"
                                                 :value="item.value"
                                                 :label="item.label"
                                         ></el-option>

src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue

@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-产品标准</template>
-        <template slot="proNode">审核</template>
+        <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -18,18 +18,19 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <formList
+              <formList
-                        :form = "form"
+                :form = "form"
-                        :FBGBUSSFileList = "FBGBUSSFileList"
+                :FBGBUSSFileList = "FBGBUSSFileList"
-                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                :LSBBBUSSFileList = "LSBBBUSSFileList"
-                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                :BZSMBUSSFileList = "BZSMBUSSFileList"
-                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                :QTWJBUSSFileList = "QTWJBUSSFileList"
-                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                :GLWJBUSSFileList = "GLWJBUSSFileList"
-                        :disabledState = "disabledState"
+                :XGDFileList = "XGDFileList"
-                        :verifySarStandard = "verifySarStandard"
+                :disabledState = "disabledState"
-                        :opinionsShow = "true"
+                :verifySarStandard = "verifySarStandard"
-                        @emitDataLoading="emitDataLoading"
+                :opinionsShow = "true"
-                ></formList>
+                @emitDataLoading="emitDataLoading"
+              ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">

src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue

@@ -18,18 +18,19 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <formList
+              <formList
-                        :form = "form"
+                :form = "form"
-                        :FBGBUSSFileList = "FBGBUSSFileList"
+                :FBGBUSSFileList = "FBGBUSSFileList"
-                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                :LSBBBUSSFileList = "LSBBBUSSFileList"
-                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                :BZSMBUSSFileList = "BZSMBUSSFileList"
-                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                :QTWJBUSSFileList = "QTWJBUSSFileList"
-                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                :GLWJBUSSFileList = "GLWJBUSSFileList"
-                        :disabledState = "disabledState"
+                :XGDFileList = "XGDFileList"
-                        :verifySarStandard = "verifySarStandard"
+                :disabledState = "disabledState"
-                        :opinionsShow = "true"
+                :verifySarStandard = "verifySarStandard"
-                        @emitDataLoading="emitDataLoading"
+                :opinionsShow = "true"
-                ></formList>
+                @emitDataLoading="emitDataLoading"
+              ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">

src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue

@@ -668,6 +668,7 @@
                     }]
                 },
                 loading: false,
+                drawerModal: false,
                 dataLoading: true,
                 disabledState: true,
                 taskInfo:'标准化复审',
@@ -2096,19 +2097,19 @@
             popoverHideCancel(){
                 this.modalShowFlag1  = false
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+            // popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+            //     if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+            //         if(checkedData.length > 0 && checkedData.length != 0){
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+            //             this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+            //             this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+            //         }else {
-                        this.form.cycvppsbm = checkedData.code
+            //             this.form.cycvppsbm = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+            //             this.form.cycvppscn = checkedData.chineseName
-                    }
+            //         }
-                    this.modalShowFlag2 = false
+            //         this.modalShowFlag2 = false
-                }
+            //     }
-
+            //
-            },
+            // },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },

src/pages/processCenter/pages/creatProcess/qbrk/step8.vue

@@ -592,7 +592,7 @@
                 loading: false,
                 dataLoading: true,
                 drawerModal: false,
-                taskInfo:'起草单位高级经理审核',
+                taskInfo:'批准',
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -436,9 +436,9 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes);
-        this.dataList = mes.dataList;
+        this.dataList = mes.dataList || mes.json.standardInfoList;
-        this.roleForm = mes.roleForm;
+        this.roleForm = mes.roleForm || mes.json.roleForm;
-        this.commentText = mes.commentText;
+        this.commentText = mes.commentText || mes.json.commentText;
       });
     },
     //点击新增事件
@@ -609,6 +609,7 @@ export default {
           this.$message.warning('请完善人员信息')
         } else {
           if(!this.submitFlag){
+            console.log('第一次提交');
             this.$refs['roleForm'].validate((valid) => {
               if (valid) {
                 this.isSubmit = true
@@ -647,6 +648,7 @@ export default {
               }
             })
           }else{
+            console.log('修改后提交');
             this.$refs["roleForm"].validate((valid) => {
               if (valid) {
                 let specialJson = {

src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue

@@ -360,7 +360,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: item.key || item.standId,
-          pageType: "INLAND_STAND"
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/processCenter/pages/creatProcess/xmpg/step1.vue

@@ -538,6 +538,9 @@ export default {
       /**
        * 获取项目群筛选项的值
        */
+      this.managementHostName =  [] //管理主体名称下拉框
+      this.developmentHostName = [] //开发主体名称下拉框
+      this.categoryName = [] //项目细分类下拉框
       this.$http.post("sarStandProjectLibrary/querySelect", {
         ...this.projectSearch
       }, {
@@ -645,6 +648,7 @@ export default {
         this.$message.warning("请选择一条数据进行带入");
       } else {
         this.addShow = false
+        this.dataList = []
         this.projectId = this.selectedList[0].id;
         this.listForm.projectId = this.selectedList[0].id;
         this.listForm.projectNumber = this.selectedList[0].projectNumber;
@@ -879,7 +883,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: item.standId,
-          pageType: "INLAND_STAND"
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -254,7 +254,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: item.standId,
-          pageType: "INLAND_STAND"
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/processCenter/pages/creatProcess/xmpg/step3.vue

@@ -658,7 +658,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: item.standId,
-          pageType: "INLAND_STAND"
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/processCenter/pages/creatProcess/xmpg/step4.vue

@@ -374,7 +374,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: item.key || item.standId,
-          pageType: "INLAND_STAND"
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -371,7 +371,7 @@ export default {
         name: "OtherStandardDetails",
         params: {
           id: item.key || item.standId,
-          pageType: "INLAND_STAND"
+          pageType: item.standType + '_STAND'
         }
       });
       window.open(routeUrl.href, "_blank");

src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -105,6 +97,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -123,13 +125,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue

@@ -42,15 +42,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled" style="float: left">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
                 <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     :picker-options="pickerOptions"
@@ -125,6 +116,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -143,13 +144,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
@@ -242,6 +236,41 @@
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                <el-form-item label="管理主体" class="search-item search-item-last">
+                  <el-select v-model="projectSearch.managementHostName"
+                             @change="optionsChange(projectSearch)"
+                             placeholder="请选择管理主体" filterable clearable>
+                    <el-option
+                      v-for="(item, index) in managementHostName"
+                      :key="index"
+                      :value="item"
+                      :label="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="开发主体" class="search-item search-item-last">
+                  <el-select v-model="projectSearch.developmentHostName"  @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
+                    <el-option
+                      v-for="(item, index) in developmentHostName"
+                      :key="index"
+                      :value="item"
+                      :label="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="项目细分类" class="search-item search-item-last">
+                  <el-select v-model="projectSearch.categoryName"  @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
+                    <el-option
+                      v-for="(item, index) in categoryName"
+                      :key="index"
+                      :value="item"
+                      :label="item"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="项目编号" class="search-item search-item-last">
                   <el-input
                     v-model="projectSearch.projectNumber"
@@ -259,7 +288,7 @@
                     type="primary"
                     class="common-button-primary"
                     size="small"
-                    v-btn-permission=""
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
                     @click="getProjectDataBtn">
                     查询
                   </el-button>
@@ -268,7 +297,7 @@
                   <el-button
                     class="common-button-default"
                     size="small"
-                    v-btn-permission=""
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
                     @click="clearSearch">清空
                   </el-button>
                 </el-form-item>
@@ -326,141 +355,6 @@
         <el-button type="primary" size="mini" @click="OkProject">带入</el-button>
       </div>
     </el-drawer>
-    <!--   选择清单弹窗-->
-    <el-drawer
-      title="选择清单"
-      :visible.sync="detailedListModel"
-      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">
-                <el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
-                  <el-select
-                    v-model="sarSarAccessEOSearch.carType"
-                    placeholder="请选择"
-                    filterable
-                    size="small"
-                  >
-                    <el-option
-                      v-for="item in energyKindOptions"
-                      :value="item.value"
-                      :key="item.value"
-                      :label="item.label"
-                    />
-                  </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
-                    type="primary"
-                    class="common-button-primary"
-                    size="small"
-                    @click="searchSarAccess">
-                    查询
-                  </el-button>
-                </el-form-item>
-                <el-form-item class="search-item btn-box">
-                  <el-button
-                    class="common-button-default"
-                    size="small"
-                    @click="clearSearchAccess">清空
-                  </el-button>
-                </el-form-item>
-              </el-form>
-            </div>
-            <el-table
-              :data="sarAccessListDatas"
-              tooltip-effect="dark"
-              style="width: 100%; padding: 0 3px"
-              border
-              height="100%"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectListChange"
-              @select="handleSelectionChanges"
-              ref="listSelection"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center" />
-              <el-table-column
-                prop="carTypeShow"
-                label="车型类别"
-                align="center">
-              </el-table-column>
-              <el-table-column
-                prop="detailedListName"
-                label="清单名称"
-                align="center"
-                width="260px"
-              >
-                <!--                <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="updateTime"
-                label="更新时间"
-                align="center">
-                <template slot-scope="scope">
-                  <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
-                    }}
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="updatePeople"
-                label="更新人"
-                align="center">
-              </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="closeDrawer">取消</el-button>
-        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
-      </div>
-    </el-drawer>
     <!--    添加标准抽屉-->
     <el-drawer
       title="添加标准"
@@ -935,10 +829,16 @@ export default {
         carType: "",
         detailedListName: ""
       },
+      managementHostName: [], //管理主体名称下拉框
+      developmentHostName: [], //开发主体名称下拉框
+      categoryName: [], //项目细分类下拉框
+      //项目检索条件
       projectSearch: {
         projectNumber: "",
-        projectName: ""
+        projectName: "",
-
+        managementHostName: "", //管理主体
+        developmentHostName: "", //开发主体
+        categoryName: "" //项目细分类
       },
       qdform: {
         projectId:"",
@@ -963,9 +863,6 @@ export default {
         projectNumber: [
           { type: "string", required: true, message: "请输入项目编号", trigger: "change" }
         ],
-        detailedListName: [
-          { required: true, message: "请输入清单名称", trigger: "change" }
-        ],
         endTime: [
           {required: true, message: '请输入截止时间', trigger: 'change'},
         ],
@@ -982,6 +879,35 @@ export default {
     };
   },
   methods: {
+    optionsChange(){
+      /**
+       * 获取项目群筛选项的值
+       */
+      this.managementHostName =  [] //管理主体名称下拉框
+      this.developmentHostName = [] //开发主体名称下拉框
+      this.categoryName = [] //项目细分类下拉框
+      this.$http.post("sarStandProjectLibrary/querySelect", {
+        ...this.projectSearch
+      }, {
+        _this: this
+      }, res => {
+        res.data.managementHostList.forEach(item => {
+          if (item) {
+            this.managementHostName.push(item);   //管理主体
+          }
+        });
+        res.data.developmentHostList.forEach(item => {
+          if (item) {
+            this.developmentHostName.push(item);   //开发主体
+          }
+        });
+        res.data.categoryList.forEach(item => {
+          if (item) {
+            this.categoryName.push(item);   //项目细分类
+          }
+        });
+      });
+    },
     formatIssueDate(str) {
       const momentDate = this.$moment(str)
       if (momentDate.isValid()) {
@@ -1232,6 +1158,7 @@ export default {
         this.qdform.projectNumber = this.selectProject[0].projectNumber;
         this.qdform.projectName = this.selectProject[0].projectName;
         this.qdform.projectId = this.selectProject[0].id;
+        this.getStandData(this.qdform.projectId)
         this.projectModel = false;
       }
 
@@ -1309,7 +1236,7 @@ export default {
     },
     //查询清单下的标准
     getStandData(id) {
-      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+      this.$http.get("sarStandProjectLibrary/queryStandInfoNew", {
         id: id,
         page: 1,
         Size: 100
@@ -1473,6 +1400,7 @@ export default {
     },
   },
   mounted() {
+    this.optionsChange()
     if(this.$route.query.bpnId){
       this.bpnId = this.$route.query.bpnId
         queryTaskFirst({

src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -111,6 +103,16 @@
               <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
+          <el-table-column
+            prop="textStatus"
+            label="标准状态"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="ssrq"
             width="190px"
@@ -129,13 +131,6 @@
             width="190px"
             label="在产车实施日期">
           </el-table-column>
-          <el-table-column
-            prop="zrbm"
-            label="责任部门"
-            align="center"
-            width="180px"
-          >
-          </el-table-column>
         </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -111,6 +103,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -129,13 +131,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue

@@ -38,14 +38,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="qdform.detailedListName"
-                    placeholder="请输入清单名称"
-                    disabled
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -105,6 +97,16 @@
             <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="textStatus"
+          label="标准状态"
+          align="center"
+          width="180px"
+        >
+          <template slot-scope="scope">
+            <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="ssrq"
           width="190px"
@@ -123,13 +125,6 @@
           width="190px"
           label="在产车实施日期">
         </el-table-column>
-        <el-table-column
-          prop="zrbm"
-          label="责任部门"
-          align="center"
-          width="180px"
-        >
-        </el-table-column>
       </el-table>
       <div>
         <el-collapse accordion>

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -67,7 +67,7 @@
                 <el-collapse-item title="回执说明">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText2" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -116,7 +116,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText2: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 nodeList2: [],
@@ -232,7 +232,7 @@
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
                     form: this.form,
-                    commentText: this.commentText,
+                    commentText2: this.commentText2,
                 }))
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
@@ -246,7 +246,7 @@
                     if (valid) {
                         this.isSubmit = true
                         var json = this.json
-                        json.commentText = this.commentText
+                        json.commentText = this.commentText2
                         json.responUserList = this.form.responUserList
                         json.responUserListName = this.form.responUserListName
                         this.$http.post('lawss/activiti/completeTask', {
@@ -279,6 +279,7 @@
                         this.json = data || data.form
                         this.form.responUserList = data.form?  data.form.responUserList : ''
                         this.form.responUserListName = data.form?  data.form.responUserListName : ''
+                        this.commentText2 = data.commentText2 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step4.vue

@@ -81,7 +81,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText4" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -132,7 +132,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText4: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 active: '1', // 默认显示
@@ -223,12 +223,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() { // 同意
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText4
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskIds: this.taskIds,
@@ -242,11 +241,11 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText4) {
                     this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText4
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
@@ -278,6 +277,7 @@
                         this.form.fileId = data.form ? data.form.fileId : data.fileId
                         this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
+                        this.commentText4 = data.commentText4 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step6.vue

@@ -86,7 +86,7 @@
                     <el-collapse-item title="审批意见">
                         <div style="margin: 10px 0;">
                             <van-cell-group>
-                                <van-field value="请输入意见" v-model="commentText" />
+                                <van-field value="请输入意见" v-model="commentText6" />
                             </van-cell-group>
                         </div>
                     </el-collapse-item>
@@ -155,7 +155,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText6: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -279,12 +279,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText6
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -298,11 +297,11 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText6) {
                     this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText6
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -331,6 +330,7 @@
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName
+                        this.commentText6 = data.commentText6 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step7.vue

@@ -78,7 +78,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText7" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -90,8 +90,6 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -122,7 +120,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText7: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -243,12 +241,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText7
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskIds: this.taskIds,
@@ -262,10 +259,10 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText7) {
                     this.isSubmit = true
                     var json = this.json
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText7
                     json.actionFlag = 1
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
@@ -295,6 +292,7 @@
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName
+                        this.commentText7 = data.commentText7 || ''
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/phone/bzdy/step8.vue

@@ -78,7 +78,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText8" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -90,8 +90,6 @@
         <ProcessFooter
                 show-submit
                 :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -122,7 +120,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText8: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -247,10 +245,10 @@
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText8
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
-                    taskIds: this.taskIds,
+                    taskId: this.taskIds,
                     userId: this.$store.getters.userInfo.userId
                 }, {}, res => {
                     if (res.success) {
@@ -261,14 +259,14 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText8) {
                     this.isSubmit = true
                     var json = this.json
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText8
                     json.actionFlag = 1
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
-                        taskIds: this.taskIds,
+                        taskId: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
@@ -291,6 +289,7 @@
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
+                        this.commentText8 = data.commentText8 || ''
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName

src/pages/processCenter/pages/phone/bzdy/step9.vue

@@ -2,7 +2,7 @@
     <div class="phoneBzdyStep9 phoneBox">
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任部门对接人及标准法规部部长审核</template>
+            <template slot="proNode">批准</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -78,7 +78,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText9" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -122,7 +122,7 @@
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
-                commentText: '',
+                commentText9: '',
                 tableData: [],
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -242,15 +242,14 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
-                json.commentText = this.commentText
+                json.commentText = this.commentText9
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
-                    taskIds: this.taskIds,
+                    taskId: this.taskIds,
                     userId: this.$store.getters.userInfo.userId
                 }, {}, res => {
                     if (res.success) {
@@ -261,14 +260,14 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText9) {
                     this.isSubmit = true
                     var json = this.json
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText9
                     json.actionFlag = 1
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
-                        taskIds: this.taskIds,
+                        taskId: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
@@ -288,6 +287,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.commentText9 = data.commentText9 || ''
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

src/pages/processCenter/pages/phone/bzjd/step4.vue

@@ -206,7 +206,7 @@
                                 :rows="3"
                                 resize="none"
                                 placeholder="请输入意见"
-                                v-model="commentText">
+                                v-model="commentText4">
                         </el-input>
                     </div>
                 </el-collapse-item>
@@ -256,7 +256,7 @@
                 sarType: '',
                 itemList: [],
                 loading: true,
-                commentText: '',
+                commentText4: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 textarea: '', // 意见
@@ -346,12 +346,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.resolveFlag = 1
-                json.commentText = this.commentText
+                json.commentText = this.commentText4
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -365,11 +364,11 @@
                 })
             },
             handleSubmitNo () {
-                if (this.commentText) {
+                if (this.commentText4) {
                     this.isSubmit = true
                     var json = this.json
                     json.resolveFlag = 2
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText4
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -394,6 +393,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText4 = data.commentText4 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

src/pages/processCenter/pages/phone/bzjd/step5.vue

@@ -204,7 +204,7 @@
                                 :rows="3"
                                 resize="none"
                                 placeholder="请输入意见"
-                                v-model="commentText">
+                                v-model="commentText5">
                         </el-input>
                     </div>
                 </el-collapse-item>
@@ -242,6 +242,7 @@
         name: "phoneBzjdStep5",
         data() {
             return {
+                commentText5: '',
                 tableIndex: 0,
                 itemLists: [],
                 dialogMadal: false,
@@ -254,7 +255,6 @@
                 sarType: '',
                 itemList: [],
                 loading: true,
-                commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 textarea: '', // 意见
@@ -344,12 +344,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
-                json.resolveFlag = 1
+                json.zrApplyFlag = 1
-                json.commentText = this.commentText
+                json.commentText = this.commentText5
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -363,11 +362,11 @@
                 })
             },
             handleSubmitNo () {
-                if (this.commentText) {
+                if (this.commentText5) {
                     this.isSubmit = true
                     var json = this.json
-                    json.resolveFlag = 2
+                    json.zrApplyFlag = 2
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText5
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -392,6 +391,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText5 = data.commentText5 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

src/pages/processCenter/pages/phone/bzjd/step6.vue

@@ -204,7 +204,7 @@
                                 :rows="3"
                                 resize="none"
                                 placeholder="请输入意见"
-                                v-model="commentText">
+                                v-model="commentText6">
                         </el-input>
                     </div>
                 </el-collapse-item>
@@ -242,6 +242,7 @@
         name: "phoneBzjdStep6",
         data() {
             return {
+                commentText6: '',
                 tableIndex: 0,
                 itemLists: [],
                 dialogMadal: false,
@@ -254,7 +255,6 @@
                 sarType: '',
                 itemList: [],
                 loading: true,
-                commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 textarea: '', // 意见
@@ -344,12 +344,11 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
-                json.resolveFlag = 1
+                json.gcApplyFlag = 1
-                json.commentText = this.commentText
+                json.commentText = this.commentText6
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -363,11 +362,11 @@
                 })
             },
             handleSubmitNo () {
-                if (this.commentText) {
+                if (this.commentText6) {
                     this.isSubmit = true
                     var json = this.json
-                    json.resolveFlag = 2
+                    json.gcApplyFlag = 2
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText6
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -392,6 +391,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText6 = data.commentText6 || ''
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

src/pages/processCenter/pages/phone/bzpg/step2.vue

@@ -0,0 +1,393 @@
+<template>
+  <div class="phoneXmpgStep2 phoneBox">
+    <ProcessHeaderPhone toggle>
+      <template slot="proName">标准合规评估流程</template>
+      <template slot="proNode">审核</template>
+    </ProcessHeaderPhone>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="overflow: auto;">
+        <el-form
+          v-if="!foldFormFlag"
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="210px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  class="input-jump"
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  readonly
+                  @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  class="input-jump"
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  readonly
+                  @click.native="handlePreview(listForm)"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" v-if="listForm.certifiedEngineerName !== ''" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="请选择认证工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" v-else prop="certifiedEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.certifiedEngineerName"
+                  placeholder="--"
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-if="listForm.qualityEngineerName !== '' " label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="请选择质量工程师"
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-else label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
+                <el-input
+                  readonly
+                  v-model="listForm.qualityEngineerName"
+                  placeholder="--"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+        <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+      </div>
+      <ProcessTitle>
+        <template slot="title">填写信息</template>
+      </ProcessTitle>
+      <el-table
+        :data="dataList"
+        border
+        ref="selection"
+        height="100%"
+        style="width: 100%;"
+        :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
+          align="center"
+          prop="projectGroup"
+          label="项目群"/>
+        <el-table-column
+          align="center"
+          prop="managementHostName"
+          label="管理主体"/>
+        <el-table-column
+          align="center"
+          prop="developmentHostName"
+          label="开发主体"/>
+        <el-table-column
+          align="center"
+          prop="categoryName"
+          label="项目细分类"/>
+        <el-table-column
+          align="center"
+          prop="projectGroupPeople"
+          label="项目群责任人">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="distributePerson"
+          label="分发责任人">
+        </el-table-column>
+      </el-table>
+      <el-collapse accordion>
+        <el-collapse-item title="审批意见">
+          <div style="margin: 10px 0;">
+            <el-input
+              type="textarea"
+              :rows="3"
+              resize="none"
+              placeholder="请输入意见"
+              v-model="commentText">
+            </el-input>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+    <div class="content" v-show="active === '2'">
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
+    </div>
+    <ProcessFooter
+      show-transfer
+      show-back
+      show-submit
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="phoneshowflag"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import { Dialog } from 'vant';
+import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+import ProcessFooter from '../../components/ProcessFooter'
+import ProcessTitle from '../../components/ProcessTitle'
+import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+import axios from "axios";
+import ProcessHeader from "process/components/ProcessHeader";
+
+export default {
+  name: "phoneBzpgStep2",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessHeaderPhone,
+    ProcessTitle
+  },
+  data(){
+    return {
+      active: '1',
+      phoneRoleList: [],
+      phoneshowflag: false,
+      //折叠的标志，true为折叠，false为不折叠
+      foldFormFlag: false,
+      drawerModal: false,
+      loading: false,
+      isTransfer: false,
+      isSubmit: false,
+      saveLoading: false,
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      commentText: '',
+      drawerTitle: '',
+      listForm: {},
+      dataList: [],
+      detailData: [],
+      nodeList: [],
+    }
+  },
+  mounted() {
+    this.getData()
+    this.processTable()
+  },
+  methods: {
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(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.dataList.distributePerson = item.dataList[0].distributePerson
+        this.listForm.breakdownList = item.breakdownList
+      })
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    //折叠/展开基础信息方法
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //提交
+    handleSubmit(){
+      this.listForm.commentText = this.commentText
+      this.listForm.stepFlag =  '0'
+      const json = JSON.stringify(this.listForm);
+      this.isSubmit = true
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+        this.isSubmit = false
+      }, e => {
+      });
+    },
+    //驳回
+    beforeBack(){
+      if(!this.commentText){
+        this.$message.warning('请填写审批意见')
+      }else{
+        this.listForm.commentText = this.commentText
+        this.listForm.stepFlag =  '1'
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
+      }
+    },
+    //确认转办
+    drawerCheck (data) {
+      this.roleTransfer = data
+      this.phoneRoleList = this.roleTransfer
+      this.turnLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res =>{
+        if (res.success) {
+          this.turnLoading = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter")
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+      this.modalshowflag = false
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办按钮
+    handleTransfer(){
+      this.phoneshowflag = true
+      this.phoneRoleList = this.roleTransfer
+      this.phoneDrawerTitle = '转办处理人'
+    },
+    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 => {})
+    },
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+.phoneXmpgStep2 {
+  /deep/.van-dialog__content {
+    min-height: 300px;
+    padding: 10px;
+  }
+  .prc-content-border {
+    overflow: auto;
+  }
+  /deep/.prc-content-border .el-form-item__content {
+    width: 270px;
+  }
+  .content {
+    border-top: 1px solid #DCDFE6;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: 52px;
+    //height: calc(~'100% - 155px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>

src/pages/processCenter/pages/phone/bzpg/step6.vue

@@ -136,29 +136,35 @@
         style="width: 100%"
         border
         @selection-change="selectStandChange"
-        height="55%"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
-          prop="productLine"
+          type="selection"
-          align="center"
+          width="55"
-          width="200"
+          align="center">
-          label="产品线">
         </el-table-column>
         <el-table-column
-          prop="projectNumber"
           align="center"
-          width="200"
+          min-width="180"
+          prop="projectGroup"
+          label="项目群">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectNumber"
           label="项目编号">
         </el-table-column>
         <el-table-column
-          prop="projectName"
+          min-width="300"
+          :show-overflow-tooltip="true"
           align="center"
-          width="200"
+          prop="projectName"
           label="项目名称">
         </el-table-column>
         <el-table-column
-          prop="itemNum"
+          prop="itemsNum"
           align="center"
           width="200"
           label="条款号">
@@ -170,34 +176,41 @@
           label="条款名称">
         </el-table-column>
         <el-table-column
+          label="条款内容"
+          width="200"
+          show-overflow-tooltip
+          align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
+              查看条款内容
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"
           label="基于上一版本差异">
         </el-table-column>
         <el-table-column
-          prop="xCXSSRQ"
+          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"
+          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="complianceReasons"
@@ -208,7 +221,6 @@
         <el-table-column
           align="center"
           width="160"
-          prop="researchNonCompliance"
           label="不合规">
           <el-table-column
             prop="noCompliance"
@@ -225,25 +237,19 @@
           <el-table-column
             prop="completionTime"
             align="center"
-            width="120"
+            width="140"
             label="完成时间">
             <template slot-scope="scope">
-              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column
-          align="center"
-          width="150"
           prop="implementer"
-          label="落实人">
-        </el-table-column>
-        <el-table-column
           align="center"
-          width="150"
+          width="180"
-          prop="distributePerson"
+          label="评估人"
-          label="责任人">
+        />
-        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
@@ -294,7 +300,7 @@ import axios from "axios";
 import ProcessHeader from "process/components/ProcessHeader";
 
 export default {
-  name: "phoneXmpgStep6",
+  name: "phoneBzpgStep6",
   components: {
     ProcessHeader,
     ProcessFooter,
@@ -498,40 +504,56 @@ export default {
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum
+        if (item.form === undefined) {
-        this.listForm.prcName = this.prcName
+          this.fileType = item.fileType
-        this.dataList = item.dataList
+          this.listForm.prcNum = this.prcNum
-        this.listForm.id = item.step3DTOS[0].id
+          this.listForm.prcName = this.prcName
-        this.listForm.standName = item.step3DTOS[0].standName
+          this.listForm['id'] = item.id
-        this.listForm.standNumber = item.step3DTOS[0].standNumber
+          this.dataList = item.dataList
-        this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName
+        } else {
-        this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName
+          this.listForm = item.form;
-      })
+          this.dataList = item.form.dataList;
+        }
+
+      });
     },
     //驳回事件
     beforeBack () {
       if(!this.commentText){
-      this.$message.warning('请填写审批意见')
+        this.$message.warning('请填写审批意见')
-    } else {
+      }else{
-      this.listForm.fenFlag = '2'
+        this.listForm.dataList = this.dataList
-      this.handleSubmit()
+        this.listForm.passFlag = '1'
-    }
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true
+        this.$http.post('lawss/activiti/completeTask', {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json,
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message)
+            this.$router.push('/processCenter')
+          }
+          this.isSubmit = false
+        }, e => {
+        });
+      }
     },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
-      this.listForm.commentText = this.commentText;
-      this.listForm.standId = this.listForm.standId;
-      this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
+      this.listForm.passFlag = '0'
+      this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
+      this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -545,9 +567,7 @@ export default {
         }
         this.isSubmit = false
       }, e => {
-
       });
-
     },
     //标准表格选择框改变
     selectStandChange(data) {

src/pages/processCenter/pages/phone/bzpg/step7.vue

@@ -2,7 +2,7 @@
   <div class="phoneXmpgStep7 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">标准法规部领导审批</template>
+      <template slot="proNode">审定</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -129,36 +129,51 @@
       <ProcessTitle>
         <template slot="title">填写信息</template>
       </ProcessTitle>
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="(item, index) in projectTabName"
+          :key="index"
+          :label="item"
+          :value="item"
+          :name="item">
+        </el-tab-pane>
+      </el-tabs>
       <el-table
         ref="multipleTable"
-        :data="dataList"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
         tooltip-effect="dark"
         style="width: 100%"
         border
         @selection-change="selectStandChange"
-        height="55%"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
              fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
-          prop="productLine"
+          type="selection"
-          align="center"
+          width="55"
-          width="200"
+          align="center">
-          label="产品线">
         </el-table-column>
         <el-table-column
-          prop="projectNumber"
           align="center"
-          width="200"
+          min-width="180"
+          prop="projectGroup"
+          label="项目群">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectNumber"
           label="项目编号">
         </el-table-column>
         <el-table-column
-          prop="projectName"
+          min-width="300"
+          :show-overflow-tooltip="true"
           align="center"
-          width="200"
+          prop="projectName"
           label="项目名称">
         </el-table-column>
         <el-table-column
-          prop="itemNum"
+          prop="itemsNum"
           align="center"
           width="200"
           label="条款号">
@@ -170,34 +185,41 @@
           label="条款名称">
         </el-table-column>
         <el-table-column
+          label="条款内容"
+          width="200"
+          show-overflow-tooltip
+          align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
+              查看条款内容
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="!changePoint"
           prop="technicalRequir"
           align="center"
           width="250"
           label="核心技术要求/变化点">
         </el-table-column>
         <el-table-column
+          v-if="changePoint"
           prop="changePoint"
           width="250"
           align="center"
           label="基于上一版本差异">
         </el-table-column>
         <el-table-column
-          prop="xCXSSRQ"
+          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"
+          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="complianceReasons"
@@ -208,7 +230,6 @@
         <el-table-column
           align="center"
           width="160"
-          prop="researchNonCompliance"
           label="不合规">
           <el-table-column
             prop="noCompliance"
@@ -225,25 +246,19 @@
           <el-table-column
             prop="completionTime"
             align="center"
-            width="120"
+            width="140"
             label="完成时间">
             <template slot-scope="scope">
-              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
         </el-table-column>
         <el-table-column
-          align="center"
-          width="150"
           prop="implementer"
-          label="落实人">
-        </el-table-column>
-        <el-table-column
           align="center"
-          width="150"
+          width="180"
-          prop="distributePerson"
+          label="评估人"
-          label="责任人">
+        />
-        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
@@ -264,14 +279,12 @@
     </div>
     <ProcessFooter
       show-transfer
-      show-back
       show-submit
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
       @transfer="handleTransfer"
-      @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -294,7 +307,7 @@ import axios from "axios";
 import ProcessHeader from "process/components/ProcessHeader";
 
 export default {
-  name: "phoneXmpgStep7",
+  name: "phoneBzpgStep7",
   components: {
     ProcessHeader,
     ProcessFooter,
@@ -304,7 +317,9 @@ export default {
   data() {
     return {
       phoneshowflag: false,
+      activeName: '',
       phoneRoleList: [],
+      projectTabName: [],
       phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
@@ -388,6 +403,9 @@ export default {
     };
   },
   methods: {
+    handleClick(tab) {
+      this.projectName = tab.name
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
@@ -498,36 +516,34 @@ export default {
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum
+        if (item.form === undefined) {
-        this.listForm.prcName = this.prcName
+          this.fileType = item.fileType
-        this.listForm.id = item.id
+          this.listForm.prcNum = this.prcNum
-        this.dataList = item.dataList
+          this.listForm.prcName = this.prcName
-      })
+          this.listForm['id'] = item.id
-    },
+          this.dataList = item.dataList
-    //驳回事件
+          item.dataList.forEach(item => {
-    beforeBack () {
+            if(!this.projectTabName.includes(item.projectName)){
-      if(!this.commentText){
+              this.projectTabName.push(item.projectName)
-        this.$message.warning('请填写审批意见')
+            }
-      } else {
+          })
-        this.listForm.fenFlag = '2'
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
-        this.handleSubmit()
+        } else {
-      }
+          this.listForm = item.form;
+          this.dataList = item.form.dataList;
+        }
+
+      });
     },
     //提交事件
     handleSubmit() {
-      this.isSubmit = true
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
-      this.listForm.commentText = this.commentText;
-      this.listForm.standId = this.listForm.standId;
-      this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
+      this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
+      this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
@@ -541,7 +557,6 @@ export default {
         }
         this.isSubmit = false
       }, e => {
-
       });
 
     },

src/pages/processCenter/pages/phone/bzpg/step8.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="phoneXmpgStep2 phoneBox">
+  <div class="phoneXmpgStep7 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">业务经理审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -129,39 +129,136 @@
       <ProcessTitle>
         <template slot="title">填写信息</template>
       </ProcessTitle>
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane
+          v-for="(item, index) in projectTabName"
+          :key="index"
+          :label="item"
+          :value="item"
+          :name="item">
+        </el-tab-pane>
+      </el-tabs>
       <el-table
-        :data="dataList"
+        ref="multipleTable"
+        :data="dataList.filter(item =>{return item.projectName === projectName})"
+        tooltip-effect="dark"
+        style="width: 100%"
         border
-        ref="selection"
-        height="100%"
-        style="width: 100%;"
         @selection-change="selectStandChange"
+        height="100%"
         :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
         <el-table-column
-          prop="productLine"
+          type="selection"
-          min-width="150"
+          width="55"
-          align="center"
+          align="center">
-          label="产品线">
         </el-table-column>
         <el-table-column
-          prop="productLine"
-          min-width="200"
           align="center"
+          min-width="180"
+          prop="projectGroup"
+          label="项目群">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          min-width="180"
+          prop="projectNumber"
+          label="项目编号">
+        </el-table-column>
+        <el-table-column
+          min-width="300"
+          :show-overflow-tooltip="true"
+          align="center"
+          prop="projectName"
           label="项目名称">
         </el-table-column>
         <el-table-column
-          prop="uname"
+          prop="itemsNum"
-          min-width="150"
           align="center"
-          label="产品线责任人">
+          width="200"
+          label="条款号">
         </el-table-column>
         <el-table-column
-          prop="distributePerson"
+          prop="itemsName"
-          min-width="150"
+          width="200"
           align="center"
-          label="分发责任人">
+          label="条款名称">
         </el-table-column>
+        <el-table-column
+          label="条款内容"
+          width="200"
+          show-overflow-tooltip
+          align="center">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
+              查看条款内容
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="!changePoint"
+          prop="technicalRequir"
+          align="center"
+          width="250"
+          label="核心技术要求/变化点">
+        </el-table-column>
+        <el-table-column
+          v-if="changePoint"
+          prop="changePoint"
+          width="250"
+          align="center"
+          label="基于上一版本差异">
+        </el-table-column>
+        <el-table-column
+          prop="xcxssrq"
+          width="200"
+          align="center"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="zccssrq"
+          width="200"
+          align="center"
+          label="在产车实施日期">
+        </el-table-column>
+        <el-table-column
+          prop="complianceReasons"
+          align="center"
+          width="160"
+          label="合规">
+        </el-table-column>
+        <el-table-column
+          align="center"
+          width="160"
+          label="不合规">
+          <el-table-column
+            prop="noCompliance"
+            align="center"
+            width="170"
+            label="不合规项目">
+          </el-table-column>
+          <el-table-column
+            prop="countermeasures"
+            align="center"
+            width="160"
+            label="应对措施">
+          </el-table-column>
+          <el-table-column
+            prop="completionTime"
+            align="center"
+            width="140"
+            label="完成时间">
+            <template slot-scope="scope">
+              <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column
+          prop="implementer"
+          align="center"
+          width="180"
+          label="评估人"
+        />
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
@@ -182,14 +279,12 @@
     </div>
     <ProcessFooter
       show-transfer
-      show-back
       show-submit
       :transfer-loading="isTransfer"
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
       :approval="true"
       @transfer="handleTransfer"
-      @back="beforeBack"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -212,7 +307,7 @@ import axios from "axios";
 import ProcessHeader from "process/components/ProcessHeader";
 
 export default {
-  name: "phoneXmpgStep2",
+  name: "phoneBzpgStep8",
   components: {
     ProcessHeader,
     ProcessFooter,
@@ -222,7 +317,9 @@ export default {
   data() {
     return {
       phoneshowflag: false,
+      activeName: '',
       phoneRoleList: [],
+      projectTabName: [],
       phoneDrawerTitle: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
@@ -306,6 +403,9 @@ export default {
     };
   },
   methods: {
+    handleClick(tab) {
+      this.projectName = tab.name
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
@@ -416,30 +516,32 @@ export default {
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
+    getFormFieldList(item) {
       this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm = JSON.parse(JSON.stringify(item));
-        this.listForm.prcNum = this.prcNum
+        if (item.form === undefined) {
-        this.listForm.prcName = this.prcName
+          this.fileType = item.fileType
-        this.listForm['id'] = item.id
+          this.listForm.prcNum = this.prcNum
-        this.listForm.dataList = item.dataList
+          this.listForm.prcName = this.prcName
-        this.dataList = item.dataList
+          this.listForm['id'] = item.id
-        this.dataList.distributePerson = item.dataList[0].distributePerson
+          this.dataList = item.dataList
-        this.listForm.breakdownList = item.breakdownList
+          item.dataList.forEach(item => {
-      })
+            if(!this.projectTabName.includes(item.projectName)){
-    },
+              this.projectTabName.push(item.projectName)
-    //驳回事件
+            }
-    beforeBack () {
+          })
-      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+          this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]]
-        this.$message.warning('请填写审批意见')
+        } else {
-      }else{
+          this.listForm = item.form;
-        this.listForm.passFlag = '1'
+          this.dataList = item.form.dataList;
-        this.handleSubmit()
+        }
-      }
+
+      });
     },
     //提交事件
     handleSubmit() {
-      this.listForm.commentText = this.commentText
+      this.listForm.dataList = this.dataList
+      this.listForm.commentText = this.commentText;
       const json = JSON.stringify(this.listForm);
       this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
@@ -491,7 +593,7 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/phone';
-.phoneXmpgStep2 {
+.phoneXmpgStep7 {
   /deep/.van-dialog__content {
     min-height: 300px;
     padding: 10px;

src/pages/processCenter/pages/phone/bzqdfb/step2.vue

@@ -0,0 +1,541 @@
+<!--标准法规清单发布 - 会签-->
+<template>
+  <div class="phoneBzqdfbStep4 phoneBox">
+    <ProcessHeaderPhone toggle>
+      <template slot="proName">标准清单发布/更新流程</template>
+      <template slot="proNode">会签</template>
+    </ProcessHeaderPhone>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '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="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
+                  disabled
+                  v-model="listForm.descriptionList"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                <div class="file-box" v-if="fileList.length > 0">
+                  <p v-for="item in fileList"
+                     :key="item.id"  @click="clickButtonToUpload2(item.id)">
+                    {{ item.name }}
+                    <i
+                      title="下载"
+                      @click="downloadFile(item.id)"
+                      class="icon-download"
+                      v-btn-permission="''"
+                    />
+                    <i
+                      title="下载带水印"
+                      @click="downloadFileByWater(item.id, item.name)"
+                      class="icon-download2"
+                      v-btn-permission="''"
+                    />
+                  </p>
+                </div>
+                <div v-else>
+                  暂无数据
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          tooltip-effect="dark"
+          height="50%"
+          style="width: 100%"
+          @selection-change="selectStandChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            prop="code"
+            min-width="160"
+            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"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            min-width="80"
+            label="发布日期">
+          </el-table-column>
+          <el-table-column
+            prop="XCXSSRQ"
+            min-width="130"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="ZCCSSRQ"
+            min-width="130"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            width="100px"
+            align="center"
+            label="文本状态">
+            <template slot-scope="scope">
+              <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="审批意见">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      show-transfer
+      :transfer-loading="isTransfer"
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @transfer="handleTransfer"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="modalshowflag"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import { Dialog } from 'vant';
+import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
+import axios from "axios";
+
+export default {
+  name: "phoneBzqdfbStep4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessHeaderPhone,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      nodeList:[],
+      dataList: [],//清单里的标准数据
+      active: "1",
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      isTransfer: false,
+      drawerTitle:'',
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      fileList:[],
+      fileIds: "",
+      commentText: "", //填写会签意见
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        listType: "", //区分是哪个清单
+        listName: "", //清单名称
+        // applyRegion: "", //适用区域
+        descriptionList: "", //清单说明
+        enclosure: "", //附件
+        inforlist: "",//用来存放标准的id
+        dataList: [{
+          standNumber: "", //标准号
+          cnName: "", //中文名称
+          enName: "", //英文名称
+          isSubTime: "", //发布日期
+          newCarTime: "", //新车型实施日期
+          oldCarTime: "", //在产车实施日期
+          applyCar: "", //适用车型
+          textState: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      // countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
+    };
+  },
+  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(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    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.dataList = item.dataList;
+        this.listForm.jlUserId = item.jlUserId;
+        this.listForm.zrUserId = item.zrUserId;
+        item.fileName.forEach(itemId => {
+          this.fileIds = itemId.id
+          this.getFileInfo();
+        });
+      });
+    },
+    // 请求上传的文件信息
+    getFileInfo() {
+      this.$http.get("att/attFile/getMultiFileInfos", {
+        fileIds: this.fileIds
+      }, {
+        _this: this
+      }, res => {
+        this.$nextTick(() => {
+          res.data.map(item => {
+            // 赋值要回显的上传文件内容
+            this.fileList.push({
+              name: item.oldFileName,
+              uid: item.uid,
+              status: item.status,
+              id: item.id,
+              fileSuffix: item.fileSuffix
+            });
+          });
+        });
+      }, e => {
+      });
+    },
+    //预览
+    clickButtonToUpload2(file) {
+      const attId = file
+      this.$preview(attId)
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+        this.$message.error('水印下载仅支持PDF,pdf格式文件')
+      } else {
+        if (attId != null && attId !== '') {
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+        } else {
+          this.$message.error('请选择要下载的文件')
+        }
+      }
+    },
+    //确认转办
+    checkedRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true
+      this.listForm.commentText = this.commentText;
+      this.listForm.approvalOpinion = "";
+      this.listForm.signFlag = "";
+      const json = JSON.stringify(this.listForm);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false
+      }, e => {
+
+      });
+    },
+    //选择标准取消事件
+    closeDrawer() {
+      this.ListModel = false;
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+// 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  watch: {},
+  mounted() {
+//从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.standStateOptions);
+    });
+    this.processTable();
+    this.getData();
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+.phoneBzqdfbStep4 {
+  /deep/.van-dialog__content {
+    min-height: 300px;
+    padding: 10px;
+  }
+  .prc-content-border {
+    overflow: auto;
+  }
+  /deep/.prc-content-border .el-form-item__content {
+    width: 270px;
+  }
+  //.headerTabs {
+  //  height: 52px;
+  //  display: flex;
+  //  align-items: center;
+  //  position: absolute;
+  //  top: 52px;
+  //  right: 10px;
+  //  .headerTabsItem {
+  //    border: 1px solid #c1c1c1;
+  //    padding: 0 5px;
+  //    height: 30px;
+  //    line-height: 30px;
+  //    cursor: pointer;
+  //  }
+  //  .active {
+  //    border: 1px solid #E6A23C;
+  //    color: #fff;
+  //    background: #E6A23C;
+  //  }
+  //}
+  .content {
+    border-top: 1px solid #DCDFE6;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top: 52px;
+    //height: calc(~'100% - 155px');
+    overflow: auto;
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+    }
+  }
+}
+</style>
+

src/pages/processCenter/pages/phone/bzzqyj/step2.vue

@@ -67,7 +67,7 @@
                 <el-collapse-item title="回执说明">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText2" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -170,7 +170,7 @@
             return {
                 drawerModal: false,
                 histortData: [],
-                commentText: "",
+                commentText2: "",
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 nodeList: [],
@@ -299,7 +299,7 @@
                 _formData.append("taskIds", this.taskIds);
                 _formData.append("json", JSON.stringify({
                     form: this.form,
-                    commentText: this.commentText
+                    commentText2: this.commentText2
                 }));
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false;
@@ -314,7 +314,7 @@
                     if (valid) {
                         this.isSubmit = true;
                         var json = this.json;
-                        json.commentText = this.commentText;
+                        json.commentText = this.commentText2;
                         json.responUserList = this.form.responUserList;
                         json.responUserListName = this.form.responUserListName;
                         json.introduce = false;
@@ -341,19 +341,14 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+                        this.commentText2 = data.commentText2 || ''
-                        this.form.endTime = data.endTime
+                        this.form.cid = data.form ? data.form.cid : data.cid
-                        this.form.cname = data.cname
+                        this.form.endTime = data.form ? data.form.endTime : data.endTime
-                        this.form.fjList = data.fjList
+                        this.form.fjList = data.form ? data.form.fjList : data.fjList
-                        // this.form.fjListId = data.fjListId
+                        this.form.textType = data.form ? data.form.textType : data.textType
-                        this.form.textType = data.textType
+                        this.form.modelList = data.form ? data.form.modelList : data.modelList
-                        this.form.modelList = data.modelList
+                        this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName :  '')
-                        this.form.modelNameList = data.modelNameList
+                        this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList :  '')
-                        if (data.fjListId === '') {
-                            this.form.fjListId = ''
-                        } else {
-                            this.form.fjListId = data.fjListId || data.form.fjListId
-                        }
                         this.json = data
                     }).catch(e => {
                     });

src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue

@@ -50,16 +50,19 @@
                                 - -
                             </div>
                         </el-form-item>
-                        <el-form-item label="标准法规工程师分线管理员" prop="bzfgId" class="add-form-item form-item-disabled">
+                        <van-cell-group>
-                            <el-input
+                            <van-field label="标准法规工程师分线管理员" v-model="form.bzfgName" readonly />
-                                    v-model="form.bzfgId"
+                        </van-cell-group>
-                                    style="display: none;"
+<!--                        <el-form-item label="标准法规工程师分线管理员" prop="bzfgName" class="add-form-item form-item-disabled">-->
-                                    clearable
+<!--                            <el-input-->
-                            ></el-input>
+<!--                                    v-model="form.bzfgId"-->
-                            <van-cell-group>
+<!--                                    style="display: none;"-->
-                                <van-field v-model="form.bzfgName" value="请选择标准法规工程师分线管理员" readonly  @click.native="choiceZRR(form.bzfgId)"/>
+<!--                                    clearable-->
-                            </van-cell-group>
+<!--                            ></el-input>-->
-                        </el-form-item>
+<!--                            <van-cell-group>-->
+<!--                                <van-field v-model="form.bzfgName" value="请选择标准法规工程师分线管理员" readonly  @click.native="choiceZRR(form.bzfgId)"/>-->
+<!--                            </van-cell-group>-->
+<!--                        </el-form-item>-->
                     </div>
                 </el-form>
                 <ProcessTitle>
@@ -133,7 +136,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText41" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -245,7 +248,7 @@
                 drawerModal: false,
                 histortData: [],
                 data: [],
-                commentText: '',
+                commentText41: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 roleRow: {},
@@ -368,14 +371,12 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {
-            },
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
                         var json = this.json
-                        json.commentText = this.commentText
+                        json.commentText = this.commentText41
                         json.bzfgId = this.form.bzfgId
                         json.bzfgName = this.form.bzfgName
                         json.spFlag = '0'
@@ -396,10 +397,10 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText41) {
                     var json = this.json
                     json.spFlag = '1'
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText41
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -428,14 +429,15 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText41 = data.commentText41 || ''
+                        this.form.bzfgId = data.startUser
+                        this.form.bzfgName = data.startUserName
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.modelNameList = data.modelNameList || data.form.modelNameList
-                        this.form.bzfgId = data.bzfgId || ''
-                        this.form.bzfgName = data.bzfgName || ''
                         this.json = data
                         this.data = data.info || data.data
                     }).catch(e => {

src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue

@@ -123,7 +123,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText42" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -236,7 +236,7 @@
                 drawerModal: false,
                 histortData: [],
                 data: [],
-                commentText: '',
+                commentText42: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
                 roleRow: {},
@@ -362,12 +362,10 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {
-            },
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
-                json.commentText = this.commentText
+                json.commentText = this.commentText42
                 json.bzFlag = '0'
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
@@ -382,10 +380,10 @@
                 })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText42) {
                     var json = this.json
                     json.bzFlag = '1'
-                    json.commentText = this.commentText
+                    json.commentText = this.commentText42
                     this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskId: this.taskIds,
@@ -414,6 +412,7 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText42 = data.commentText42 || ''
                         this.form.cid = data.cid || data.form.cid
                         this.form.endTime = data.endTime || data.form.endTime
                         this.form.cname = data.cname || data.form.cname

src/pages/processCenter/pages/phone/bzzqyj/step6.vue

@@ -79,7 +79,7 @@
                 </div>
                 <el-table
                         ref="multipleTable"
-                        :data="data"
+                        :data="data2"
                         tooltip-effect="dark"
                         border
                         style="width: 100%; flex: auto;"
@@ -158,7 +158,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText6" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -211,13 +211,14 @@
         name: "phoneBzdyStep6",
         data() {
             return {
+                data2: [],
                 itermsConditionsFlag: false,
                 itermsConditionsTitle: '',
                 drawerModal: false,
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText6: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -362,6 +363,8 @@
                     return "上报";
                 } else if (row === "2") {
                     return "处理后上报";
+                } else {
+                    return "不上报";
                 }
             },
             upload(row, title) {
@@ -400,33 +403,37 @@
             handleTabs(name) {
                 this.active = name;
             },
-            handleSave() {
-            },
             handleSubmit() {
-                this.isSubmit = true;
+                this.$refs['bzzqyjForm'].validate((valid) => {
-                var json = this.json;
+                    if (valid) {
-                json.hqFlag = '0';
+                        this.isSubmit = true;
-                json.user7 = this.form.user7;
+                        var json = this.json;
-                json.user7Name = this.form.user7Name;
+                        json.hqFlag = '0';
-                json.commentText = this.commentText;
+                        json.commentText = this.commentText6;
-                this.$http.post("lawss/activiti/completeTask", {
+                        json.user7 = this.form.user7;
-                    json: JSON.stringify(json),
+                        json.user7Name = this.form.user7Name;
-                    taskId: this.taskIds,
+                        this.$http.post("lawss/activiti/completeTask", {
-                    userId: this.$store.getters.userInfo.userId
+                            json: JSON.stringify(json),
-                }, {}, res => {
+                            taskId: this.taskIds,
-                    if (res.success) {
+                            userId: this.$store.getters.userInfo.userId
-                        this.$message.success("提交成功");
+                        }, {}, res => {
-                        this.$router.push("/processCenter");
+                            if (res.success) {
+                                this.$message.success("提交成功");
+                                this.$router.push("/processCenter");
+                            }
+                            this.isSubmit = false;
+                        });
+                    } else {
+                        this.$message.warning('请选择审批领导')
                     }
-                    this.isSubmit = false;
+                })
-                });
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText6) {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '1';
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText6;
                     this.$http.post("lawss/activiti/completeTask", {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
@@ -455,21 +462,24 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText6 = data.commentText6 || ''
                         this.form.cid = data.cid || data.form.cid;
                         this.form.endTime = data.endTime || data.form.endTime;
                         this.form.cname = data.cname || data.form.cname;
-                        this.oldData = JSON.parse(JSON.stringify(data.info))
+                        let newArr = data.info ? data.info : data.form.data
-                        var arr = []
+                        this.oldData = JSON.parse(JSON.stringify(newArr))
-                        data.info.forEach(item => {
+                        let arr = []
+                        newArr.forEach(item => {
                             if (item.state != '3') {
                                 arr.push(item)
                             }
                         })
                         this.json = data
+                        this.data2 = newArr
+                        this.data = arr
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
                         this.form.modelNameList = data.modelNameList || data.form.modelNameList
-                        this.data = arr
                     }).catch(e => {
                     });
                 });

src/pages/processCenter/pages/phone/bzzqyj/step7.vue

@@ -148,7 +148,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText7" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -200,7 +200,7 @@
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText7: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -358,44 +358,42 @@
             handleTabs(name) {
                 this.active = name;
             },
-            handleSave() {
-            },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true
-                    var json = this.json;
+                var json = this.json
-                    json.hqFlag = '0';
+                json.bdFlag = '0'
-                    json.commentText = this.commentText;
+                json.commentText = this.commentText7
-                    this.$http.post("lawss/activiti/completeTask", {
+                this.$http.post('lawss/activiti/completeTask', {
-                        json: JSON.stringify(json),
+                    json: JSON.stringify(json),
-                        taskId: this.taskIds,
+                    taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
+                    userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                }, {}, res => {
-                        if (res.success) {
+                    if (res.success) {
-                            this.$message.success("提交成功");
+                        this.$message.success('提交成功')
-                            this.$router.push("/processCenter");
+                        this.$router.push('/processCenter')
-                        }
+                    }
-                        this.isSubmit = false;
+                    this.isSubmit = false
-                    });
+                })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText7) {
-                    this.isSubmit = true;
+                    this.isSubmit = true
-                    var json = this.json;
+                    var json = this.json
-                    json.hqFlag = '1';
+                    json.bdFlag = '1'
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText7
-                    this.$http.post("lawss/activiti/completeTask", {
+                    this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
-                            this.$message.success("驳回成功");
+                            this.$message.success('驳回成功')
-                            this.$router.push("/processCenter");
+                            this.$router.push('/processCenter')
                         }
-                        this.isSubmit = false;
+                        this.isSubmit = false
-                    });
+                    })
                 } else {
-                    this.$message.warning("请输入反馈意见");
+                    this.$message.warning('请输入反馈意见')
                 }
             },
             getData() {
@@ -411,6 +409,7 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText7 = data.commentText7 || ''
                         this.form.cid = data.cid || data.form.cid;
                         this.form.endTime = data.endTime || data.form.endTime;
                         this.form.cname = data.cname || data.form.cname;

src/pages/processCenter/pages/phone/bzzqyj/step8.vue

@@ -148,7 +148,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText8" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -200,7 +200,7 @@
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText8: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -361,41 +361,41 @@
             handleSave() {
             },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true
-                    var json = this.json;
+                var json = this.json
-                    json.hqFlag = '0';
+                json.directorFlag = '0'
-                    json.commentText = this.commentText;
+                json.commentText = this.commentText8
-                    this.$http.post("lawss/activiti/completeTask", {
+                this.$http.post('lawss/activiti/completeTask', {
-                        json: JSON.stringify(json),
+                    json: JSON.stringify(json),
-                        taskId: this.taskIds,
+                    taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
+                    userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                }, {}, res => {
-                        if (res.success) {
+                    if (res.success) {
-                            this.$message.success("提交成功");
+                        this.$message.success('提交成功')
-                            this.$router.push("/processCenter");
+                        this.$router.push('/processCenter')
-                        }
+                    }
-                        this.isSubmit = false;
+                    this.isSubmit = false
-                    });
+                })
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText8) {
-                    this.isSubmit = true;
+                    this.isSubmit = true
-                    var json = this.json;
+                    var json = this.json
-                    json.hqFlag = '1';
+                    json.directorFlag = '1'
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText8
-                    this.$http.post("lawss/activiti/completeTask", {
+                    this.$http.post('lawss/activiti/completeTask', {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
                         userId: this.$store.getters.userInfo.userId
                     }, {}, res => {
                         if (res.success) {
-                            this.$message.success("驳回成功");
+                            this.$message.success('驳回成功')
-                            this.$router.push("/processCenter");
+                            this.$router.push('/processCenter')
                         }
-                        this.isSubmit = false;
+                        this.isSubmit = false
-                    });
+                    })
                 } else {
-                    this.$message.warning("请输入反馈意见");
+                    this.$message.warning('请输入反馈意见')
                 }
             },
             getData() {
@@ -416,6 +416,7 @@
                         this.form.cname = data.cname || data.form.cname;
                         this.oldData = JSON.parse(JSON.stringify(data.info))
                         var arr = []
+                        this.commentText8 = data.commentText8 || ''
                         data.info.forEach(item => {
                             if (item.state != '3') {
                                 arr.push(item)

src/pages/processCenter/pages/phone/bzzqyj/step9.vue

@@ -148,7 +148,7 @@
                 <el-collapse-item title="审批意见">
                     <div style="margin: 10px 0;">
                         <van-cell-group>
-                            <van-field value="请输入意见" v-model="commentText" />
+                            <van-field value="请输入意见" v-model="commentText9" />
                         </van-cell-group>
                     </div>
                 </el-collapse-item>
@@ -200,7 +200,7 @@
                 histortData: [],
                 oldData: [],
                 data: [],
-                commentText: "",
+                commentText9: "",
                 oldText: "",
                 newText: "",
                 reason: "",
@@ -373,31 +373,29 @@
             handleTabs(name) {
                 this.active = name;
             },
-            handleSave() {
-            },
             handleSubmit() {
-                    this.isSubmit = true;
+                this.isSubmit = true;
-                    var json = this.json;
+                var json = this.json;
-                    json.hqFlag = '0';
+                json.presidentFlag = '0';
-                    json.commentText = this.commentText;
+                json.commentText = this.commentText9;
-                    this.$http.post("lawss/activiti/completeTask", {
+                this.$http.post("lawss/activiti/completeTask", {
-                        json: JSON.stringify(json),
+                    json: JSON.stringify(json),
-                        taskId: this.taskIds,
+                    taskId: this.taskIds,
-                        userId: this.$store.getters.userInfo.userId
+                    userId: this.$store.getters.userInfo.userId
-                    }, {}, res => {
+                }, {}, res => {
-                        if (res.success) {
+                    if (res.success) {
-                            this.$message.success("提交成功");
+                        this.$message.success("提交成功");
-                            this.$router.push("/processCenter");
+                        this.$router.push("/processCenter");
-                        }
+                    }
-                        this.isSubmit = false;
+                    this.isSubmit = false;
-                    });
+                });
             },
             handleSubmitNo() {
-                if (this.commentText) {
+                if (this.commentText9) {
                     this.isSubmit = true;
                     var json = this.json;
-                    json.hqFlag = '1';
+                    json.presidentFlag = '1';
-                    json.commentText = this.commentText;
+                    json.commentText = this.commentText9;
                     this.$http.post("lawss/activiti/completeTask", {
                         json: JSON.stringify(json),
                         taskIds: this.taskIds,
@@ -426,6 +424,7 @@
                         } else {
                             this.form.fjListId =  data.form.fjListId || data.fjListId
                         }
+                        this.commentText9 = data.commentText9 || ''
                         this.form.cid = data.cid || data.form.cid;
                         this.form.endTime = data.endTime || data.form.endTime;
                         this.form.cname = data.cname || data.form.cname;

src/pages/processCenter/pages/phone/qbfz/step5.vue

@@ -11,6 +11,7 @@
     <div class="content" v-show="active === '1'">
       <div style="overflow: auto;">
         <el-form
+          ref="qbfsForm"
           :model="qbfsForm"
           class="label-input-form"
           :rules="formRules"

src/pages/processCenter/pages/phone/qbfz/step6.vue

@@ -11,6 +11,7 @@
     <div class="content" v-show="active === '1'">
       <div style="overflow: auto;">
         <el-form
+          ref="qbfsForm"
           :model="qbfsForm"
           class="label-input-form"
           :rules="formRules"

src/pages/processCenter/pages/phone/qbfz/step7.vue

@@ -11,6 +11,7 @@
     <div class="content" v-show="active === '1'">
       <div style="overflow: auto;">
         <el-form
+          ref="qbfsForm"
           :model="qbfsForm"
           class="label-input-form"
           :rules="formRules"

src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue

@@ -0,0 +1,967 @@
+<template>
+  <form>
+    <ProcessTitle>
+      <template slot="title">基础信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standSort" filterable clearable :disabled="form.standStatus && form.standStatus === '3'">
+              <el-option
+                      v-for="item in standSortOptions"
+                      placeholder="请选择企标类别"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standName"
+                    placeholder="请输入中文名称"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.issueTime"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+          <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.BARQ"
+                           :editable="false"
+                           placeholder="请选择企标备案日期"
+                           value-format="yyyy-MM-dd"
+            ></el-datePicker>
+          </el-form-item>
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.expirationDate"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+          <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
+          <!--                                    <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
+          <!--                                        <el-option-->
+          <!--                                                v-for="item in standStateOptions"-->
+          <!--                                                placeholder="请选择"-->
+          <!--                                                :key="item.value"-->
+          <!--                                                :value="item.value"-->
+          <!--                                                :label="item.label"-->
+          <!--                                        ></el-option>-->
+          <!--                                    </el-select>-->
+          <!--                                </el-form-item>-->
+          <el-form-item v-show="fbNode || form.standStatus === '3'" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+              <el-input v-model="form.standYear" disabled
+                        placeholder="请输入标准年份"
+                        clearable></el-input>
+          </el-form-item>
+          <!--                                <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
+          <!--                                    <el-datePicker v-model="form.FSRQBUSS"-->
+          <!--                                                   :editable="false"-->
+          <!--                                                   :disabled="true"-->
+          <!--                                                   placeholder="请选择废止日期"-->
+          <!--                                                   value-format="yyyy-MM-dd"-->
+          <!--                                                   clearable></el-datePicker>-->
+          <!--                                </el-form-item>-->
+        </el-col>
+        <el-col :span="12">
+          <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+          <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+          <!--                                  <el-option-->
+          <!--                                      v-for="item in countryOptions"-->
+          <!--                                      placeholder="请选择"-->
+          <!--                                      :key="item.value"-->
+          <!--                                      :value="item.value"-->
+          <!--                                      :label="item.label"-->
+          <!--                                  ></el-option>-->
+          <!--                                </el-select>-->
+          <!--                              </el-form-item>-->
+          <!--                                <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+          <!--                                    <el-input-->
+          <!--                                            v-model="form.standNumber"-->
+          <!--                                            placeholder="请输入企标编号"-->
+          <!--                                            clearable-->
+          <!--                                    ></el-input>-->
+          <!--                                </el-form-item>-->
+          <el-form-item label="企业标准号" v-show="fbNode || form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standCode" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standEnName"
+                    placeholder="请输入英文名称"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.putTime"
+                           :editable="false"
+                           placeholder="请选择企标实施日期"
+                           value-format="yyyy-MM-dd"
+            ></el-datePicker>
+          </el-form-item>
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable disabled>
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
+          <!--          <el-datePicker v-model="form.issueTime"-->
+          <!--                         :editable="false"-->
+          <!--                         placeholder="请选择发布日期"></el-datePicker>-->
+          <!--        </el-form-item>-->
+          <!--                                <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
+          <!--                                    <el-datePicker v-model="form.FZRQBUSS"-->
+          <!--                                                   :editable="false"-->
+          <!--                                                   placeholder="请选择废止日期"-->
+          <!--                                                   value-format="yyyy-MM-dd"-->
+          <!--                                                   clearable></el-datePicker>-->
+          <!--                                </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">过程稿件</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    disabled
+                    style="display: none;"
+                    v-model="form.FBGBUSSName"
+                    clearable
+            ></el-input>
+            <div style="display: flex;justify-content: space-between">
+              <div style="width: 80%;">
+                <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+                </div>
+              </div>
+              <div style="width: 20%;">
+                <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                        @click="fileUpload('FBGBUSS')">
+                  <i class="el-icon-upload"></i>
+                </el-button>
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    disabled
+                    style="display: none;"
+                    v-model="form.LSBBBUSSName"
+                    clearable
+            ></el-input>
+            <div style="display: flex;justify-content: space-between">
+              <div style="width: 80%;">
+                <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+                </div>
+              </div>
+              <div style="width: 20%;">
+                <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                        @click="fileUpload('LSBBBUSS')">
+                  <i class="el-icon-upload"></i>
+                </el-button>
+              </div>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
+            <el-input
+                    disabled
+                    style="display: none;"
+                    v-model="form.XGDName"
+                    clearable
+            ></el-input>
+            <div style="display: flex;justify-content: space-between">
+              <div style="width: 80%;">
+                <div v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+                </div>
+              </div>
+              <div style="width: 20%;">
+                <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                        @click="fileUpload('XGD')">
+                  <i class="el-icon-upload"></i>
+                </el-button>
+              </div>
+            </div>
+          </el-form-item>
+          <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    disabled
+                    style="display: none;"
+                    v-model="form.QTWJBUSSName"
+                    clearable
+            ></el-input>
+            <div style="display: flex;justify-content: space-between">
+              <div style="width: 80%;">
+                <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+                </div>
+              </div>
+              <div style="width: 20%;">
+                <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                        @click="fileUpload('QTWJBUSS')">
+                  <i class="el-icon-upload"></i>
+                </el-button>
+              </div>
+            </div>
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">适用范围</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.QCDW"
+                    placeholder="选择起草部门"
+                    readonly="readonly"
+                    @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.WJSCRYBUSSName"
+                    placeholder="请输入文件上传人员"
+                    :disabled="true"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="请选择能源类型" multiple>
+              <el-option
+                      v-for="item in categoryOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车VPPS中文名称" title="关联模块&#45;&#45;乘用车VPPS中文名称" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" title="关联模块&#45;&#45;卡车VPPS编码" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>-->
+<!--          </el-form-item>-->
+          <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.QCRBUSS"
+                    placeholder="选择起草人"
+                    readonly="readonly"
+                    @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple>
+              <el-option
+                      v-for="item in applyArcticOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="请选择适用认证" multiple>
+              <el-option
+                      v-for="item in sycpxOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块&#45;&#45;卡车VPPS编码" clearable :disabled="true"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>-->
+<!--          </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">关联信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.DTQBBHBUSS"
+                    placeholder="请输入代替标准号"
+                    clearable
+            ></el-input>
+            <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="mini"
+                    style="position:absolute;top: 10px;right: 0;"
+                    @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
+            >{{'手动查找'}}</el-button>
+          </el-form-item>
+          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    disabled
+                    style="display: none;"
+                    v-model="form.GLWJBUSSName"
+                    clearable
+            ></el-input>
+            <div style="display: flex;justify-content: space-between">
+              <div style="width: 80%;">
+                <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+                </div>
+              </div>
+              <div style="width: 20%;">
+                <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                        @click="fileUpload('GLWJBUSS')">
+                  <i class="el-icon-upload"></i>
+                </el-button>
+              </div>
+            </div>
+          </el-form-item>
+<!--          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.CYBZ"-->
+<!--                    placeholder="请输入采用标准"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--            <el-button-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="mini"-->
+<!--                    style="position:absolute;top: 10px;right: 0;"-->
+<!--                    @click="selectLaws('CYBZ'),config.attrName = '采用标准'"-->
+<!--            >{{'手动查找'}}</el-button>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.YYBZ"-->
+<!--                    placeholder="请输入引用标准"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--            <el-button-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="mini"-->
+<!--                    style="position:absolute;top: 10px;right: 0;"-->
+<!--                    @click="selectLaws('YYBZ'),config.attrName = '引用标准'"-->
+<!--            >{{'手动查找'}}</el-button>-->
+<!--          </el-form-item>-->
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                v-model="form.BDTQBBHBUSS"
+                placeholder="请输入被代替企标编号"
+                clearable
+            ></el-input>
+            <el-button
+                type="primary"
+                class="common-button-primary"
+                size="mini"
+                style="position:absolute;top: 10px;right: 0;"
+                @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'"
+            >{{'手动查找'}}</el-button>
+          </el-form-item>
+          <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.XCSJBUSS"
+                    placeholder=""
+                    clearable
+                    :disabled="true"
+            ></el-input>
+          </el-form-item>
+<!--          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">-->
+<!--            <el-select v-model="form.CBCD" filterable clearable-->
+<!--                       placeholder="请先选择采标程度"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                      v-for="item in cbcdOptions"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="opinionsShow">
+      <template slot="title">意见信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border" v-show="opinionsShow">
+      <el-table
+              ref="selection"
+              tooltip-effect="dark"
+              style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+              row-key="id"
+              :data="form.infoList"
+              border
+              default-expand-all>
+        <el-table-column
+                label="序号"
+                min-width="5%"
+                align="center">
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="modelNum"
+                label="条款号"
+                min-width="8%"
+                align="center"
+        >
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdBefore"
+                label="修改前"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdAfter"
+                label="修改后"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelContent"
+                label="修改理由"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrDeptIdName"
+                label="提出部门"
+                align="center"
+                min-width="15%">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrUserIdName"
+                label="责任人"
+                min-width="15%"
+                align="center">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                label="意见是否采纳"
+                min-width="15%"
+                align="center">
+          <template slot-scope="scope">
+            {{filterOp(scope.row.opinionsAdopted)}}
+            <!--            <el-form-item-->
+            <!--                    style="margin-left: 0;margin-bottom:0;"-->
+            <!--            >-->
+            <!--              <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">-->
+            <!--                <el-option-->
+            <!--                        v-for="item in opinionsAdoptedOptions"-->
+            <!--                        :key="item.value"-->
+            <!--                        :value="item.value"-->
+            <!--                        :label="item.label"-->
+            <!--                ></el-option>-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="opinionsAdoptedCont"
+                label="采纳理由"
+                align="center"
+                min-width="15%">
+          <!--                  <template slot-scope="scope">-->
+          <!--                      <el-form-item-->
+          <!--                              style="margin-left: 0;margin-bottom:0;"-->
+          <!--                      >-->
+          <!--                          <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                      </el-form-item>-->
+          <!--                  </template>-->
+        </el-table-column>
+      </el-table>
+    </div>
+  </form>
+</template>
+
+<script>
+  import { mapGetters } from 'vuex'
+  import ProcessTitle from '../../../components/ProcessTitle'
+
+
+  export default {
+    name: 'formEditList',
+    components: {
+      ProcessTitle,
+    },
+    props: {
+      formSub: {
+        type: Object,
+        required: true
+      },
+      FBGBUSSFileListSub: {
+        type: Array,
+        required: true
+      },
+      LSBBBUSSFileListSub: {
+        type: Array,
+        required: true
+      },
+      BZSMBUSSFileListSub: {
+        type: Array,
+        required: true
+      },
+      QTWJBUSSFileListSub: {
+        type: Array,
+        required: true
+      },
+      GLWJBUSSFileListSub: {
+        type: Array,
+        required: true
+      },
+      summaryFileListSub: {
+        type: Array,
+        required: false
+      },
+      XGDFileListSub: {
+        type: Array,
+        required: false
+      },
+      madelSubListSub: {
+        type: Array,
+        required: false
+      },
+      disabledState: {
+        type: Boolean,
+        default: false
+      },
+      verifySarStandard: {
+        type: Boolean,
+        default: false
+      },
+      fbNode: {
+        type: Boolean,
+        default: false
+      },
+      fileMadelSub: {
+        type: Boolean,
+        default: false
+      },
+      opinionsShow: {
+        type: Boolean,
+        default: false
+      },
+      fbgDown: {
+        type: Boolean,
+        default: false
+      },
+    },
+    data () {
+      return {
+        opinionsStand:[
+          {value: '1',label: '制定'},
+          {value: '2',label: '修订'},
+          {value: '3',label: '修改'},
+        ],
+        fileId:'',
+        dialogVisible: false,
+        config: {
+          attrName : '',
+        },
+        replaceLawsNumModel: false,
+        replaceLawType: '',
+        sarBussionessLawsEO: {
+          replaceLawsNum: ''
+        },
+        // 代替标准号
+        replaceLawsNumForm: {
+          lawsNumber:'',
+          numberName:'',
+          lawsTextState:'',
+          dataSource: '',
+          standNumber: '', // 标准编号
+          page: 1,
+          pageSize: this.$store.getters.userInfo.configContent,
+          total: 0,
+          standType: 'BUSINESS',
+          quoteIdList: '',
+          validFlag: '0',
+          menuId: 'nomenu'
+        },
+        replaceLawsNumRow: [], // 代替政策号 数组内容
+        replaceTotal: 0,
+        form:{},
+        fileList: [],
+        FBGBUSSFileList: [],
+        BZSMBUSSFileList: [],
+        LSBBBUSSFileList: [],
+        QTWJBUSSFileList: [],
+        GLWJBUSSFileList: [],
+        summaryFileList: [],
+        XGDFileList: [],
+        madelSubList: [],
+        countryOptions:[],//国家地区
+        standSortOptions: [], // 标准类别
+        standNatureOptions: [], // 标准性质
+        standStateOptions: [], // 文本状态
+        standSystemOptions: [], // 标准体系
+        busVppsOptions: [], // 车系体系架构
+        busVppsChildOptions: [], // 车系体系架构子集合
+        modelOptions: [], // 模块体系架构
+        modelChildOptions: [], // 模块体系架构子集合
+        applyArcticOptions: [], // 适用车型
+        gkglbmOptions: [], // 归口管理部门
+        categoryOptions: [], // 能源类型
+        applyAuthOptions: [], // 适用认证
+        cysdOptions: [], // 我司参与深度
+        cbcdOptions: [], // 采标程度
+        wssmrOptions: [], // 我司署名人
+        sycpxOptions: [], // 适用产品线
+        zrbmOptions: [], // 责任部门
+        zrgcsOptions: [], // 责任工程师
+        qcdwOption: [], // 起草单位
+        txlbOptions: [], // 体系类别
+        standSortConfigOptions: [], // 标准类别下拉框
+        adoptExtentOptions: [], // 采标程度下拉框
+        emergyKindOptions: [], // 能源种类下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
+        assemClassOptions: [], // 总成分类下拉框
+        qcdwOptions:[],//起草单位下拉框
+        qcrOptions:[],//起草人下拉框
+        nylxOptions:[],//能源类型下拉框
+        syrzOptions:[],//适用认证下拉框
+        data: [], // 标准列表数据
+        ListForm: {}, // 新增数据
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo'])
+    },
+    methods: {
+      filterOp(data){
+        if(!data){
+          return  ""
+        }
+        const map = new Map();
+        map.set("1","采纳");
+        map.set("2","部分采纳");
+        map.set("3","不采纳");
+        return map.get(data)
+      },
+      choiceZRR1(type, title, id) {
+        this.$emit('formChoiceZRR1',type,title,id)
+      },
+
+      choiceZRR2(type, title, id,flag) {
+        this.$emit('formChoiceZRR2',type,title,id,flag)
+      },
+
+      choiceZRR3(type, title, id) {
+        this.$emit('formChoiceZRR3',type,title,id)
+      },
+
+      choiceZRR4(type, title, id) {
+        this.$emit('formChoiceZRR4',type,title,id)
+      },
+
+      choiceQCDW(type, title, id) {
+        this.$emit('formChoiceQCDW',type,title,id)
+      },
+      choiceZRRList (type, title, id) {
+        this.$emit('formChoiceZRRListCancel',type,title,id)
+      },
+      // 代替企标编号 请求数据
+      getReplaceLawsNumRow () {
+        this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.replaceLawsNumForm, {
+          _this: this,
+          loading: 'replaceLoading'
+        }, res => {
+          this.replaceLawsNumRow = res.data.list
+          this.replaceTotal = res.data.count
+          if (this.selectedListRep.length !== 0) {
+            this.selectedListRep.map((list) => {
+              this.replaceLawsNumRow.map((item) => {
+                if (list.id === item.id) {
+                  item._checked = true
+                }
+              })
+            })
+          }
+        }, e => {
+        })
+      },
+      selectLaws (type) {
+        // if (this.standNumFlag === 1) {
+        // this.$refs.selections.selectAll(false)
+        // }
+        // this.sarBussionessLawsEO.replaceLawsNum = ''
+        this.replaceLawsNumModel = true
+        this.replaceLawType = ''
+        this.replaceLawType = type
+        this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType);
+      },
+      fileUpload (type) {
+        // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
+
+        const fileType = type;
+
+        switch (this.fileType){
+          case 'FBGBUSS':
+            this.fileList=this.FBGBUSSFileList
+            break;
+          case 'BZSMBUSS' :
+            this.fileList=this.BZSMBUSSFileList
+            break;
+          case 'LSBBBUSS':
+            this.fileList=this.LSBBBUSSFileList
+            break;
+          case 'QTWJBUSS':
+            this.fileList=this.QTWJBUSSFileList
+            break;
+          case 'GLWJBUSS':
+            this.fileList=this.GLWJBUSSFileList
+            break;
+          case 'madelSub':
+            this.fileList=this.madelSubList
+            break;
+          case 'XGD':
+            this.fileList=this.XGDFileList
+            break;
+          default : ;
+        }
+        this.fileMadel = true;
+        this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
+      },
+      filePreview(){
+        this.$preview(this.fileId)
+        this.dialogVisible = false
+      },
+      down(){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fileId
+        this.dialogVisible = false
+      },
+      // 文件预览及下载
+      handleFilePreview(file,type) {
+        let attId = ""
+        if(file && file.id){
+          attId = file.id
+        }else {
+          attId = file.response.data.id
+        }
+        if (type === 'down') {
+          if (attId) {
+            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          } else {
+            this.$message.warning('文件不存在,下载失败')
+          }
+        } else {
+          this.$preview(attId)
+        }
+      },
+      downloadFile (data) {
+        //文件id中出现了','字符,去除掉
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      },
+      setMap(data){
+        data.forEach(item => {
+          this.$set(this.textStatusMap, item.value, item.label)
+        })
+
+      },
+      busVsFunc(){
+        this.$http.get('sarVppsTree/list', '', {
+          _this: this
+        }, res => {
+          this.busVppsOptions = []
+          this.busVppsOptions = res.data
+        })
+      },
+      modelFunc(){
+        this.$http.get('sarModelTree/list', '', {
+          _this: this
+        }, res => {
+          this.modelOptions = []
+          this.modelOptions = res.data
+        })
+      },
+      async getDataAsync(){
+        let res = await this.getDicTypeListCode()
+        console.log(res)
+        if(res && res.data){
+          this.countryOptions = res.data.COUNTRY
+          this.applyCountryOptions = res.data.COUNTRY
+          this.regionOptions = res.data.REGION // 区域
+          this.standStateOptions = res.data.BUSSSTATE
+          this.energyKindOptions = res.data.ENERGYTYPES
+          this.standGeneraOptions = res.data.BUSSBIGCLASS
+          this.standSubclassOptions = res.data.BUSSFINECLASS
+          this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+          this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+          this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+          this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+          this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+          this.categoryOptions = res.data.NYLXCLASS // 能源类型
+          this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+          this.cysdOptions = res.data.WSCYSD // 我司参与深度
+          this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+          this.txlbOptions = res.data.TXLBCLASS // 体系类别
+          this.qcdwOptions = res.data.QCDW // 起草单位
+          this.qcrOptions = res.data.QCRBUSS // 起草人
+          this.nylxOptions = res.data.NYLXCLASS // 能源类型
+          this.syrzOptions = res.data.SYRZCLASS // 适用认证
+          this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+          this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+          this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+          this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+          this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
+
+          this.$emit('emitDataLoading',false)
+        }
+      },
+      getDicTypeListCode(res,json) {
+        return new Promise((resolve, reject) => {
+          this.$http.get('sys/dictype/getDicTypeListCode', '', {
+            _this: this
+          }, res => {
+            const history = res;
+            resolve(history)
+          })
+        })
+      },
+    },
+    mounted () {
+      if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
+        this.getDataAsync()
+        this.form = this.formSub,
+        this.FBGBUSSFileList= this.FBGBUSSFileListSub,
+        this.XGDFileList= this.XGDFileListSub,
+        this.LSBBBUSSFileList= this.LSBBBUSSFileListSub,
+        this.QTWJBUSSFileList= this.QTWJBUSSFileListSub,
+        this.GLWJBUSSFileList= this.GLWJBUSSFileListSub,
+        this.summaryFileList= this.summaryFileListSub,
+        this.madelSubList= this.madelSubListSub
+      }
+    },
+    watch: {
+      form: {
+        handler: function (val) {
+          if(val){
+            this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.XGDFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
+          }
+        },
+        deep: true //对象的深度验证
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue

@@ -0,0 +1,668 @@
+<template>
+  <form>
+    <ProcessTitle>
+      <template slot="title">基础信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border">
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
+              <el-option
+                      v-for="(item, index) in standSortOptions"
+                      :key="index"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standName" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.BARQ" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+
+          <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
+          <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
+          <!--                                    <el-option-->
+          <!--                                            v-for="item in standStateOptions"-->
+          <!--                                            :key="item.value"-->
+          <!--                                            :value="item.value"-->
+          <!--                                            :label="item.label"-->
+          <!--                                    ></el-option>-->
+          <!--                                </el-select>-->
+          <!--                            </el-form-item>-->
+
+          <!--                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
+          <!--                                <el-datePicker v-model="form.FSRQBUSS"-->
+          <!--                                               :editable="false"-->
+          <!--                                               :disabled="true"-->
+          <!--                                               value-format="yyyy-MM-dd"-->
+          <!--                                               clearable></el-datePicker>-->
+          <!--                            </el-form-item>-->
+          <el-form-item v-show="form.standStatus === '3'" label="标准年份" class="add-form-item form-item-disabled">
+            <el-input v-model="form.standYear" :disabled="disabledState"
+                      clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="企业标准号" v-show="form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standCode" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standEnName" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable :disabled="disabledState">
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+          <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
+          <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
+          <!--                         :editable="false"-->
+          <!--          ></el-datePicker>-->
+          <!--        </el-form-item>-->
+          <!--                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
+          <!--                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
+          <!--                                               :editable="false"-->
+          <!--                                               value-format="yyyy-MM-dd"-->
+          <!--                                               clearable></el-datePicker>-->
+          <!--                            </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">过程稿件</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+          <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+          <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">适用范围</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
+            <el-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.WJSCRYBUSSName"
+                    :disabled="true"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
+              <el-option
+                      v-for="item in categoryOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车VPPS中文名称" title="关联模块&#45;&#45;乘用车VPPS中文名称" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" title="关联模块&#45;&#45;卡车VPPS编码" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
+<!--          </el-form-item>-->
+          <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
+              <el-option
+                      v-for="item in applyArcticOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
+              <el-option
+                      v-for="item in sycpxOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
+<!--            <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>-->
+<!--          </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">关联信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.DTQBBHBUSS" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+<!--          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.CYBZ" :disabled="disabledState"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.YYBZ" :disabled="disabledState"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.BDTQBBHBUSS" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.XCSJBUSS"
+                    clearable
+                    :disabled="true"
+            ></el-input>
+          </el-form-item>
+<!--          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">-->
+<!--            <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>-->
+<!--              <el-option-->
+<!--                      v-for="item in cbcdOptions"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="opinionsShow">
+      <template slot="title">意见信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border" v-show="opinionsShow">
+      <el-table
+              ref="selection"
+              tooltip-effect="dark"
+              style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+              row-key="id"
+              :data="form.infoList"
+              border
+              default-expand-all>
+        <el-table-column
+                label="序号"
+                min-width="12%"
+                align="center">
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="modelNum"
+                label="条款号"
+                min-width="13%"
+                align="center"
+        >
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdBefore"
+                label="修改前"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdAfter"
+                label="修改后"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelContent"
+                label="修改理由"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrDeptIdName"
+                label="提出部门"
+                align="center"
+                min-width="20%">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrUserIdName"
+                label="责任人"
+                min-width="14%"
+                align="center">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                label="意见是否采纳"
+                min-width="20%"
+                align="center">
+          <template slot-scope="scope">
+            {{filterOp(scope.row.opinionsAdopted)}}
+            <!--            <el-form-item-->
+            <!--                    style="margin-left: 0;margin-bottom:0;"-->
+            <!--            >-->
+            <!--              <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">-->
+            <!--                <el-option-->
+            <!--                        v-for="item in opinionsAdoptedOptions"-->
+            <!--                        :key="item.value"-->
+            <!--                        :value="item.value"-->
+            <!--                        :label="item.label"-->
+            <!--                ></el-option>-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="opinionsAdoptedCont"
+                label="采纳理由"
+                align="center"
+                min-width="15%">
+          <!--                  <template slot-scope="scope">-->
+          <!--                      <el-form-item-->
+          <!--                              style="margin-left: 0;margin-bottom:0;"-->
+          <!--                      >-->
+          <!--                          <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                      </el-form-item>-->
+          <!--                  </template>-->
+        </el-table-column>
+      </el-table>
+    </div>
+  </form>
+</template>
+
+<script>
+  import { mapGetters } from 'vuex'
+  import ProcessTitle from '../../../components/ProcessTitle'
+
+
+  export default {
+    name: 'formList',
+    components: {
+      ProcessTitle,
+    },
+    props: {
+      form: {
+        type: Object,
+        required: true
+      },
+      FBGBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      LSBBBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      BZSMBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      XGDFileList: {
+        type: Array,
+        required: true
+      },
+      QTWJBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      GLWJBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      summaryFileList: {
+        type: Array,
+        required: false
+      },
+      disabledState: {
+        type: Boolean,
+        default: false
+      },
+      verifySarStandard: {
+        type: Boolean,
+        default: false
+      },
+      opinionsShow: {
+        type: Boolean,
+        default: false
+      },
+      fileShow: {
+        type: Boolean,
+        default: false
+      },
+    },
+    filters: {
+      ellipsis (value) {
+        if (!value) return ''
+        if (value.length > 35) {
+          return value.slice(0,35) + '...'
+        }
+        return value
+      },
+      ellipsis22 (value) {
+        if (!value) return ''
+        if (value.length > 22) {
+          return value.slice(0,22) + '...'
+        }
+        return value
+      }
+    },
+    data () {
+      return {
+        opinionsStand:[
+          {value: '1',label: '制定'},
+          {value: '2',label: '修订'},
+          {value: '3',label: '修改'},
+        ],
+        opinionsAdoptedOptions:[
+          {value: '1',label: '采纳'},
+          {value: '2',label: '部分采纳'},
+          {value: '3',label: '不采纳'},
+        ],
+        countryOptions:[],//国家地区
+        standSortOptions: [], // 标准类别
+        standNatureOptions: [], // 标准性质
+        standStateOptions: [], // 文本状态
+        standSystemOptions: [], // 标准体系
+        busVppsOptions: [], // 车系体系架构
+        busVppsChildOptions: [], // 车系体系架构子集合
+        modelOptions: [], // 模块体系架构
+        modelChildOptions: [], // 模块体系架构子集合
+        applyArcticOptions: [], // 适用车型
+        gkglbmOptions: [], // 归口管理部门
+        categoryOptions: [], // 能源类型
+        applyAuthOptions: [], // 适用认证
+        cysdOptions: [], // 我司参与深度
+        cbcdOptions: [], // 采标程度
+        wssmrOptions: [], // 我司署名人
+        sycpxOptions: [], // 适用产品线
+        zrbmOptions: [], // 责任部门
+        zrgcsOptions: [], // 责任工程师
+        qcdwOption: [], // 起草单位
+        txlbOptions: [], // 体系类别
+        standSortConfigOptions: [], // 标准类别下拉框
+        adoptExtentOptions: [], // 采标程度下拉框
+        emergyKindOptions: [], // 能源种类下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
+        assemClassOptions: [], // 总成分类下拉框
+        qcdwOptions:[],//起草单位下拉框
+        qcrOptions:[],//起草人下拉框
+        nylxOptions:[],//能源类型下拉框
+        syrzOptions:[],//适用认证下拉框
+        data: [], // 标准列表数据
+        ListForm: {}, // 新增数据
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo'])
+    },
+    methods: {
+      filterOp(data){
+        if(!data){
+          return  ""
+        }
+        const map = new Map();
+        map.set("1","采纳");
+        map.set("2","部分采纳");
+        map.set("3","不采纳");
+        return map.get(data)
+      },
+      // 文件预览及下载
+      handleFilePreview(file,type) {
+        let attId = ""
+        if(file && file.id){
+          attId = file.id
+        }else {
+          attId = file.response.data.id
+        }
+        if (type === 'down') {
+          if (attId) {
+            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          } else {
+            this.$message.warning('文件不存在,下载失败')
+          }
+        } else {
+          this.$preview(attId)
+        }
+      },
+      downloadFile (data) {
+        //文件id中出现了','字符,去除掉
+        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      },
+      setMap(data){
+        data.forEach(item => {
+          this.$set(this.textStatusMap, item.value, item.label)
+        })
+
+      },
+      busVsFunc(){
+        this.$http.get('sarVppsTree/list', '', {
+          _this: this
+        }, res => {
+          this.busVppsOptions = []
+          this.busVppsOptions = res.data
+        })
+      },
+      modelFunc(){
+        this.$http.get('sarModelTree/list', '', {
+          _this: this
+        }, res => {
+          this.modelOptions = []
+          this.modelOptions = res.data
+        })
+      },
+      async getDataAsync(){
+        let res = await this.getDicTypeListCode()
+        console.log(res)
+        if(res && res.data){
+          this.countryOptions = res.data.COUNTRY
+          this.applyCountryOptions = res.data.COUNTRY
+          this.regionOptions = res.data.REGION // 区域
+          this.standStateOptions = res.data.BUSSSTATE
+          this.energyKindOptions = res.data.ENERGYTYPES
+          this.standGeneraOptions = res.data.BUSSBIGCLASS
+          this.standSubclassOptions = res.data.BUSSFINECLASS
+          this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+          this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+          this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+          this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+          this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+          this.categoryOptions = res.data.NYLXCLASS // 能源类型
+          this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+          this.cysdOptions = res.data.WSCYSD // 我司参与深度
+          this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+          this.txlbOptions = res.data.TXLBCLASS // 体系类别
+          this.qcdwOptions = res.data.QCDW // 起草单位
+          this.qcrOptions = res.data.QCRBUSS // 起草人
+          this.nylxOptions = res.data.NYLXCLASS // 能源类型
+          this.syrzOptions = res.data.SYRZCLASS // 适用认证
+          this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+          this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+          this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+          this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+          this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
+
+          this.$emit('emitDataLoading',false)
+        }
+      },
+      getDicTypeListCode(res,json) {
+        return new Promise((resolve, reject) => {
+          this.$http.get('sys/dictype/getDicTypeListCode', '', {
+            _this: this
+          }, res => {
+            const history = res;
+            resolve(history)
+          })
+        })
+      },
+    },
+    mounted () {
+      this.getDataAsync()
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue

@@ -0,0 +1,689 @@
+<template>
+  <form>
+    <ProcessTitle>
+      <template slot="title">基础信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
+              <el-option
+                      v-for="item in standSortOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.issueTime"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+          <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standName" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.BARQ" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="标准年份" class="add-form-item form-item-disabled">
+            <el-input v-model="form.standYear" :disabled="disabledState"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+          <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
+          <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
+          <!--                                    <el-option-->
+          <!--                                            v-for="item in standStateOptions"-->
+          <!--                                            :key="item.value"-->
+          <!--                                            :value="item.value"-->
+          <!--                                            :label="item.label"-->
+          <!--                                    ></el-option>-->
+          <!--                                </el-select>-->
+          <!--                            </el-form-item>-->
+
+          <!--                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
+          <!--                                <el-datePicker v-model="form.FSRQBUSS"-->
+          <!--                                               :editable="false"-->
+          <!--                                               :disabled="true"-->
+          <!--                                               value-format="yyyy-MM-dd"-->
+          <!--                                               clearable></el-datePicker>-->
+          <!--                            </el-form-item>-->
+        </el-col>
+        <el-col :span="12">
+          <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+          <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+          <!--                                  <el-option-->
+          <!--                                      v-for="item in countryOptions"-->
+          <!--                                      placeholder="请选择"-->
+          <!--                                      :key="item.value"-->
+          <!--                                      :value="item.value"-->
+          <!--                                      :label="item.label"-->
+          <!--                                  ></el-option>-->
+          <!--                                </el-select>-->
+          <!--                              </el-form-item>-->
+          <!--                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+          <!--                                <el-input-->
+          <!--                                        v-model="form.standNumber" :disabled="disabledState"-->
+          <!--                                        clearable-->
+          <!--                                ></el-input>-->
+          <!--                            </el-form-item>-->
+          <el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standCode" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
+          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standEnName" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable clearable :disabled="disabledState" >
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
+          <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
+          <!--                         :editable="false"-->
+          <!--          ></el-datePicker>-->
+          <!--        </el-form-item>-->
+          <!--                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
+          <!--                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
+          <!--                                               :editable="false"-->
+          <!--                                               value-format="yyyy-MM-dd"-->
+          <!--                                               clearable></el-datePicker>-->
+          <!--                            </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">过程稿件</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+          <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+          <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">适用范围</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
+            <el-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.WJSCRYBUSSName"
+                    :disabled="true"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
+              <el-option
+                      v-for="item in categoryOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--          <el-form-item label="关联模块&#45;&#45;乘用车VPPS中文名称" title="关联模块&#45;&#45;乘用车VPPS中文名称" class="add-form-item form-item-disabled">-->
+          <!--            <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" title="关联模块&#45;&#45;卡车VPPS编码" class="add-form-item form-item-disabled">-->
+          <!--            <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
+          <!--            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
+              <el-option
+                      v-for="item in applyArcticOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
+              <el-option
+                      v-for="item in sycpxOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <!--          <el-form-item label="关联模块&#45;&#45;乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
+          <!--            <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
+          <!--            <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
+          <!--            <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>-->
+          <!--          </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+      <template slot="title">关联信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border"  v-show="verifySarStandard">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.DTQBBHBUSS" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
+<!--          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.CYBZ" :disabled="disabledState"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">-->
+<!--            <el-input-->
+<!--                    v-model="form.YYBZ" :disabled="disabledState"-->
+<!--                    clearable-->
+<!--            ></el-input>-->
+<!--          </el-form-item>-->
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.BDTQBBHBUSS" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.XCSJBUSS"
+                    clearable
+                    :disabled="true"
+            ></el-input>
+          </el-form-item>
+<!--          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">-->
+<!--            <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>-->
+<!--              <el-option-->
+<!--                      v-for="item in cbcdOptions"-->
+<!--                      :key="item.value"-->
+<!--                      :value="item.value"-->
+<!--                      :label="item.label"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+        </el-col>
+      </el-row>
+    </div>
+    <ProcessTitle v-show="opinionsShow">
+      <template slot="title">意见信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border" v-show="opinionsShow">
+      <el-table
+              ref="selection"
+              tooltip-effect="dark"
+              style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+              row-key="id"
+              :data="form.infoList"
+              border
+              default-expand-all>
+        <el-table-column
+                label="序号"
+                min-width="6%"
+                align="center">
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="modelNum"
+                label="条款号"
+                min-width="8%"
+                align="center"
+        >
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdBefore"
+                label="修改前"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdAfter"
+                label="修改后"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelContent"
+                label="修改理由"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrDeptIdName"
+                label="提出部门"
+                align="center"
+                min-width="15%">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrUserIdName"
+                label="责任人"
+                min-width="14%"
+                align="center">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                label="意见是否采纳"
+                min-width="15%"
+                align="center">
+          <template slot-scope="scope">
+            {{filterOp(scope.row.opinionsAdopted)}}
+            <!--            <el-form-item-->
+            <!--                    style="margin-left: 0;margin-bottom:0;"-->
+            <!--            >-->
+            <!--              <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">-->
+            <!--                <el-option-->
+            <!--                        v-for="item in opinionsAdoptedOptions"-->
+            <!--                        :key="item.value"-->
+            <!--                        :value="item.value"-->
+            <!--                        :label="item.label"-->
+            <!--                ></el-option>-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="opinionsAdoptedCont"
+                label="采纳理由"
+                align="center"
+                min-width="15%">
+          <!--                  <template slot-scope="scope">-->
+          <!--                      <el-form-item-->
+          <!--                              style="margin-left: 0;margin-bottom:0;"-->
+          <!--                      >-->
+          <!--                          <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                      </el-form-item>-->
+          <!--                  </template>-->
+        </el-table-column>
+      </el-table>
+    </div>
+  </form>
+</template>
+
+<script>
+  import { mapGetters } from 'vuex'
+  import ProcessTitle from '../../../components/ProcessTitle'
+
+
+  export default {
+    name: 'formList',
+    components: {
+      ProcessTitle,
+    },
+    props: {
+      form: {
+        type: Object,
+        required: true
+      },
+      FBGBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      LSBBBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      BZSMBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      XGDFileList: {
+        type: Array,
+        required: true
+      },
+      QTWJBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      GLWJBUSSFileList: {
+        type: Array,
+        required: true
+      },
+      summaryFileList: {
+        type: Array,
+        required: false
+      },
+      disabledState: {
+        type: Boolean,
+        default: false
+      },
+      verifySarStandard: {
+        type: Boolean,
+        default: false
+      },
+      opinionsShow: {
+        type: Boolean,
+        default: false
+      },
+      fileShow: {
+        type: Boolean,
+        default: false
+      },
+    },
+    filters: {
+      ellipsis (value) {
+        if (!value) return ''
+        if (value.length > 35) {
+          return value.slice(0,35) + '...'
+        }
+        return value
+      },
+      ellipsis22 (value) {
+        if (!value) return ''
+        if (value.length > 22) {
+          return value.slice(0,22) + '...'
+        }
+        return value
+      }
+    },
+    data () {
+      return {
+        opinionsStand:[
+          {value: '1',label: '制定'},
+          {value: '2',label: '修订'},
+          {value: '3',label: '修改'},
+        ],
+       opinionsStand:[
+          {value: '1',label: '制定'},
+          {value: '2',label: '修订'},
+          {value: '3',label: '修改'},
+        ],
+        opinionsAdoptedOptions:[
+          {value: '1',label: '采纳'},
+          {value: '2',label: '部分采纳'},
+          {value: '3',label: '不采纳'},
+        ],
+        countryOptions:[],//国家地区
+        standSortOptions: [], // 标准类别
+        standNatureOptions: [], // 标准性质
+        standStateOptions: [], // 文本状态
+        standSystemOptions: [], // 标准体系
+        busVppsOptions: [], // 车系体系架构
+        busVppsChildOptions: [], // 车系体系架构子集合
+        modelOptions: [], // 模块体系架构
+        modelChildOptions: [], // 模块体系架构子集合
+        applyArcticOptions: [], // 适用车型
+        gkglbmOptions: [], // 归口管理部门
+        categoryOptions: [], // 能源类型
+        applyAuthOptions: [], // 适用认证
+        cysdOptions: [], // 我司参与深度
+        cbcdOptions: [], // 采标程度
+        wssmrOptions: [], // 我司署名人
+        sycpxOptions: [], // 适用产品线
+        zrbmOptions: [], // 责任部门
+        zrgcsOptions: [], // 责任工程师
+        qcdwOption: [], // 起草单位
+        txlbOptions: [], // 体系类别
+        standSortConfigOptions: [], // 标准类别下拉框
+        adoptExtentOptions: [], // 采标程度下拉框
+        emergyKindOptions: [], // 能源种类下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
+        assemClassOptions: [], // 总成分类下拉框
+        qcdwOptions:[],//起草单位下拉框
+        qcrOptions:[],//起草人下拉框
+        nylxOptions:[],//能源类型下拉框
+        syrzOptions:[],//适用认证下拉框
+        data: [], // 标准列表数据
+        ListForm: {}, // 新增数据
+      }
+    },
+    computed: {
+      ...mapGetters(['userInfo'])
+    },
+    methods: {
+      filterOp(data){
+        if(!data){
+          return  ""
+        }
+        const map = new Map();
+        map.set("1","采纳");
+        map.set("2","部分采纳");
+        map.set("3","不采纳");
+        return map.get(data)
+      },
+      // 文件预览及下载
+      handleFilePreview(file,type) {
+        let attId = ""
+        if(file && file.id){
+          attId = file.id
+        }else {
+          attId = file.response.data.id
+        }
+        if (type === 'down') {
+          if (attId) {
+            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          } else {
+            this.$message.warning('文件不存在,下载失败')
+          }
+        } else {
+          this.$preview(attId)
+        }
+      },
+      downloadFile (data) {
+        //文件id中出现了','字符,去除掉
+        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      },
+      setMap(data){
+        data.forEach(item => {
+          this.$set(this.textStatusMap, item.value, item.label)
+        })
+
+      },
+      busVsFunc(){
+        this.$http.get('sarVppsTree/list', '', {
+          _this: this
+        }, res => {
+          this.busVppsOptions = []
+          this.busVppsOptions = res.data
+        })
+      },
+      modelFunc(){
+        this.$http.get('sarModelTree/list', '', {
+          _this: this
+        }, res => {
+          this.modelOptions = []
+          this.modelOptions = res.data
+        })
+      },
+      async getDataAsync(){
+        let res = await this.getDicTypeListCode()
+        console.log(res)
+        if(res && res.data){
+          this.countryOptions = res.data.COUNTRY
+          this.applyCountryOptions = res.data.COUNTRY
+          this.regionOptions = res.data.REGION // 区域
+          this.standStateOptions = res.data.BUSSSTATE
+          this.energyKindOptions = res.data.ENERGYTYPES
+          this.standGeneraOptions = res.data.BUSSBIGCLASS
+          this.standSubclassOptions = res.data.BUSSFINECLASS
+          this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+          this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+          this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+          this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+          this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+          this.categoryOptions = res.data.NYLXCLASS // 能源类型
+          this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+          this.cysdOptions = res.data.WSCYSD // 我司参与深度
+          this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+          this.txlbOptions = res.data.TXLBCLASS // 体系类别
+          this.qcdwOptions = res.data.QCDW // 起草单位
+          this.qcrOptions = res.data.QCRBUSS // 起草人
+          this.nylxOptions = res.data.NYLXCLASS // 能源类型
+          this.syrzOptions = res.data.SYRZCLASS // 适用认证
+          this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+          this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+          this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+          this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+          this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
+
+          this.$emit('emitDataLoading',false)
+        }
+      },
+      getDicTypeListCode(res,json) {
+        return new Promise((resolve, reject) => {
+          this.$http.get('sys/dictype/getDicTypeListCode', '', {
+            _this: this
+          }, res => {
+            const history = res;
+            resolve(history)
+          })
+        })
+      },
+    },
+    mounted () {
+      this.getDataAsync()
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>