Merge branch 'develop' into FOTON

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

src/api/process.js

@@ -93,6 +93,14 @@ export function processCreateBuss (data) {
   })
 }
 
+export function processCreateFsBuss (data) {
+  return axios({
+    url: '/api/lawss/actSarItemsBuss/processCreateFsBuss',
+    method: 'post',
+    data
+  })
+}
+
 export function processCreateLaws (data) {
   return axios({
     url: '/api/lawss/actSarItemsLaws/processCreateLaws',

src/components/navMenu/index.vue

@@ -320,6 +320,11 @@
                 path: '/standLawsAttrManage',
                 menuId: '72a24657972d286b8b5d80735cf4eee2'
               },
+              {
+                title: '操作日志',
+                path: '/OperationLog',
+                menuId: ''
+              },
               //     {
               //       title: '资料中心管理',
               //       path: '/dynamicInformationManage',

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

@@ -0,0 +1,217 @@
+<template>
+    <div class="Operation-log">
+        <div class="search-area">
+            <div class="left">
+                <el-form
+                        ref="searchForm"
+                        :model="searchForm"
+                        inline
+                >
+                    <el-form-item label="操作人" class="search-item">
+                        <el-input
+                                v-model="searchForm.account"
+                                style="display: none;"
+                        ></el-input>
+                        <el-input
+                                v-model="searchForm.accountName"
+                                placeholder="请选择操作人"
+                                readonly="readonly"
+                                @click.native="choiceZRR"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="开始日期" >
+                        <el-date-picker
+                                v-model="searchForm.sTime"
+                                type="datetime"
+                                placeholder="请选择开始日期"
+                                size="small"
+                                value-format="yyyy-MM-dd HH:mm:ss">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="结束日期" >
+                        <el-date-picker
+                                v-model="searchForm.eTime"
+                                type="datetime"
+                                placeholder="请选择结束日期"
+                                size="small"
+                                value-format="yyyy-MM-dd HH:mm:ss">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="操作类型" class="search-item">
+                        <el-select v-model="searchForm.oper" clearable placeholder="请选择操作类型">
+                            <el-option
+                                    v-for="(item, index) in typeList"
+                                    placeholder="请选择操作类型"
+                                    :key="index"
+                                    :value="item.oper"
+                                    :label="item.oper"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="操作内容" class="search-item">
+                        <el-input
+                                v-model="searchForm.content"
+                                placeholder="请选择操作内容"
+                                clearable
+                        ></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="searchBtn"
+                        >搜索</el-button>
+                    </el-form-item>
+                    <el-form-item label="" class="search-item btn-box">
+                        <el-button
+                                class="common-button-default"
+                                @click="resetSelect"
+                                size="mini"
+                        >清空</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+        <div class="content">
+            <el-table
+                    stripe
+                    ref="selections"
+                    tooltip-effect="dark"
+                    border
+                    height="100%"
+                    :data="data"
+                    class="table"
+                    :header-cell-style="{
+          background: '#e8e8e8',
+          color: '#333333',
+          fontSize: '16px',
+          fontWeight: 'bold',
+          height: '48px',
+        }">
+                <el-table-column prop="account" label="操作人">
+                </el-table-column>
+                <el-table-column prop="dept" label="所属部门">
+                </el-table-column>
+                <el-table-column prop="operTime" label="操作时间">
+                </el-table-column>
+                <el-table-column prop="oper" label="操作类型">
+                </el-table-column>
+                <el-table-column prop="operLocation" label="操作内容">
+                </el-table-column>
+            </el-table>
+            <loading :loading="dataLoading">数据处理中</loading>
+        </div>
+        <pagination
+                :total="total"
+                :pageChange="searchForm.page"
+                :pageSizeChange="searchForm.pageSize"
+                @pageChange="pageChange"
+                @pageSizeChange="pageSizeChange"
+        ></pagination>
+        <Role-tree
+                check-box
+                :is-title="'选择操作人'"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="checkedRole"
+                :nodeList="nodeList"
+        ></Role-tree>
+    </div>
+</template>
+<script>
+    export default {
+        name: "OperationLog",
+        data () {
+            return {
+                dataLoading: false,
+                total: 0,
+                data: [],
+                typeList: [],
+                styles: {
+                    height: 'calc(100% - 55px)',
+                    overflow: 'auto',
+                    paddingBottom: '53px',
+                    position: 'static'
+                },
+                searchForm: {
+                    accountName: '',
+                    account: '',
+                    sTime: '',
+                    eTime: '',
+                    oper: '',
+                    content: '',
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                },
+                nodeList: [],
+                modalshowflag: false,
+            }
+        },
+        methods: {
+            checkedRole (data) {
+                this.searchForm.account = data[0].id
+                this.searchForm.accountName = data[0].name
+            },
+            choiceZRR () {
+                this.nodeList = []
+                this.nodeList.push(this.searchForm.account)
+                this.modalshowflag = true
+            },
+            searchBtn () {
+                this.searchForm.page = 1
+                this.getData()
+            },
+            getData () {
+                this.$http.get('sysLog/sys-log/getAllLog', this.searchForm, {
+                    _this: this,
+                    loading: 'dataLoading'
+                }, res => {
+                    if (res.ok) {
+                        this.total = res.data.total
+                        this.data = res.data.records
+                    }
+                })
+            },
+            pageChange (page) {
+                this.searchForm.page = page
+                this.getData()
+            },
+            pageSizeChange (pageSize) {
+                this.searchForm.pageSize = pageSize
+                this.getData()
+            },
+            resetSelect () {
+                this.searchForm.page = 1
+                this.searchForm.accountName = ''
+                this.searchForm.account = ''
+                this.searchForm.sTime = ''
+                this.searchForm.eTime = ''
+                this.searchForm.oper = ''
+                this.searchForm.content = ''
+                this.getData()
+            },
+        },
+        mounted () {
+            this.getData()
+            this.$http.get('sysLog/sys-log/getLogOper', {}, {
+                _this: this,
+            }, res => {
+                if (res.ok) {
+                    this.typeList = res.data
+                }
+            })
+        }
+    }
+</script>
+<style lang="less" scoped>
+    .Operation-log {
+        height: 100%;
+        .content {
+            height: calc(~"100% - 55px - 56px");
+            overflow-y: auto;
+        }
+        .search-select.el-dropdown {
+            width: 100%;
+        }
+    }
+</style>

src/pages/details/otherBussStandardDetails/index.vue

@@ -353,12 +353,12 @@
                   <div class="basic-information-content">
                     <p class="" style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
                     <template v-for="(child, childIndex) in item.child1">
-                      <p class="files-title"
+                      <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
-                      >
                         <label style=" margin-right: 172px;">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)">
-                          <span>
+<!--                          单个文件-->
-                            <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
+                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1">
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
                             <i
                                 title="下载"
                                 @click="downloadFile(file.id)"
@@ -374,6 +374,27 @@
                             />
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
+<!--                          多个文件-->
+                         <div v-else-if="child.value && child.value.length > 0">
+                            <span style="margin-left: 19%">
+                              <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                                 @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                 :title="file.oldFileName">{{ file.oldFileName }}</a>
+                              <i
+                                title="下载"
+                                @click="downloadFile(file.id)"
+                                class="icon-download"
+                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                              />
+                              <i
+                                title="下载带水印"
+                                @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                class="icon-download2"
+                                v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                              />
+                            </span>
+                        <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                      </div>
                           <!--                        <el-button-->
                           <!--                                v-if="child.attrField === itemNam "-->
                           <!--                                v-for="(itemNam,index) in itemExistList"-->
@@ -384,11 +405,11 @@
                           <!--                                icon="icon-separate"-->
                           <!--                        >标准分解单-->
                           <!--                        </el-button>-->
-                          <el-button v-if="child.value.length > 1" style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+<!--                          <el-button v-if="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)">更多</el-button>
+<!--                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">更多</el-button>-->
                         </template>
                         <template v-if="child.value === null" >-</template>
-                      </p>
+                      </div>
                     </template>
                     <p><label style="margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                     <p v-if="activeState"><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
@@ -1961,10 +1982,12 @@ export default {
         one: spanOneArr,
       }
     },
-    child1Func(child1){
+    child1Func(child1) {
       const list = []
-      if(child1 && child1.length > 1){
+      if (child1 && child1.length > 1) {
-        list.push(child1[0])
+        for (let i = 0; i < child1.length; i++) {
+          list.push(child1[i])
+        }
         return list
       }
       return child1
@@ -2432,6 +2455,14 @@ export default {
       } else {
         this.$message.error('没有在线预览文档权限！')
       }
+      this.$http.get('lawss/sarBussionessStand/logBuss', {
+        standCode: this.sarStandardsInfoEO.standCode,
+        standName: this.sarStandardsInfoEO.standName
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+      })
     },
     showItemsModel (attField) {
       this.fileType = attField
@@ -2472,6 +2503,14 @@ export default {
       } else {
         this.$message.error('请选择要下载的文件')
       }
+      this.$http.get('lawss/sarBussionessStand/logBussDownload1', {
+       standCode: this.sarStandardsInfoEO.standCode,
+        standName: this.sarStandardsInfoEO.standName
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+      })
     },
     downloadFileByWater (attId, fileSuffix) {
       if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
@@ -2483,6 +2522,14 @@ export default {
           this.$message.error('请选择要下载的文件')
         }
       }
+      this.$http.get('lawss/sarBussionessStand/logBussDownload2', {
+        standCode: this.sarStandardsInfoEO.standCode,
+        standName: this.sarStandardsInfoEO.standName
+      }, {
+        _this: this
+      }, res => {
+        console.log(res);
+      })
     },
     /**
      * @author liruohao

src/pages/details/otherStandardDetails/index.vue

@@ -3109,6 +3109,27 @@ export default {
           this.$message.error('没有在线预览文档权限！')
         }
       }
+      if(this.$route.params.pageType === 'INLAND_STAND'){
+        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+        this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{
+          standNumber: standNumber,
+          standName: this.sarStandardsInfoEO.standName
+        }, {
+          _this: this
+        }, res => {
+          console.log(res);
+        })
+      }else{
+        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+        this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{
+          standNumber: standNumber,
+          standName: this.sarStandardsInfoEO.standEnName
+        }, {
+          _this: this
+        }, res => {
+          console.log(res);
+        })
+      }
     },
     showItemsModel(attField) {
       this.fileType = attField
@@ -3164,6 +3185,28 @@ export default {
       } else {
         this.$message.error('请选择要下载的文件')
       }
+      if(this.$route.params.pageType === 'INLAND_STAND'){
+       let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+        this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload1',{
+              standNumber: standNumber,
+              standName: this.sarStandardsInfoEO.standName
+        }, {
+          _this: this
+        }, res => {
+          console.log(res);
+        })
+      }else{
+        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+        this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload1',{
+          standNumber: standNumber,
+          standName: this.sarStandardsInfoEO.standEnName
+        }, {
+          _this: this
+        }, res => {
+          console.log(res);
+        })
+      }
+
     },
     downloadFileByWater(attId, fileSuffix) {
       if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
@@ -3175,6 +3218,27 @@ export default {
           this.$message.error('请选择要下载的文件')
         }
       }
+      if(this.$route.params.pageType === 'INLAND_STAND'){
+        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+        this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{
+          standNumber: standNumber,
+          standName: this.sarStandardsInfoEO.standName
+        }, {
+          _this: this
+        }, res => {
+          console.log(res);
+        })
+      }else{
+        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+        this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{
+          standNumber: standNumber,
+          standName: this.sarStandardsInfoEO.standEnName
+        }, {
+          _this: this
+        }, res => {
+          console.log(res);
+        })
+      }
     },
     /**
      * @Description: 跳转流程

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

@@ -629,6 +629,23 @@
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                     :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
                 </el-form-item>
+                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
+                  <tree-select-module
+                    width="800"
+                    :key="key4"
+                    :lazy=true
+                    :multiple=true
+                    :check-strictly=true
+                    :modalShowFlag="modalShowFlag5"
+                    :drawerTitle="drawerTitle"
+                    :url="url"
+                    :type="'CAR'"
+                    :show-checkBox="showCheckBox"
+                    :urlChild="urlChild"
+                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
+                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -743,7 +760,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
                     v-if="form.dybxh === ''"
                     v-model="form.dymc = ''"
@@ -757,6 +774,20 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-if="form.dybxhcar === ''"
+                    v-model="form.dymccar = ''"
+                    disabled
+                    clearable
+                  ></el-input>
+                  <el-input
+                    v-else
+                    v-model="form.dymccar"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceWSSMR('wssmr', '选择我司署名人', form.wssmrId)">
                   </el-input>
@@ -1477,6 +1508,7 @@ export default {
       key1: 2,
       key2: 3,
       key3: 4,
+      key4: 5,
       treeData: [], // 人员数据
       modalShowFlag: false, // drawer开关
       modalShowRoleFlag: false, // drawer开关
@@ -1484,6 +1516,7 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false, // drawer开关
       modalShowRoleFlag5: false,
       modalShowTree: false, // 归档位置drawer开关
       url: '',
@@ -1571,7 +1604,8 @@ export default {
         cycvppscn: '', // 关联模块--乘用车vpps中文名称
         kccvppsbm: '', // 关联模块--卡车VPPS编码
         kccvppscn: '', // 关联模块--卡车vpps中文名称
-        dybxh: '', // 模块结构单元变型号
+        dybxh: '', // 模块结构单元变型号卡车
+        dybxhcar: '', // 模块结构单元变型号乘用车
         dymc: '', // 模块结构单元名称
         // 关联信息
         dtbjh: '', // 代替标准号
@@ -2280,25 +2314,27 @@ export default {
       }, {}, res => {
         if (res.ok) {
           this.treeListOptions = res.data
-          this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
+          if(bringData.standNumber){
-            standId: bringData.id,
+            this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
-          }, {}, reson => {
+              standId: bringData.id,
-            if (reson.ok) {
+            }, {}, reson => {
-              let treeList = ''
+              if (reson.ok) {
-              let treeListId = ''
+                let treeList = ''
-              reson.data.forEach(item=>{
+                let treeListId = ''
-                this.treeCheckedKeys.push(item.menuId)
+                reson.data.forEach(item=>{
-                if (treeList.length > 0) {
+                  this.treeCheckedKeys.push(item.menuId)
-                  treeList += ','
+                  if (treeList.length > 0) {
-                  treeListId += ','
+                    treeList += ','
-                }
+                    treeListId += ','
-                treeList += item.menuName
+                  }
-                treeListId += item.menuId
+                  treeList += item.menuName
-              })
+                  treeListId += item.menuId
-              this.form.treeListName = treeList
+                })
-              this.form.treeListId = treeListId
+                this.form.treeListName = treeList
-            }
+                this.form.treeListId = treeListId
-          })
+              }
+            })
+          }
         }
       })
     },
@@ -2459,6 +2495,15 @@ export default {
       this.urlChild = "sarModelTree/childByList"
       this.key3++
     },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+      this.key4++
+    },
 
     choiceTree(type, title, id) {
       this.drawerTitle = title
@@ -2942,6 +2987,7 @@ export default {
 
     },
     treeHideCancel() {
+      this.treeListOptions = []
       this.modalShowTree = false
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2989,9 +3035,24 @@ export default {
       }
 
     },
+    popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.form.dybxhcar = checkedData.map(item => item.model).join(",")
+          this.form.dymccar = checkedData.map(item => item.name).join(",")
+        } else {
+          this.form.dybxhcar = checkedData.model
+          this.form.dymccar = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+    },
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverHideModelCancel2() {
+      this.modalShowFlag5 = false
+    },
     closeDrawer() {
       this.ListModel = false
     },

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

@@ -407,9 +407,12 @@
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.kccvppsbm" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input v-model="form.dybxh" disabled></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.dybxhcar" disabled></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -486,13 +489,20 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.dymc"
                     disabled
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="form.dymccar"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <span>{{ form.wssmr }}</span>
                   <!--                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->

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

@@ -370,9 +370,12 @@
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                   <el-input v-model="form.kccvppsbm" disabled></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input v-model="form.dybxh" disabled></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.dybxhcar" disabled></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -449,13 +452,20 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.dymc"
                       disabled
                       clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+                  <el-input
+                      v-model="form.dymccar"
+                      disabled
+                      clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <span style="color: rgb(118 122 120)">{{form.wssmr}}</span>
 <!--                  <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->

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

@@ -860,7 +860,7 @@
                     :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                     :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
                   <tree-select-module
                     width="800"
@@ -876,6 +876,22 @@
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                     :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
                 </el-form-item>
+                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
+                  <tree-select-module
+                    width="800"
+                    :key="key4"
+                    :lazy=true
+                    :multiple=true
+                    :check-strictly=true
+                    :modalShowFlag="modalShowFlag5"
+                    :drawerTitle="drawerTitle"
+                    :url="url"
+                    :type="'CAR'"
+                    :urlChild="urlChild"
+                    :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+                    :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -990,7 +1006,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
                     v-if="form.dybxh === ''"
                     v-model="form.dymc = ''"
@@ -1004,6 +1020,20 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-if="form.dybxhcar === ''"
+                    v-model="form.dymccar = ''"
+                    disabled
+                    clearable
+                  ></el-input>
+                  <el-input
+                    v-else
+                    v-model="form.dymccar"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
                   </el-input>
@@ -1544,6 +1574,7 @@ export default {
       key1: 2,
       key2: 3,
       key3: 4,
+      key4: 5,
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
@@ -1553,6 +1584,7 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false, // drawer开关
       modalShowTree: false, // 归档位置drawer开关
       url: '',
       urlChild: '',
@@ -2469,9 +2501,24 @@ export default {
       }
 
     },
+    popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.form.dybxhcar = checkedData.map(item => item.model).join(",")
+          this.form.dymccar = checkedData.map(item => item.name).join(",")
+        } else {
+          this.form.dybxhcar = checkedData.model
+          this.form.dymccar = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+    },
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverHideModelCancel2() {
+      this.modalShowFlag5 = false
+    },
     processTable() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -322,7 +322,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model.number="form.dybxh"
@@ -330,6 +330,14 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
+                  <el-input
+                    disabled
+                    v-model.number="form.dybxhcar"
+                    placeholder="请选择模块结构单元变型号"
+                    clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                   <el-select disabled :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -406,13 +414,20 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
+                <el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.dymc"
                     disabled
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
+                  <el-input
+                    v-model="form.dymccar"
+                    disabled
+                    clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
                   <el-input v-model="form.wssmr">
                   </el-input>

src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue

@@ -327,55 +327,65 @@
               </template>
             </el-table-column>
             <el-table-column
-                    prop="releaseTime"
+                    prop="reviewUserName"
-                    label="初稿完成日期"
+                    label="复审人"
+                    min-width="8%"
                     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.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
-                <!--                  </el-form-item>-->
-                <!--              </template>-->
             </el-table-column>
-            <el-table-column
+            <el-table-column label="操作" align="center"  min-width="8%">
-                    prop="draftTime"
+                <template slot-scope="scope">
-                    label="计划标准发布日期"
+                    <div  @click="detail(scope.row)" style="display: inline-block;cursor: pointer;color: #409EFF;">
-                    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.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="reviewResultsContent"
-                    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 label="操作" align="center"  min-width="5%">-->
-                <template slot-scope="scope" >
-                    <div v-show="scope.row.reviewResults === '1'" @click="handleFilePreviewNew(scope.row,'preview','fs')" style="display: inline-block;cursor: pointer;color: #409EFF;">
-                        预览
-                    </div>
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <div v-show="scope.row.reviewResults === '1'" @click="handleFilePreviewNew(scope.row,'down','fs')" style="display: inline-block;cursor: pointer;color: #409EFF;">
-                        下载
                     </div>
                 </template>
             </el-table-column>
+<!--            <el-table-column-->
+<!--                    prop="releaseTime"-->
+<!--                    label="初稿完成日期"-->
+<!--                    align="center"-->
+<!--                    min-width="10%">-->
+<!--                &lt;!&ndash;              <template slot-scope="scope">&ndash;&gt;-->
+<!--                &lt;!&ndash;                  <el-form-item&ndash;&gt;-->
+<!--                &lt;!&ndash;                          style="margin-left: 0;margin-bottom:0;"&ndash;&gt;-->
+<!--                &lt;!&ndash;                  >&ndash;&gt;-->
+<!--                &lt;!&ndash;                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>&ndash;&gt;-->
+<!--                &lt;!&ndash;                  </el-form-item>&ndash;&gt;-->
+<!--                &lt;!&ndash;              </template>&ndash;&gt;-->
+<!--            </el-table-column>-->
+<!--            <el-table-column-->
+<!--                    prop="draftTime"-->
+<!--                    label="计划标准发布日期"-->
+<!--                    align="center"-->
+<!--                    min-width="10%">-->
+<!--                &lt;!&ndash;              <template slot-scope="scope">&ndash;&gt;-->
+<!--                &lt;!&ndash;                  <el-form-item&ndash;&gt;-->
+<!--                &lt;!&ndash;                          style="margin-left: 0;margin-bottom:0;"&ndash;&gt;-->
+<!--                &lt;!&ndash;                  >&ndash;&gt;-->
+<!--                &lt;!&ndash;                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>&ndash;&gt;-->
+<!--                &lt;!&ndash;                  </el-form-item>&ndash;&gt;-->
+<!--                &lt;!&ndash;              </template>&ndash;&gt;-->
+<!--            </el-table-column>-->
+<!--            <el-table-column-->
+<!--                    prop="reviewResultsContent"-->
+<!--                    label="复审理由"-->
+<!--                    align="center"-->
+<!--                    min-width="30%">-->
+<!--                <template slot-scope="scope">-->
+<!--                    <span :title="scope.row.reviewResultsContent">{{scope.row.reviewResultsContent | ellipsis35}}</span>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column label="复审文件" align="center"  min-width="8%">-->
+<!--                <template slot-scope="scope" >-->
+<!--                    <div v-show="scope.row.reviewResults === '1'" @click="handleFilePreviewNew(scope.row,'preview','fs')" style="display: inline-block;cursor: pointer;color: #409EFF;">-->
+<!--                        预览-->
+<!--                    </div>-->
+<!--                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+<!--                    <div v-show="scope.row.reviewResults === '1'" @click="handleFilePreviewNew(scope.row,'down','fs')" style="display: inline-block;cursor: pointer;color: #409EFF;">-->
+<!--                        下载-->
+<!--                    </div>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
         </el-table>
     </div>
     <ProcessTitle v-show="verifySarStandard">
@@ -402,16 +412,27 @@
                                    value-format="yyyy-MM-dd"
                     ></el-datePicker>
                 </el-form-item>
-                <el-form-item v-if="verifySort() !== '' && verifySort()" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+                <el-form-item v-if="verifySort() !== '' && verifySort() && opinionsShow2" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
                     <el-datePicker v-model="form.expirationDate"
                                    :editable="false"
                                    placeholder="请选择截止日期"
                                    value-format="yyyy-MM-dd"
                     ></el-datePicker>
                 </el-form-item>
+                <el-form-item v-if="form.reviewResults === '1' && opinionsShow2" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+                    <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                        <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','lx')" :title="item.name">{{ item.name | ellipsis2 }}</span>
+                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreviewNew(item,'down','lx')"></el-button>
+                  </span>
+                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-edit"  @click="handleFilePreviewNew(item,'onlineEdit','lx')"></el-button>
+                  </span>
+                    </div>
+                </el-form-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item v-show="opinionsShow2" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.reviewResults === '1' && opinionsShow2" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
                     <el-input v-show="!opinionsShow2" v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
                     <el-input v-show="opinionsShow2"
                               v-model="form.QCRBUSS"
@@ -427,7 +448,7 @@
                                    value-format="yyyy-MM-dd"
                     ></el-datePicker>
                 </el-form-item>
-                <el-form-item v-if="form.reviewResults === '1'" label="复审单" prop="LXDName" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.reviewResults === '1'" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
                     <div v-if="FSDList.length > 0" v-for="(item,index) in FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
                         <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis2 }}</span>
                         <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
@@ -450,6 +471,63 @@
             </el-input>
         </el-form-item>
     </div>
+    <el-drawer
+            ref="standard"
+            size="500px"
+            :title="showDrawerTitle"
+            :visible.sync="showDrawer"
+            :before-close="showDrawerClose">
+        <div class="demo-drawer-content">
+            <div class="content">
+                <div class="standard-table-search">
+                    <el-row :gutter="24">
+                        <el-col :span="24">
+                            <el-form :model="showForm" inline class="label-input-form" label-width="220px" ref="showForm">
+                                <el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+                                    <el-select v-model="showForm.reviewResults" filterable clearable :disabled="disabledState">
+                                        <el-option
+                                                v-for="item in opinionsReviewResultsOptions"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="复审人" prop="reviewUserName" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="showForm.reviewUserName" :disabled="disabledState"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="verifySort2() !== '' && !verifySort2()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
+                                    <el-datePicker v-model="showForm.draftTime" :disabled="disabledState"
+                                                   :editable="false"
+                                                   placeholder="请选择初稿完成日期"
+                                                   value-format="yyyy-MM-dd"
+                                    ></el-datePicker>
+                                </el-form-item>
+                                <el-form-item v-if="verifySort2() !== '' && !verifySort2()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
+                                    <el-datePicker v-model="showForm.releaseTime" :disabled="disabledState"
+                                                   :editable="false"
+                                                   placeholder="请选择计划标准发布日期"
+                                                   value-format="yyyy-MM-dd"
+                                    ></el-datePicker>
+                                </el-form-item>
+                                <el-form-item v-if="showForm.reviewResults === '1'" :disabled="disabledState" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
+                                    <div v-if="showForm.FSDList.length > 0" v-for="(item,index) in showForm.FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                        <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis15 }}</span>
+                                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                                            <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreviewNew(item,'down','fs')"></el-button>
+                                      </span>
+                                    </div>
+                                </el-form-item>
+                            </el-form>
+                        </el-col>
+                    </el-row>
+                </div>
+            </div>
+        </div>
+    </el-drawer>
 </form>
 </template>
 
@@ -522,13 +600,20 @@ export default {
     },
   },
   filters: {
-    ellipsis (value) {
+    ellipsis35 (value) {
       if (!value) return ''
       if (value.length > 35) {
         return value.slice(0,35) + '...'
       }
       return value
     },
+    ellipsis15 (value) {
+      if (!value) return ''
+      if (value.length > 10) {
+          return value.slice(0,10) + '...'
+      }
+      return value
+    },
     ellipsis2 (value) {
       if (!value) return ''
       if (value.length > 20) {
@@ -549,6 +634,9 @@ export default {
         {value: '2',label: '废止'},
         {value: '3',label: '继续有效'},
       ],
+      showForm:{},
+      showDrawerTitle:"",
+      showDrawer:false,
       form:{},
       LXDList:[],
       FSDList:[],
@@ -590,6 +678,23 @@ export default {
     ...mapGetters(['userInfo'])
   },
   methods: {
+      detail(row){
+          this.showDrawerTitle = '查看'
+          this.showDrawer = true
+          this.showForm = row
+          this.showForm.FSDList=this.assemble(this.showForm.FSD,this.showForm.FSDName);
+          console.log(this.showForm)
+      },
+      showDrawerClose () {
+          this.showDrawer = false
+      },
+      verifySort2(){
+          if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){
+              return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
+          }else {
+              return ""
+          }
+      },
       verifySort(){
         if(this.form.reviewResults && this.form.reviewResults === '1'){
             return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
@@ -751,7 +856,7 @@ export default {
     form: {
         handler: function (val) {
             if(val){
-                this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList);
+                this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList);
             }
         },
         deep: true //对象的深度验证

src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue

@@ -0,0 +1,886 @@
+<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="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 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 label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled" >-->
+<!--              <template>-->
+<!--                  <div style="padding-left: 10px; color: #666666;">{{ form.reviseStatus === ''? '' : (form.reviseStatus === '1'? '制定' : '修订') }}</div>-->
+<!--              </template>-->
+<!--          </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 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 v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
+        <!--                                <el-input v-model="form.standYear" :disabled="disabledState"-->
+        <!--                                          clearable></el-input>-->
+        <!--                            </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')">{{ 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  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')">{{ 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  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="BZSMBUSSName" class="add-form-item form-item-disabled">
+          <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :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  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')">{{ 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  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="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车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="关联模块--卡车VPPS编码" title="关联模块--卡车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-col>
+      <el-col :span="12">
+        <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="关联模块--乘用车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="关联模块--卡车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-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-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="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="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+<!--          <el-input-->
+<!--                  v-model="form.BDTWJHLAWS" :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">
+            <el-option
+                    v-for="item in cbcdOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </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')">{{ 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  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-col>
+    </el-row>
+  </div>
+    <ProcessTitle v-show="opinionsShow2">
+        <template slot="title">复审信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border" v-show="opinionsShow2">
+        <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.fileModelList"
+                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="reviewResults"
+                    label="复审结果"
+                    min-width="8%"
+                    align="center"
+            >
+              <template slot-scope="scope">
+                  {{filterReviewResults(scope.row.reviewResults)}}
+              </template>
+            </el-table-column>
+            <el-table-column
+                    prop="reviewUserName"
+                    label="复审人"
+                    min-width="8%"
+                    align="center"
+            >
+            </el-table-column>
+            <el-table-column label="操作" align="center"  min-width="8%">
+                <template slot-scope="scope">
+                    <div  @click="detail(scope.row)" style="display: inline-block;cursor: pointer;color: #409EFF;">
+                        复审详情
+                    </div>
+                </template>
+            </el-table-column>
+<!--            <el-table-column-->
+<!--                    prop="releaseTime"-->
+<!--                    label="初稿完成日期"-->
+<!--                    align="center"-->
+<!--                    min-width="10%">-->
+<!--                &lt;!&ndash;              <template slot-scope="scope">&ndash;&gt;-->
+<!--                &lt;!&ndash;                  <el-form-item&ndash;&gt;-->
+<!--                &lt;!&ndash;                          style="margin-left: 0;margin-bottom:0;"&ndash;&gt;-->
+<!--                &lt;!&ndash;                  >&ndash;&gt;-->
+<!--                &lt;!&ndash;                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>&ndash;&gt;-->
+<!--                &lt;!&ndash;                  </el-form-item>&ndash;&gt;-->
+<!--                &lt;!&ndash;              </template>&ndash;&gt;-->
+<!--            </el-table-column>-->
+<!--            <el-table-column-->
+<!--                    prop="draftTime"-->
+<!--                    label="计划标准发布日期"-->
+<!--                    align="center"-->
+<!--                    min-width="10%">-->
+<!--                &lt;!&ndash;              <template slot-scope="scope">&ndash;&gt;-->
+<!--                &lt;!&ndash;                  <el-form-item&ndash;&gt;-->
+<!--                &lt;!&ndash;                          style="margin-left: 0;margin-bottom:0;"&ndash;&gt;-->
+<!--                &lt;!&ndash;                  >&ndash;&gt;-->
+<!--                &lt;!&ndash;                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>&ndash;&gt;-->
+<!--                &lt;!&ndash;                  </el-form-item>&ndash;&gt;-->
+<!--                &lt;!&ndash;              </template>&ndash;&gt;-->
+<!--            </el-table-column>-->
+<!--            <el-table-column-->
+<!--                    prop="reviewResultsContent"-->
+<!--                    label="复审理由"-->
+<!--                    align="center"-->
+<!--                    min-width="30%">-->
+<!--                <template slot-scope="scope">-->
+<!--                    <span :title="scope.row.reviewResultsContent">{{scope.row.reviewResultsContent | ellipsis35}}</span>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column label="复审文件" align="center"  min-width="8%">&ndash;&gt;-->
+<!--                <template slot-scope="scope" >-->
+<!--                    <div v-show="scope.row.reviewResults === '1'" @click="handleFilePreviewNew(scope.row,'preview','fs')" style="display: inline-block;cursor: pointer;color: #409EFF;">-->
+<!--                        预览-->
+<!--                    </div>-->
+<!--                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;-->
+<!--                    <div v-show="scope.row.reviewResults === '1'" @click="handleFilePreviewNew(scope.row,'down','fs')" style="display: inline-block;cursor: pointer;color: #409EFF;">-->
+<!--                        下载-->
+<!--                    </div>-->
+<!--                </template>-->
+<!--            </el-table-column>-->
+        </el-table>
+    </div>
+    <ProcessTitle v-show="verifySarStandard">
+        <template slot="title">复审结果</template>
+    </ProcessTitle>
+<!--  reviewResults  1 修订、2 废止、3 继续有效-->
+    <div class="prc-content-border"  v-show="verifySarStandard">
+        <el-row :gutter="24">
+            <el-col :span="12">
+                <el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+                    <el-select v-model="form.reviewResults" filterable clearable :disabled="disabledState">
+                        <el-option
+                            v-for="item in opinionsReviewResultsOptions"
+                            :key="item.value"
+                            :value="item.value"
+                            :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item v-if="verifySort() !== '' && !verifySort()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
+                    <el-datePicker v-model="form.draftTime" :disabled="disabledState"
+                                   :editable="false"
+                                   placeholder="请选择初稿完成日期"
+                                   value-format="yyyy-MM-dd"
+                    ></el-datePicker>
+                </el-form-item>
+                <el-form-item v-if="form.reviewResults === '1'" label="立项单" prop="LXDName" class="add-form-item form-item-disabled">
+                    <div v-if="LXDList.length > 0" v-for="(item,index) in LXDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                        <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','lx')" :title="item.name">{{ item.name | ellipsis2 }}</span>
+                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                            <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreviewNew(item,'down','lx')"></el-button>
+                        </span>
+                    </div>
+                </el-form-item>
+                <el-form-item label="复审人" prop="reviewUserName" class="add-form-item form-item-disabled">
+                    <el-input
+                            v-model="form.reviewUserName" :disabled="disabledState"
+                            clearable
+                    ></el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12">
+                <el-form-item v-if="form.reviewResults === '1' && opinionsShow2" 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 v-if="verifySort() !== '' && !verifySort()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
+                    <el-datePicker v-model="form.releaseTime" :disabled="disabledState"
+                                   :editable="false"
+                                   placeholder="请选择计划标准发布日期"
+                                   value-format="yyyy-MM-dd"
+                    ></el-datePicker>
+                </el-form-item>
+                <el-form-item v-if="form.reviewResults === '1'" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
+                    <div v-if="FSDList.length > 0" v-for="(item,index) in FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                        <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis2 }}</span>
+                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                            <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreviewNew(item,'down','fs')"></el-button>
+                        </span>
+                    </div>
+                </el-form-item>
+                <el-form-item v-if="verifySort() !== '' && verifySort()" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+                    <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
+                                   :editable="false"
+                                   placeholder="请选择截止日期"
+                                   value-format="yyyy-MM-dd"
+                    ></el-datePicker>
+                </el-form-item>
+            </el-col>
+        </el-row>
+        <el-form-item v-show="form.reviewResults === '2' || form.reviewResults === '3'" label="复审理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+            <el-input
+                    :disabled="disabledState"
+                    type="textarea"
+                    :rows="3"
+                    resize="none"
+                    placeholder="请输入复审理由"
+                    v-model="form.reviewResultsContent">
+            </el-input>
+        </el-form-item>
+    </div>
+    <el-drawer
+            ref="standard"
+            size="500px"
+            :title="showDrawerTitle"
+            :visible.sync="showDrawer"
+            :before-close="showDrawerClose">
+        <div class="demo-drawer-content">
+            <div class="content">
+                <div class="standard-table-search">
+                    <el-row :gutter="24">
+                        <el-col :span="24">
+                            <el-form :model="showForm" inline class="label-input-form" label-width="220px" ref="showForm">
+                                <el-form-item label="复审结果" prop="reviewResults" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+                                    <el-select v-model="showForm.reviewResults" filterable clearable :disabled="disabledState">
+                                        <el-option
+                                                v-for="item in opinionsReviewResultsOptions"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="复审人" prop="reviewUserName" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="showForm.reviewUserName" :disabled="disabledState"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item v-if="verifySort2() !== '' && !verifySort2()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
+                                    <el-datePicker v-model="showForm.draftTime" :disabled="disabledState"
+                                                   :editable="false"
+                                                   placeholder="请选择初稿完成日期"
+                                                   value-format="yyyy-MM-dd"
+                                    ></el-datePicker>
+                                </el-form-item>
+                                <el-form-item v-if="verifySort2() !== '' && !verifySort2()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
+                                    <el-datePicker v-model="showForm.releaseTime" :disabled="disabledState"
+                                                   :editable="false"
+                                                   placeholder="请选择计划标准发布日期"
+                                                   value-format="yyyy-MM-dd"
+                                    ></el-datePicker>
+                                </el-form-item>
+                                <el-form-item v-if="showForm.reviewResults === '1'" :disabled="disabledState" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
+                                    <div v-if="showForm.FSDList.length > 0" v-for="(item,index) in showForm.FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                        <span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis15 }}</span>
+                                        <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                                            <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreviewNew(item,'down','fs')"></el-button>
+                                      </span>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item v-show="showForm.reviewResults === '2' || showForm.reviewResults === '3'" label="复审理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            :disabled="disabledState"
+                                            type="textarea"
+                                            :rows="3"
+                                            resize="none"
+                                            placeholder="请输入复审理由"
+                                            v-model="showForm.reviewResultsContent">
+                                    </el-input>
+                                </el-form-item>
+                            </el-form>
+                        </el-col>
+                    </el-row>
+                </div>
+            </div>
+        </div>
+    </el-drawer>
+</form>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ProcessTitle from '../../../components/ProcessTitle'
+
+
+export default {
+  name: 'formList',
+  components: {
+    ProcessTitle,
+  },
+  props: {
+    formSub: {
+      type: Object,
+      required: true
+     },
+    FBGBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    LSBBBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    BZSMBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    QTWJBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    GLWJBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    LXDListSub: {
+      type: Array,
+      required: true
+    },
+    FSDListSub: {
+      type: Array,
+      required: true
+    },
+    summaryFileList: {
+      type: Array,
+      required: false
+    },
+    disabledState: {
+      type: Boolean,
+      default: false
+    },
+    verifySarStandard: {
+      type: Boolean,
+      default: false
+    },
+    opinionsShow2: {
+      type: Boolean,
+      default: false
+    },
+    opinionsShow: {
+      type: Boolean,
+      default: false
+    },
+    fileShow: {
+      type: Boolean,
+      default: false
+    },
+  },
+  filters: {
+    ellipsis35 (value) {
+      if (!value) return ''
+      if (value.length > 35) {
+        return value.slice(0,35) + '...'
+      }
+      return value
+    },
+      ellipsis15 (value) {
+          if (!value) return ''
+          if (value.length > 10) {
+              return value.slice(0,10) + '...'
+          }
+          return value
+      },
+    ellipsis2 (value) {
+      if (!value) return ''
+      if (value.length > 20) {
+          return value.slice(0,20) + '...'
+      }
+      return value
+    }
+  },
+  data () {
+    return {
+     opinionsAdoptedOptions:[
+        {value: '1',label: '采纳'},
+        {value: '2',label: '部分采纳'},
+        {value: '3',label: '不采纳'},
+      ],
+      opinionsReviewResultsOptions:[
+        {value: '1',label: '修订'},
+        {value: '2',label: '废止'},
+        {value: '3',label: '继续有效'},
+      ],
+      showForm:{},
+      showDrawerTitle:"",
+      showDrawer:false,
+      form:{},
+      LXDList:[],
+      FSDList:[],
+      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: {
+      assemble(ids,names){
+          let list= new Array();
+          if(ids && ids !== '' && names && names !== ''){
+              let idArray=ids.split(',');
+              let nameArray=names.split(',');
+              for(let i=0; i<idArray.length; i++){
+                  list.push({id:idArray[i],name:nameArray[i]});
+              }
+          }
+          return list;
+      },
+      detail(row){
+          this.showDrawerTitle = '查看'
+          this.showDrawer = true
+          this.showForm = row
+          this.showForm.FSDList=this.assemble(this.showForm.FSD,this.showForm.FSDName);
+          console.log(this.showForm)
+      },
+      showDrawerClose () {
+          this.showDrawer = false
+      },
+      verifySort2(){
+          if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){
+              return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
+          }else {
+              return ""
+          }
+      },
+      verifySort(){
+        if(this.form.reviewResults && this.form.reviewResults === '1'){
+            return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
+        }else {
+            return ""
+        }
+      },
+      choiceZRRList (type, title, id) {
+          this.$emit('formChoiceZRRListCancel',type,title,id)
+      },
+    filterReviewResults(data){
+        if(!data){
+            return  ""
+        }
+        const map = new Map();
+        map.set("1","修订");
+        map.set("2","废止");
+        map.set("3","继续有效");
+        return map.get(data)
+    },
+    filterOp(data){
+        if(!data){
+            return  ""
+        }
+        const map = new Map();
+        map.set("1","采纳");
+        map.set("2","部分采纳");
+        map.set("3","不采纳");
+        return map.get(data)
+    },
+      // 文件预览及下载
+      handleFilePreviewNew(file,type,onlineType) {
+          let id = ""
+          let fileName = ""
+          let fileNam2 = ""
+          if(onlineType === 'lx'){
+              if(this.form.standName && this.form.standName !== ''){
+                  fileName = this.form.standName+'-立项单.docx'
+                  fileNam2 = this.form.standName+'-立项单'
+              }else {
+                  fileName = '立项单.docx'
+                  fileNam2 = '立项单'
+              }
+          }else if(onlineType === 'fs'){
+              if(this.form.standName && this.form.standName !== ''){
+                  fileName = this.form.standName+'-复审单.docx'
+                  fileNam2 = this.form.standName+'-复审单'
+              }else {
+                  fileName = '复审单.docx'
+                  fileNam2 = '复审单'
+              }
+          }
+
+          if(file && file.id){
+              id = file.id
+          }else {
+            if(onlineType === 'fs'){
+                id = file.FSD
+            }else if(onlineType === 'lx'){
+                id = file.LXD
+            }
+          }
+          if (type === 'down') {
+              if (id) {
+                  window.open('/api/lawss/activiti/downloadFileForSar?fileId=' + id +'&oldFileName='+fileName)
+              } else {
+                  this.$message.warning('文件不存在,下载失败')
+              }
+          } else if(type === 'preview'){
+              this.$onlineEditPreview(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+          }else {
+              this.$onlineEdit(id,fileNam2,this.$store.getters.userInfo.userId,this.$store.getters.userInfo.userName)
+          }
+      },
+    // 文件预览及下载
+    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
+      })
+    },
+  },
+  mounted () {
+    this.form = this.formSub
+    this.LXDList = this.LXDListSub
+    this.FSDList = this.FSDListSub
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      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.setMap(this.standStateOptions)
+    })
+    this.busVsFunc()
+    this.modelFunc()
+  },
+  watch: {
+    form: {
+        handler: function (val) {
+            if(val){
+                this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.FSDList,this.LXDList);
+            }
+        },
+        deep: true //对象的深度验证
+   },
+}
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -175,7 +175,6 @@ export default {
         let fileObj = await this.processEditFile(this.qbfsForm.FSD)
         if (fileObj) {
           const editFileInfo = fileObj
-          console.log(editFileInfo)
           if (editFileInfo && editFileInfo.editStatus === '1') {
             callback()
           } else {
@@ -246,7 +245,7 @@ export default {
         releaseTime: [
           {required: true, message: "请选择计划标准发布日期", trigger: "change"}
         ],
-        LXDName: [
+        FSDName: [
           { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
         ],
       },
@@ -434,6 +433,8 @@ export default {
         const bringData = standObj.data
         const obj = {
             reviewResultsContent:"",
+            reviewUserId:this.$store.getters.userInfo.userId,
+            reviewUserName:this.$store.getters.userInfo.userName,
             draftTime:"",
             releaseTime:"",
             expirationDate:"",
@@ -518,6 +519,8 @@ export default {
             info.LXD = this.qbfsForm.LXD
             info.FSDName = this.qbfsForm.FSDName
             info.FSD = this.qbfsForm.FSD
+            info.reviewUserId = this.$store.getters.userInfo.userId
+            info.reviewUserName = this.$store.getters.userInfo.userName
             infoList.push(info)
             this.qbfsForm.fileModelList = infoList
             let json = JSON.stringify(this.qbfsForm);

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

@@ -170,6 +170,19 @@ export default {
     formList
   },
   data() {
+      const validateLxOnlineFile = async (rule, value, callback) => {
+          if(this.qbfsForm.LXD){
+              let fileObj = await this.processEditFile(this.qbfsForm.LXD)
+              if (fileObj) {
+                  const editFileInfo = fileObj
+                  if (editFileInfo && editFileInfo.editStatus === '1') {
+                      callback()
+                  } else {
+                      callback(new Error('请先在线编辑,再提交流程！'))
+                  }
+              }
+          }
+      };
     const validateFsOnlineFile = async (rule, value, callback) => {
       if(this.qbfsForm.FSD){
         let fileObj = await this.processEditFile(this.qbfsForm.FSD)
@@ -237,6 +250,9 @@ export default {
         bussFsSubUser2Name: [
           {required: true, message: "请选择企标复审人", trigger: "change"}
         ],
+        QCRBUSS: [
+          {required: true, message: "请选择主起草人", trigger: "change"}
+        ],
         reviewResults: [
           {required: true, message: "请选择复审结果", trigger: "change"}
         ],
@@ -246,9 +262,15 @@ export default {
         releaseTime: [
           {required: true, message: "请选择计划标准发布日期", trigger: "change"}
         ],
-        LXDName: [
+        expirationDate: [
+          {required: true, message: "请选择截止日期", trigger: "change"}
+        ],
+        FSDName: [
           { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
         ],
+        LXDName: [
+          { required: true, validator: validateLxOnlineFile, trigger: 'blur' }
+        ],
       },
     }
   },
@@ -266,7 +288,6 @@ export default {
         if (val !== '' && val !== null && typeof (val) !== 'undefined') {
             if(val === '1'){
               if (this.bpnId === undefined) {
-                this.getFsFile()
               }
             }
         }
@@ -274,18 +295,8 @@ export default {
     },
   },
   methods:{
-     async getFsFile(){
+     async getFile(){
-        let fileObj = await this.getSaveFile("model_fs")
+
-        if(fileObj){
-          this.qbfsForm.FSD = fileObj.id
-          if(this.qbfsForm.standName){
-            this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
-          }else {
-            this.qbfsForm.FSDName = '复审单'
-          }
-          this.FSDList=this.assemble(fileObj.id,this.qbfsForm.FSDName);
-          this.formKey++
-        }
      },
      getSaveFile(model) {
       return new Promise((resolve, reject) => {
@@ -331,7 +342,7 @@ export default {
       choiceZRRList (type, title, id) {
           this.nodeList2 = []
           if(type === 'QCRBUSS'){
-              if ( this.qbfsForm.QCRBUSSID != undefined && this.qbfsForm.QCRBUSSID.length > 0) {
+              if ( this.qbfsForm.QCRBUSSID !== undefined && this.qbfsForm.QCRBUSSID.length > 0) {
                   this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',')
               }
           }
@@ -429,11 +440,18 @@ export default {
      * @description: 动态表单读取
      */
     async getFormFieldList (item) {
+
       let standObj = await this.getStandInfoUpdateById(item.standId)
+      let fileObjFx = await this.getSaveFile("model_fs")
+      let fileObjLx = await this.getSaveFile("model_lx")
+
       this.$nextTick(() => {
         const bringData = standObj.data
         const obj = {
+            reviewResults: "",
             reviewResultsContent:"",
+            reviewUserId:this.$store.getters.userInfo.userId,
+            reviewUserName:this.$store.getters.userInfo.userName,
             draftTime:"",
             releaseTime:"",
             expirationDate:"",
@@ -441,6 +459,8 @@ export default {
             LXD:"",
             FSDName:"",
             FSD:"",
+            QCRBUSSID:"",
+            QCRBUSS:"",
         }
         const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
         this.qbfsForm = JSON.parse(JSON.stringify(json))
@@ -452,8 +472,24 @@ export default {
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
         this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
         this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
-        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        if(fileObjFx){
-        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
+          this.qbfsForm.FSD = fileObjFx.id
+          if(this.qbfsForm.standName){
+              this.qbfsForm.FSDName = this.qbfsForm.standName + '-复审单'
+          }else {
+              this.qbfsForm.FSDName = '复审单'
+          }
+          this.FSDList=this.assemble(fileObjFx.id,this.qbfsForm.FSDName);
+        }
+        if(fileObjLx){
+          this.qbfsForm.LXD = fileObjLx.id
+          if(this.qbfsForm.standName){
+              this.qbfsForm.LXDName = this.qbfsForm.standName + '-立项单'
+          }else {
+              this.qbfsForm.LXDName = '立项单'
+          }
+          this.LXDList=this.assemble(fileObjLx.id,this.qbfsForm.LXDName);
+        }
         this.standardDrawer = false
         this.verifySarStandard = true
         this.formKey++
@@ -507,19 +543,6 @@ export default {
             this.isSubmit = true
             this.saveLoading = true
             this.qbfsForm.commentText = this.commentText
-            const infoList = []
-            const info = {}
-            info.reviewResults = this.qbfsForm.reviewResults
-            info.reviewResultsContent = this.qbfsForm.reviewResultsContent
-            info.draftTime = this.qbfsForm.draftTime
-            info.releaseTime = this.qbfsForm.releaseTime
-            info.expirationDate = this.qbfsForm.expirationDate
-            info.LXDName = this.qbfsForm.LXDName
-            info.LXD = this.qbfsForm.LXD
-            info.FSDName = this.qbfsForm.FSDName
-            info.FSD = this.qbfsForm.FSD
-            infoList.push(info)
-            this.qbfsForm.fileModelList = infoList
             let json = JSON.stringify(this.qbfsForm);
             this.$http.post('lawss/activiti/completeTask', {
               taskIds: this.$route.query.taskIds,

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

@@ -0,0 +1,897 @@
+<template>
+<div class="qbfs-step2">
+  <ProcessHeader toggle>
+    <template slot="proName">企标复审流程</template>
+    <template slot="proNode">标准法规部高级经理批准</template>
+  </ProcessHeader>
+  <div class="headerTabs">
+    <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+    <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+  </div>
+  <div class="content">
+    <el-form
+            ref="qbfsForm"
+            :model="qbfsForm"
+            :rules="formRules"
+            style="border: none"
+            class="label-input-form"
+            label-width="150px"
+    >
+    <div style="flex: auto; overflow: auto"  v-show="active === '1'">
+      <formList
+              :key = "formKey"
+              :formSub = "qbfsForm"
+              :FBGBUSSFileList = "FBGBUSSFileList"
+              :LSBBBUSSFileList = "LSBBBUSSFileList"
+              :BZSMBUSSFileList = "BZSMBUSSFileList"
+              :QTWJBUSSFileList = "QTWJBUSSFileList"
+              :GLWJBUSSFileList = "GLWJBUSSFileList"
+              :LXDListSub = "LXDList === undefined ? [] : LXDList"
+              :FSDListSub = "FSDList === undefined ? [] : FSDList"
+              :disabledState = "disabledState"
+              :opinionsShow2 = "true"
+              :verifySarStandard = "verifySarStandard"
+              @formCancel="formCancel"
+              @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+      ></formList>
+      <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 style="padding-top: 20px;" v-show="active === '3'">
+        <div class="flow-list">
+          <el-table
+                  height="100%"
+                  ref="selection"
+                  :data="detailData"
+                  tooltip-effect="dark"
+                  style="width: 100%"
+                  border
+                  row-key="id"
+                  :no-data-text="listNoDataText"
+                  :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+          >
+            <el-table-column
+                    type="selection"
+                    width="55"
+                    align="center">
+            </el-table-column>
+            <el-table-column
+                    prop="name"
+                    label="任务步骤"
+                    align="center"
+            >
+            </el-table-column>
+            <el-table-column
+                    prop="assignee"
+                    label="任务受理人"
+                    align="center"
+            >
+            </el-table-column>
+            <el-table-column
+                    prop="createTime"
+                    label="创建时间"
+                    sortable="custom"
+                    align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                    prop="endTime"
+                    label="完成时间"
+                    align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                    prop="comment"
+                    label="流程信息"
+                    align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.commentText }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+                    prop="completeFlag"
+                    label="状态"
+                    align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <loading :loading="loading">流程列表加载中</loading>
+        </div>
+      </div>
+    </el-form>
+  </div>
+  <ProcessFooter
+          v-show="verifySarStandard"
+          :show-save="false"
+          show-over2
+          show-submit2
+          show-transfer
+          :submitLoading="isSubmit"
+          :saveLoading="saveLoading"
+          @transfer="handleTransfer"
+          @submit2="handle2"
+          @over2="handle1"
+  >
+  </ProcessFooter>
+  <!-- 福田全公司选人解决方案 -->
+  <Role-tree
+    check-box
+    :is-title="drawerTitle"
+    :is-visible.sync="drawerModal"
+    @checkedRole="checkedRoles"
+    :nodeList="nodeList"
+  ></Role-tree>
+  <!--    选择责任人-->
+  <Role-tree
+    :is-title="drawerTitle"
+    :is-visible.sync="modalshowflag"
+    @checkedRole="checkedRole"
+    :nodeList="nodeList2"
+  ></Role-tree>
+    <Role-tree
+        is-title="选择责任部门对接人"
+        :is-visible.sync="modalShowRoleFlag"
+        @checkedRole="checkedRole2"
+        :nodeList="nodeList2"
+    ></Role-tree>
+  <loading :loading="dataLoading">正在加载数据</loading>
+</div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile,processCreateFsBuss } from "api/process";
+import formList from './common/formListStep5.vue'
+
+export default {
+  name: "bussFs3",
+  components:{
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle,
+    formList
+  },
+  data() {
+      const validateLxOnlineFile = async (rule, value, callback) => {
+          if(this.qbfsForm.LXD){
+              let fileObj = await this.processEditFile(this.qbfsForm.LXD)
+              if (fileObj) {
+                  const editFileInfo = fileObj
+                  if (editFileInfo && editFileInfo.editStatus === '1') {
+                      callback()
+                  } else {
+                      callback(new Error('请先在线编辑,再提交流程！'))
+                  }
+              }
+          }
+      };
+    const validateFsOnlineFile = async (rule, value, callback) => {
+      if(this.qbfsForm.FSD){
+        let fileObj = await this.processEditFile(this.qbfsForm.FSD)
+        if (fileObj) {
+          const editFileInfo = fileObj
+          console.log(editFileInfo)
+          if (editFileInfo && editFileInfo.editStatus === '1') {
+            callback()
+          } else {
+            callback(new Error('请先在线编辑,再提交流程！'))
+          }
+        }
+      }
+    };
+    return {
+      dataLoading:true,
+      bpnId: '',
+      formKey:1,
+      active: '1',
+      modalShowRoleFlag:false,
+      disabledState:true,
+      verifySarStandard:true,
+      FBGBUSSFileList: [],
+      BZSMBUSSFileList: [],
+      LSBBBUSSFileList: [],
+      QTWJBUSSFileList: [],
+      GLWJBUSSFileList: [],
+      LXDList: [],
+      FSDList: [],
+      fileList: [],
+      commentText: '',
+      approvalOpinion: '',
+      detailData: [],
+      nodeList: [],
+      nodeList2: [],
+      isSubmit: false,
+      saveLoading: false,
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      loading: false,
+      qbfsForm:{
+        entNumber: '',
+        cnName: '',
+        enName: '',
+        entCategory: '',
+        replaceNumber: '',
+        replacedNumber: '',
+        releaseDate: '',
+        implementDate: '',
+        reviewDate: '',
+        jgUser: '',
+        jgUserId: '',
+        bussFsSubUser2:'',
+        bussFsSubUser2Name:'',
+      },
+      formBuss: {
+        selListRep2:[],
+        id:'',
+        standNum:'',
+        standStatus:'', // 标准状态
+        planId:'',
+        planStatus:'',
+        reviseStatus:'',
+        standSn:'',
+        modelData:[],
+        modelDataNameVerify:[],
+        modelDataZrUserVerify:[],
+        BARQ: '',
+        XGD: '',
+        XGDName: '',
+        // 基础信息
+        country:[],
+        // 基础信息
+        standSort: '',
+        standCode: '',
+        standYear: '',
+        standName: '',
+        standEnName: '',
+        textStatusBuss: '',
+        issueTime: '',
+        expirationDate: '',
+        putTime: '',
+        FZRQBUSS: '',
+        FSRQBUSS: '',
+        // 过程稿件
+        FBGBUSS: '',
+        FBGBUSSName: '',
+        BZSMBUSS: '',
+        BZSMBUSSName: '',
+        LSBBBUSS: '',
+        LSBBBUSSName: '',
+        QTWJBUSS: '',
+        QTWJBUSSName: '',
+        // 适用范围
+        QCDW: '',
+        QCDWID: '',
+        QCRBUSS: '',
+        QCRBUSSID: '',
+        WJSCRYBUSS: this.$store.getters.userInfo.userId,
+        WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+        SYCXCLASS: '',
+        NYLXCLASS: '',
+        SYCPXCLASS: '',
+        TXLBBUSS: '',
+        VPPSBMBUSS: '',
+        VPPSCNBUSS: '',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
+        // 关联信息
+        DTQBBHBUSS: '',
+        BDTQBBHBUSS: '',
+        XGJLBUSS: '',
+        XGLC: '',
+        GLWJBUSS: '',
+        GLWJBUSSName: '',
+        XCSJBUSS: '',
+      }, // 标准信息
+      roleForm:{
+        bussUser3: '',
+        bussUser3Name: '',
+        bussUser6: '',
+        bussUser6Name: '',
+        bussUser2: '', // 多实例
+        bussUser2Name:'', // 多实例
+        bussUser5:'', // 多实例
+        bussUser5Name:'', // 多实例
+        bussUser4:'',
+        bussUser4Name:'',
+        bussUser7:'',
+        bussUser7Name:'',
+        bussUser8:'',
+        bussUser8Name:'',
+        bussUser9:'',
+        bussUser9Name:'',
+        bussUser10:'',
+        bussUser10Name:'',
+        bussUser11:'',
+        bussUser11Name:'',
+        bussUser12:'',
+        bussUser12Name:'',
+        bussUser13:'',
+        bussUser13Name:'',
+        bussUser14:'',
+        bussUser14Name:'',
+        applyUpdUserId: '',
+        applyUpdUserName: '',
+        prcCreateUser: '',
+        prcCreateUserName: '',
+      },
+      formRules: {
+        commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+        approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
+      },
+    }
+  },
+  mounted() {
+    this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getDataS()
+    }
+    this.processTable()
+    this.getData()
+  },
+  watch:{
+    'qbfsForm.reviewResults': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+            if(val === '1'){
+              if (this.bpnId === undefined) {
+              }
+            }
+        }
+      }
+    },
+  },
+  methods:{
+     async getFile(){
+
+     },
+     getSaveFile(model) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('/lawss/activiti/saveEditFile', {
+          model: model
+        }, {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+      },
+      checkedRole2 (data) {
+          let idList = ''
+          let nameList = ''
+          data.forEach( item => {
+              if (nameList.length > 0) {
+                  nameList += ','
+                  idList += ','
+              }
+              idList += item.id
+              nameList += item.name
+          })
+          if(this.userType === 'QCRBUSS'){
+              this.qbfsForm.QCRBUSSID=idList;
+              this.qbfsForm.QCRBUSS=nameList;
+              this.formKey++
+          }
+          if(data !== undefined && data && data.length > 0){
+              const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+              const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+              this.qbfsForm.QCDWID = institutionIdList
+              this.qbfsForm.QCDW = institutionNameList
+          }
+
+          this.modalShowRoleFlag = false
+      },
+      unique(newArr) {
+        const res = new Map();
+        return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+      },
+      choiceZRRList (type, title, id) {
+          this.nodeList2 = []
+          if(type === 'QCRBUSS'){
+              if ( this.qbfsForm.QCRBUSSID != undefined && this.qbfsForm.QCRBUSSID.length > 0) {
+                  this.nodeList2 = this.qbfsForm.QCRBUSSID.split(',')
+              }
+          }
+          this.userType = type
+          this.drawerTitle = title
+          this.modalShowRoleFlag = true
+      },
+    formChoiceZRRListCancel(type, title, id){
+      this.choiceZRRList(type, title, id)
+    },
+    formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
+          this.qbfsForm = form
+          this.FBGBUSSFileList = list1
+          this.LSBBBUSSFileList = list2
+          this.BZSMBUSSFileList = list3
+          this.QTWJBUSSFileList = list4
+          this.GLWJBUSSFileList = list5
+          this.LXDList = list6
+          this.FSDList = list7
+    },
+    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 => {
+      })
+    },
+    assemble(ids,names){
+      let list= new Array();
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
+    getStandInfoUpdateById(standId) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: standId}, {
+          _this: this
+        }, res => {
+          if(res && res.data){
+            const history = res;
+            resolve(history)
+          }
+        })
+      })
+    },
+    getDataS(){
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes)
+        this.qbfsForm = mes.qbfsForm
+        this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
+        this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
+        this.qbfsForm['id'] = bringData.id
+        this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
+        this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
+        this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
+        this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
+        this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
+        this.standardDrawer = false
+        this.verifySarStandard = true
+        this.commentText = mes.commentText
+        this.formKey++
+        this.$forceUpdate()
+      });
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    async getFormFieldList (item) {
+
+      let standObj = await this.getStandInfoUpdateById(item.standId)
+      this.$nextTick(() => {
+        const bringData = standObj.data
+        const json = Object.assign(bringData, bringData.attrInfoMap,item);
+        this.qbfsForm = JSON.parse(JSON.stringify(json))
+        this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
+        this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
+        this.qbfsForm['id'] = bringData.id
+        this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
+        this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
+        this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
+        this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
+        this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
+        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
+        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+        this.standardDrawer = false
+        this.verifySarStandard = true
+        this.formKey++
+        this.$forceUpdate()
+        this.dataLoading = false
+      })
+    },
+    handleTabs(name) {
+      this.active = name;
+    },
+    //流程保存
+    handleSave(){
+      this.saveLoading = true
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.$store.getters.userInfo.userId)
+      _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('prcType', 'buss3')
+      _formData.append('json', JSON.stringify({
+        qbfsForm: this.qbfsForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('保存成功')
+        this.bpnId = res.result
+      }).catch(e => {
+        this.saveLoading = false
+      })
+    },
+    processEditFile(id) {
+      return new Promise((resolve, reject) => {
+        processEditFile({
+          id
+        }).then(res => {
+          if (res) {
+            const history = res;
+            resolve(history)
+          } else {
+            reject()
+          }
+        }).catch(e => {
+          reject(e)
+        })
+      })
+    },
+    /**
+     * @description: 流程入库
+     * @date
+     */
+    processCreateFsBuss(json) {
+      const _formData = new FormData()
+      _formData.append('infoJson', json)
+      processCreateFsBuss(_formData).then(res => {
+        if (res.result === '操作成功' || res.data === '入库成功') {
+          if(this.qbfsForm.standSort && this.qbfsForm.standSort.indexOf("Q/QCBFC") !== -1){
+            this.routerBussProStand()
+          }
+          if (this.$route.query.bpnId !== '') {
+            let taskId = {
+              id: this.$route.query.bpnId
+            }
+            taskDel(taskId).then(res=>{
+              return res
+            })
+          }
+          this.submitLoading = false
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+        } else {
+          this.isSubmit = false
+        }
+      })
+    },
+    async routerBussProStand(){
+      this.roleForm.bussUser3 = this.qbfsForm.QCRBUSSID
+      this.roleForm.bussUser3Name = this.qbfsForm.QCRBUSS
+      this.roleForm.bussUser6 = this.qbfsForm.QCRBUSSID
+      this.roleForm.bussUser6Name = this.qbfsForm.QCRBUSS
+      this.roleForm.applyUpdUserId = this.qbfsForm.QCRBUSSID
+      this.roleForm.applyUpdUserName = this.qbfsForm.QCRBUSS
+      this.roleForm.prcCreateUser = this.qbfsForm.QCRBUSSID
+      this.roleForm.prcCreateUserName = this.qbfsForm.QCRBUSS
+      this.formBuss.expirationDate = this.qbfsForm.expirationDate
+      this.formBuss.QCRBUSS = this.qbfsForm.QCRBUSS
+      this.formBuss.QCRBUSSID = this.qbfsForm.QCRBUSSID
+      this.formBuss.QCDW = this.qbfsForm.QCDW
+      this.formBuss.QCDWID = this.qbfsForm.QCDWID
+      let _formData = new FormData()
+      _formData.append('id', this.bpnId || '')
+      _formData.append('createUser', this.qbfsForm.QCRBUSSID)
+      _formData.append('createUserName', this.qbfsForm.QCRBUSS)
+      _formData.append('prcType', 'buss2')
+      _formData.append('prcName', '企标制修订-产品标准')
+      _formData.append('json', JSON.stringify({
+        taskInfo: '发起企标制修订流程',
+        form: this.formBuss,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }))
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false
+        this.$message.success('自动创建企标制修订-产品标准流程，跳转至主起草人流程中心草稿')
+        this.bpnId = res.result
+      }).catch(e => {
+      })
+    },
+    //流程提交
+    handleSubmit(){
+      this.getRule()
+      this.$refs['qbfsForm'].validate((valid) => {
+          if (valid) {
+            this.isSubmit = true
+            this.saveLoading = true
+            this.qbfsForm.commentText = this.commentText
+            let json = JSON.stringify(this.qbfsForm);
+            this.$http.post('lawss/activiti/completeTask', {
+              taskIds: this.$route.query.taskIds,
+              userId: this.$store.getters.userInfo.userId,
+              json: json,
+            }, {
+              _this: this
+            }, res => {
+              if (res.success) {
+                this.isSubmit = false
+                this.processCreateFsBuss(json)
+              }
+            }, e => {
+            });
+          }else {
+            this.$message.warning('请检查基础信息表单是否填写完整')
+          }
+      })
+    },
+    handleTransfer() {
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+    },
+    handle1(){
+      this.qbfsForm.approvalOpinion = 1
+      this.handleSubmit()
+    },
+    handle2(){
+      this.qbfsForm.approvalOpinion = 0
+      this.handleSubmit()
+    },
+    getRule(){
+      if (this.qbfsForm.approvalOpinion === 0) {
+        this.formRules.commentText[0].required = false;
+        this.$refs.qbfsForm.clearValidate('commentText')
+      }else {
+        this.formRules.commentText[0].required = true;
+      }
+    },
+    //确认转办
+    checkedRoles (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)
+      })
+    },
+    choiceZRRS() {
+      this.drawerTitle = '请选择企标复审人'
+      this.nodeList2 = [];
+      if (this.qbfsForm.bussFsSubUser2) {
+        this.nodeList2 = this.qbfsForm.bussFsSubUser2.split(",");
+      }
+      this.modalshowflag = true;
+    },
+    checkedRole(data) {
+      let idList = "";
+      let nameList = "";
+      data.forEach(item => {
+        if (nameList.length) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.$set(this.qbfsForm, 'jgUser', nameList)
+      this.$set(this.qbfsForm, 'jgUserId', idList)
+       if(this.qbfsForm.jgUser){
+         this.$refs.qbfsForm.validateField('jgUser')
+       }
+
+      this.$set(this.qbfsForm, 'bussFsSubUser2Name', nameList)
+      this.$set(this.qbfsForm, 'bussFsSubUser2', idList)
+       if(this.qbfsForm.bussFsSubUser2Name){
+         this.$refs.qbfsForm.validateField('bussFsSubUser2Name')
+       }
+    },
+    /**
+     * @Description: 点击下载
+     */
+    downloadFile(attId) {
+      if (attId != null && attId !== "") {
+        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      } else {
+        this.$message.error("请选择要下载的文件");
+      }
+    },
+    downloadFileByWater(attId, fileSuffix) {
+      let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
+      if (fileExtension !== "pdf" && fileExtension !== "PDF") {
+        this.$message.error("水印下载仅支持PDF,pdf格式文件");
+      } else {
+        if (attId != null && attId !== "") {
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+        } else {
+          this.$message.error("请选择要下载的文件");
+        }
+      }
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.qbfs-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .fileClass {
+    cursor: pointer;
+  }
+
+  .fileClass:hover {
+    color: #0c91e5;
+  }
+
+  p {
+    & > a {
+      cursor: pointer;
+    }
+
+    & > i {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+    }
+
+    .icon-download {
+      background-image: url("~assets/images/shangqi/img/download.png");
+    }
+
+    .icon-download2 {
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>

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

@@ -36,6 +36,12 @@
                            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-->

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

@@ -26,11 +26,13 @@
             <el-datePicker v-model="form.BARQ" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+            <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-->
@@ -98,6 +100,11 @@
               ></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"-->

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

@@ -35,6 +35,12 @@
             <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-->

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

@@ -49,9 +49,9 @@
                                                    value-format="yyyy-MM-dd"
                                     ></el-datePicker>
                                 </el-form-item>
-                                <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+                                <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.issueTime"
+                                    <el-datePicker v-model="form.expirationDate"
-                                                   placeholder="请选择发布日期"
+                                                   placeholder="请选择截止日期"
                                                    :editable="false"
                                     ></el-datePicker>
                                 </el-form-item>
@@ -148,6 +148,12 @@
                                         ></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"
+                                                   placeholder="请选择发布日期"
+                                                   :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"-->
 <!--                                                   :editable="false"-->
@@ -1293,6 +1299,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',
@@ -1418,6 +1425,9 @@
                     standSort: [
                         { required: true, message: '请选择企标类别', trigger: 'change' }
                     ],
+                    expirationDate: [
+                        {required: true, message: "请选择截止日期", trigger: "change"}
+                    ],
                     standStatus: [
                         { required: true, message: '请选择标准状态', trigger: 'change' }
                     ],
@@ -1949,6 +1959,7 @@
                     XGDName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -817,6 +817,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -818,6 +818,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -817,6 +817,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -840,6 +840,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -820,6 +820,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -884,6 +884,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -817,6 +817,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -915,6 +915,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -955,6 +955,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -838,6 +838,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -818,6 +818,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -818,6 +818,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -884,6 +884,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -955,6 +955,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

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

@@ -795,6 +795,7 @@
                     standEnName: '',
                     textStatusBuss: '',
                     issueTime: '',
+                    expirationDate: '',
                     putTime: '',
                     FZRQBUSS: '',
                     FSRQBUSS: '',

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -584,7 +584,18 @@
                                 @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
-
+                  <template v-else-if="field.attrField === 'DYBXH'">
+                    <el-form-item
+                      prop="DYBXH"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
+                                clearable
+                                @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                   prop="cycvppscn" class="add-form-item">

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -3374,7 +3374,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: 'OtherBussStandardDetails',
         params: {
-          id: item.standId,
+          id: item.id,
           pageType: 'BUSINESS_STAND'
         }
       })

src/router/index.js

@@ -2028,6 +2028,15 @@ const routes = [
               title: '企标复审流程'
           }
        },
+       {
+        path: '/bussFs3',
+          name: 'bussFs3',
+          component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step5.vue'),
+          meta: {
+              requireAuth: true,
+              title: '企标复审流程'
+          }
+       },
       //企标复审流程
       {
         path: '/qbfsStep1',
@@ -3555,6 +3564,17 @@ const routes = [
           menuId: 'PGPZXNUFEXC85BVPV9AU'
         }
       },
+      {
+        path: '/OperationLog',
+        name: 'OperationLog',
+        component: () =>
+            import('@/pages/config/pages/operationLog/index'),
+        meta: {
+          requireAuth: true,
+          title: '操作日志',
+          menuId: ''
+        }
+      },
       {
         path: '/processManage',
         name: 'ProcessManage',

src/sysConfig/index.js

@@ -18,7 +18,7 @@ const ssoLogout = 'http://sso.foton.com.cn/logout?service='
 // 配置 前端服务
 const devWebUrl = 'https://srms.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
-const webLoginType = 'idm'
+const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
 const onlyOfficeUrl = 'http://10.100.5.116:8088'