From fd2ee2a811d2e0a98dece4e1046478b1941f8a3f Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 4 Apr 2022 17:22:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug=20#5?=
 =?UTF-8?q?2275=20=E4=BB=A5=E5=8F=8A=E5=85=B6=E4=BB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbrk/step3.vue         |  12 +
 .../pages/creatProcess/zcrk/step1.vue         | 173 ++++++---
 .../pages/creatProcess/zcrk/step2.vue         | 188 ++++++----
 .../pages/creatProcess/zcrk/step3.vue         | 329 +++++++++++-------
 .../pages/creatProcess/zcrk/step5.vue         | 164 ++++++---
 5 files changed, 558 insertions(+), 308 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 3001f8bcc..f7c5fd19f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1188,6 +1188,18 @@
                     }
                 })
             },
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index b0981537f..e536e6a37 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -269,7 +269,7 @@
                                             clearable
                                     ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
+                                      <div style="width: 80%;margin-top: 13px">
                                           <div v-for="(item,index) in ZCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                       </div>
                                       <div style="width: 20%;">
@@ -279,7 +279,7 @@
                                                   size="mini"
                                                   @click="fileUpload('ZCWBLAWS')"
                                                   style="margin-left: 10px; margin-top: 11px; float: right;">
-                                              <i class="el-icon-upload el-icon--right"></i>
+                                              <i class="el-icon-upload"></i>
                                           </el-button>
                                       </div>
                                   </div>
@@ -292,7 +292,7 @@
                                     clearable
                                 ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
+                                      <div style="width: 80%;margin-top: 13px">
                                           <div v-for="(item,index) in JDWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                       </div>
                                       <div style="width: 20%;">
@@ -302,7 +302,7 @@
                                                   size="mini"
                                                   @click="fileUpload('JDWJLAWS')"
                                                   style="margin-left: 10px; margin-top: 11px; float: right;">
-                                              <i class="el-icon-upload el-icon--right"></i>
+                                              <i class="el-icon-upload"></i>
                                           </el-button>
                                       </div>
                                   </div>
@@ -317,7 +317,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in GCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -327,7 +327,7 @@
                                                     size="mini"
                                                     @click="fileUpload('GCWBLAWS')"
                                                     style="margin-left: 10px; margin-top: 11px; float: right;">
-                                                <i class="el-icon-upload el-icon--right"></i>
+                                                <i class="el-icon-upload"></i>
                                             </el-button>
                                         </div>
                                     </div>
@@ -457,7 +457,7 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
+                                        <div style="width: 80%;margin-top: 13px">
                                             <div v-for="(item,index) in GLWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
                                         </div>
                                         <div style="width: 20%;">
@@ -467,7 +467,7 @@
                                                     size="mini"
                                                     @click="fileUpload('GLWJLAWS')"
                                                     style="margin-left: 10px; margin-top: 11px; float: right;">
-                                                <i class="el-icon-upload el-icon--right"></i>
+                                                <i class="el-icon-upload"></i>
                                             </el-button>
                                         </div>
                                     </div>
@@ -905,7 +905,8 @@
                         @click="handleProcessStandardNext(3)">取消</el-button>
             </div>
         </el-drawer>
-    </div>
+    <loading :loading="dataLoading">正在加载数据</loading>
+</div>
 </template>
 
 <script>
@@ -975,6 +976,7 @@
                       }
                   }]
               },
+              dataLoading:false,
               fileList: [],
               caFileList: [],
               FBGBJBDFileList: [],
@@ -1429,17 +1431,38 @@
                     let mes = JSON.parse(res.mes)
                     mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                     this.form = mes.form
+                    let dateArr = []
+                    if(mes.commentCycleStart && mes.commentCycleEnd){
+                        dateArr[0] = mes.commentCycleStart
+                        dateArr[1] = mes.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
                     this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy'])
                     this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx'])
                     this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel'])
                     this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
                     this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
                     this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
+                    this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName);
+                    this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName);
+                    this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName);
+                    this.GLWJLAWSFileList=this.assemble(this.form.GLWJLAWS,this.form.GLWJLAWSName);
                     this.roleForm = mes.roleForm
                     this.commentText = mes.commentText
                 })
             }
           },
+            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;
+            },
             filterObj(obj){
                 if(obj && obj !== ''){
                     if(obj instanceof Array){
@@ -2162,31 +2185,36 @@
             },
             //保存
             handleSave() {
-              this.form.country=this.countryArr;
+              // this.form.country=this.countryArr;
               // if(item.country !== undefined && item.country !== null){
               //   this.sarStandardsInfoEO.country = item.country.split(",");
               // }
 
                 this.isSubmit = true
                 this.saveLoading = true
+                let startDate = ""
+                let endDate = ""
+                if(this.commentCycleDate && this.commentCycleDate.length > 0){
+                    startDate = this.commentCycleDate[0]
+                    endDate = this.commentCycleDate[1]
+                }else {
+                    startDate = ''
+                    endDate = ''
+                }
                 this.fileInfoHandle()
                 let _formData = new FormData()
-                // _formData.append('id', this.bpnId)
+                _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'laws1')
                 _formData.append('prcName', '政策入库流程')
                 _formData.append('json', JSON.stringify({
-                    // prcForm: this.prcForm,
-                    // sarAccessInfoList: this.sarAccessInfoList,
-                    // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-                    // bzqdForm: this.bzqdForm,
-                    // listInfo: this.listInfo,
-                    // id: this.id
                   taskInfo: '申请人发起',
                   form: this.form,
                   roleForm: this.roleForm,
-                  commentText: this.commentText
+                  commentText: this.commentText,
+                  commentCycleStart: startDate,
+                  commentCycleEnd: endDate,
                 }))
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
@@ -2230,9 +2258,20 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: 'laws1'}, {
-                                    _this: this
-                                }, res => {
+                                if(this.commentCycleDate && this.commentCycleDate.length > 0){
+                                    json.commentCycleStart = this.commentCycleDate[0]
+                                    json.commentCycleEnd = this.commentCycleDate[1]
+                                }
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
+                                    createUser: this.$store.getters.userInfo.userId,
+                                    createUserName: this.$store.getters.userInfo.userName,
+                                    type: 'laws1',
+                                    json: JSON.stringify({
+                                        form: this.form,
+                                        roleForm: this.roleForm,
+                                        commentText: this.commentText
+                                    })
+                                }, {}, res => {
                                     if (res.ok) {
                                         this.$http.post('lawss/activiti/completeTask', {
                                             taskIds: res.data,
@@ -2292,44 +2331,63 @@
                     this.modelOptions = res.data
                 })
             },
+            getDicTypeListCode(res,json) {
+                return new Promise((resolve, reject) => {
+                    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                        _this: this
+                    }, res => {
+                        const history = res;
+                        resolve(history)
+                    })
+                })
+            },
+            async getDataAsync(){
+                if(this.$route.query.bpnId) {
+                    this.dataLoading = true
+                }
+                let res = await this.getDicTypeListCode()
+                if(res && res.data){
+
+                    this.countryOptions=res.data.COUNTRY//国家地区
+                    this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+                    this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                    this.standStateOptions = res.data.WBZTCLASS // 文本状态
+                    this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+                    this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                    this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                    this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                    this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                    this.wssmrOptions = res.data.WSSMR // 我司署名人
+                    this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                    this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                    this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                    this.qcdwOption = res.data.QCDW // 体系类别
+                    this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                    this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+                    this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                    this.lawsTypeOptions = res.data.lawsType
+                    this.lawsTextStateOptions = res.data.lawsTextState
+                    this.lawsSyqyOptions = res.data.lawsSyqy
+                    this.lawsSycxOptions = res.data.lawsSycx
+                    this.lawsYearOptions = res.data.lawsYear
+                    this.lawsLabelOptions = res.data.lawsLabel
+                    this.CYSDLAWSOptions = res.data.CYSDLAWS
+                    this.TGRLAWSOptions = res.data.TGRLAWS
+                    this.TGDWLAWSOptions = res.data.TGDWLAWS
+                    this.NYLXLAWSOptions = res.data.NYLXLAWS
+                    this.YYRZLAWSOptions = res.data.YYRZLAWS
+                    this.ZRBMLAWSOptions = res.data.ZRBMLAWS
+                    this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
+
+                    this.dataLoading = false
+
+                }
+            },
         },
         mounted () {
+          this.getDataAsync()
           this.getTaskId()
-            this.getTree()
-            this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                _this: this
-            }, res => {
-                this.countryOptions=res.data.COUNTRY//国家地区
-                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-                this.standStateOptions = res.data.WBZTCLASS // 文本状态
-                this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-                this.categoryOptions = res.data.NYLXCLASS // 能源类型
-                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-                this.cysdOptions = res.data.WSCYSD // 我司参与深度
-                this.wssmrOptions = res.data.WSSMR // 我司署名人
-                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-                this.qcdwOption = res.data.QCDW // 体系类别
-                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-                this.txlbOptions = res.data.TXLBCLASS // 体系类别
-                this.lawsTypeOptions = res.data.lawsType
-                this.lawsTextStateOptions = res.data.lawsTextState
-                this.lawsSyqyOptions = res.data.lawsSyqy
-                this.lawsSycxOptions = res.data.lawsSycx
-                this.lawsYearOptions = res.data.lawsYear
-                this.lawsLabelOptions = res.data.lawsLabel
-                this.CYSDLAWSOptions = res.data.CYSDLAWS
-                this.TGRLAWSOptions = res.data.TGRLAWS
-                this.TGDWLAWSOptions = res.data.TGDWLAWS
-                this.NYLXLAWSOptions = res.data.NYLXLAWS
-                this.YYRZLAWSOptions = res.data.YYRZLAWS
-                this.ZRBMLAWSOptions = res.data.ZRBMLAWS
-                this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
-            })
+
         }
 
     }
@@ -2337,6 +2395,9 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
     .bzrkStep1 {
         /deep/.el-drawer__container {
             .prc-content-border {
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
index 47838b19b..ab23f320e 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
@@ -51,7 +51,9 @@
                                     <el-date-picker
                                             v-model="commentCycleDate"
                                             disabled
-                                            type="datetimerange"
+                                            type="daterange"
+                                            align="right"
+                                            unlink-panels
                                             range-separator="至"
                                             start-placeholder="开始日期"
                                             end-placeholder="结束日期"
@@ -243,31 +245,30 @@
                       <el-row :gutter="24">
                         <el-col :span="12">
                           <el-form-item label="政策文本" prop="ZCWBLAWSName" class="add-form-item form-item-disabled">
-                            <div  v-if="ZCWBLAWSFileMap.length>0" v-for="(value,index)  in this.ZCWBLAWSFileMap" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile('ZCWBLAWS',value.id)">
-                              <!-- {{ value.name }} -->
-                              {{value.name}}
-                            </div>
-                            <div v-else>
-                              - -
+                              <div v-if="ZCWBLAWSFileMap.length > 0" v-for="(item,index) in ZCWBLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                 </span>
                             </div>
                           </el-form-item>
                           <el-form-item label="解读文件" prop="JDWJLAWSName" class="add-form-item form-item-disabled">
-                            <div v-if="JDWJLAWSFileMap.length>0" v-for="(value,index)  in this.JDWJLAWSFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('JDWJLAWS',value.id)">
-                              {{value.name}}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
+                              <div v-if="JDWJLAWSFileMap.length > 0" v-for="(item,index) in JDWJLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                 </span>
+                              </div>
                           </el-form-item>
                         </el-col>
                         <el-col :span="12">
                           <el-form-item label="过程文本" prop="GCWBLAWSName" class="add-form-item form-item-disabled">
-                            <div v-if="GCWBLAWSFileMap.length>0" v-for="(value,index)  in this.GCWBLAWSFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('GCWBLAWS',value.id)">
-                              {{value.name}}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
+                              <div v-if="GCWBLAWSFileMap.length > 0" v-for="(item,index) in GCWBLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                  <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                 </span>
+                              </div>
                           </el-form-item>
                         </el-col>
                       </el-row>
@@ -380,12 +381,12 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="GLWJLAWSFileMap.length>0" v-for="(value,index)  in this.GLWJLAWSFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('GLWJLAWS',value.id)">
-                                        {{value.name}}
-                                    </div>
-                                    <div v-else>
-                                        - -
+                                <el-form-item label="关联文件" prop="GLWJLAWSName" class="add-form-item form-item-disabled">
+                                    <div v-if="GLWJLAWSFileMap.length > 0" v-for="(item,index) in GLWJLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                        <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                        <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                            <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                        </span>
                                     </div>
                                 </el-form-item>
                             </el-col>
@@ -560,6 +561,7 @@
                 @checkedRole="checkedRole"
                 :nodeList="nodeList"
         ></Role-tree>
+        <loading :loading="dataLoading">正在加载数据</loading>
     </div>
 </template>
 
@@ -575,6 +577,7 @@
         data () {
             return {
                 loading: false,
+                dataLoading: true,
               xgdFileMap: [],
               fbgbjbdFileMap: [],
               bpgFileMap: [],
@@ -861,6 +864,25 @@
                     }
                 })
             },
+            // 文件预览及下载
+            handleFilePreview(file) {
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
+
+                if (this.preview) {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
             downloadFile (fileType) {
                 //文件id中出现了','字符,去除掉
                 if(fileType === 'ZCWBLAWS'){
@@ -937,14 +959,15 @@
                 }, e => {})
             },
           assemble(ids,names){
-            let list= new Array();
-            let idArray=ids.split(',');
-            let nameArray=names.split(',');
-            for(var i=0;i<idArray.length;i++){
-              list.push({id:idArray[i],name:nameArray[i]});
-            }
-
-            return list;
+              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;
           },
             getData() {
                 return new Promise((resolve, reject) => {
@@ -960,7 +983,6 @@
                                 dateArr[1] = processForm.commentCycleEnd
                                 this.commentCycleDate = dateArr
                             }
-                          console.log("processFrom",processForm)
                             this.ZCWBLAWSFileId = processForm.ZCWBLAWS
                             this.GCWBLAWSFileId = processForm.GCWBLAWS
                             this.JDWJLAWSFileId = processForm.JDWJLAWS
@@ -992,9 +1014,6 @@
                     this.defaultCheckedKeys3 = [this.form.dybxh]
                     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
                     this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
-                    if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
-                        this.form.country=this.form.country.split(",");
-                    }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -1044,7 +1063,8 @@
                 }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        // this.isSubmit = true
+                        this.isSubmit = true
+                        this.saveLoading = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         const json = JSON.stringify(this.form);
@@ -1059,6 +1079,7 @@
                                 if(this.formTongGuo.approvalOpinion === 1){
                                     this.$message.warning("驳回成功")
                                     this.isSubmit = false
+                                    this.saveLoading = false
                                     // 流程提交之后，应该流转至待办任务页面
                                     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                 }else{
@@ -1092,55 +1113,72 @@
                     }
                 })
             },
+            getDicTypeListCode(res,json) {
+                return new Promise((resolve, reject) => {
+                    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                        _this: this
+                    }, res => {
+                        const history = res;
+                        resolve(history)
+                    })
+                })
+            },
+            async getDataAsync(){
+                let res = await this.getDicTypeListCode()
+                if(res && res.data){
+
+                    this.countryOptions=res.data.COUNTRY//国家地区
+                    this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+                    this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                    this.standStateOptions = res.data.WBZTCLASS // 文本状态
+                    this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+                    this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                    this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                    this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                    this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                    this.wssmrOptions = res.data.WSSMR // 我司署名人
+                    this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                    this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                    this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                    this.qcdwOption = res.data.QCDW // 体系类别
+                    this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                    this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+                    this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                    this.lawsTypeOptions = res.data.lawsType
+                    this.lawsTextStateOptions = res.data.lawsTextState
+                    this.lawsSyqyOptions = res.data.lawsSyqy
+                    this.lawsSycxOptions = res.data.lawsSycx
+                    this.lawsYearOptions = res.data.lawsYear
+                    this.lawsLabelOptions = res.data.lawsLabel
+                    this.CYSDLAWSOptions = res.data.CYSDLAWS
+                    this.TGRLAWSOptions = res.data.TGRLAWS
+                    this.TGDWLAWSOptions = res.data.TGDWLAWS
+                    this.NYLXLAWSOptions = res.data.NYLXLAWS
+                    this.YYRZLAWSOptions = res.data.YYRZLAWS
+                    this.ZRBMLAWSOptions = res.data.ZRBMLAWS
+                    this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
+                    this.key++
+
+                    this.dataLoading = false
+
+                }
+            },
         },
         created(){
         },
         mounted () {
+            this.getDataAsync()
             this.getData()
             this.processTable()
-            this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                _this: this
-            }, res => {
-                this.countryOptions=res.data.COUNTRY//国家地区
-                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-                this.standStateOptions = res.data.WBZTCLASS // 文本状态
-                this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-                this.categoryOptions = res.data.NYLXCLASS // 能源类型
-                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-                this.cysdOptions = res.data.WSCYSD // 我司参与深度
-                this.wssmrOptions = res.data.WSSMR // 我司署名人
-                this.qcdwOptions = res.data.QCDW // 起草单位
-                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-                this.txlbOptions = res.data.TXLBCLASS // 体系类别
-                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-                this.lawsTypeOptions = res.data.lawsType
-                this.lawsTextStateOptions = res.data.lawsTextState
-                this.lawsSyqyOptions = res.data.lawsSyqy
-                this.lawsSycxOptions = res.data.lawsSycx
-                this.lawsYearOptions = res.data.lawsYear
-                this.lawsLabelOptions = res.data.lawsLabel
-                this.CYSDLAWSOptions = res.data.CYSDLAWS
-                this.TGRLAWSOptions = res.data.TGRLAWS
-                this.TGDWLAWSOptions = res.data.TGDWLAWS
-                this.NYLXLAWSOptions = res.data.NYLXLAWS
-                this.YYRZLAWSOptions = res.data.YYRZLAWS
-                this.ZRBMLAWSOptions = res.data.ZRBMLAWS
-                this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
-                this.key++
-            })
-            this.busVsFunc()
-            this.modelFunc()
         }
     }
 </script>
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
     .bzrkStep2 {
         /deep/.el-drawer__container {
             .prc-content-border {
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
index 1e40e7093..56f7b2a68 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
@@ -63,8 +63,9 @@
                                 <el-form-item v-show="verifySarStandard" label="征集意见周期" prop="commentCycleDate" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="commentCycleDate"
-                                            type="datetimerange"
-                                            :picker-options="pickerOptions"
+                                            type="daterange"
+                                            align="right"
+                                            unlink-panels
                                             range-separator="至"
                                             start-placeholder="开始日期"
                                             end-placeholder="结束日期"
@@ -267,8 +268,13 @@
                                             clearable
                                     ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
-                                          <div v-for="(item,index) in ZCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                      <div style="width: 80%;margin-top: 13px">
+                                          <div v-for="(item,index) in ZCWBLAWSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                                              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                              </span>
+                                          </div>
                                       </div>
                                       <div style="width: 20%;">
                                           <el-button
@@ -290,8 +296,13 @@
                                     clearable
                                 ></el-input>
                                   <div style="display: flex;justify-content: space-between">
-                                      <div style="width: 80%;">
-                                          <div v-for="(item,index) in JDWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                      <div style="width: 80%;margin-top: 13px">
+                                          <div v-for="(item,index) in JDWJLAWSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                                              <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                              </span>
+                                          </div>
                                       </div>
                                       <div style="width: 20%;">
                                           <el-button
@@ -315,8 +326,13 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
-                                            <div v-for="(item,index) in GCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                        <div style="width: 80%;margin-top: 13px">
+                                            <div v-for="(item,index) in GCWBLAWSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                                                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                              </span>
+                                            </div>
                                         </div>
                                         <div style="width: 20%;">
                                             <el-button
@@ -492,8 +508,13 @@
                                             clearable
                                     ></el-input>
                                     <div style="display: flex;justify-content: space-between">
-                                        <div style="width: 80%;">
-                                            <div v-for="(item,index) in GCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                        <div style="width: 80%;margin-top: 13px">
+                                            <div v-for="(item,index) in GCWBLAWSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                                <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
+                                                <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                              </span>
+                                            </div>
                                         </div>
                                         <div style="width: 20%;">
                                             <el-button
@@ -599,6 +620,8 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
         >
@@ -738,6 +761,14 @@
                 @checkedRole="checkedRole"
                 :nodeList="nodeList"
         ></Role-tree>
+        <!-- 福田全公司转办选人解决方案 -->
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRoleTransfer"
+                :nodeList="nodeList"
+        ></Role-tree>
 <!--        <el-drawer-->
 <!--                :title="drawerTitle"-->
 <!--                :visible.sync="modalShowFlag"-->
@@ -918,14 +949,15 @@
                         @click="handleProcessStandardNext(3)">取消</el-button>
             </div>
         </el-drawer>
-    </div>
+    <loading :loading="dataLoading">正在加载数据</loading>
+</div>
 </template>
 
 <script>
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,saveTaskFirst, queryTaskFirst} from "api/process";
+    import {inboundLiaisonDetail,saveTaskFirst, queryTaskFirst,changeAssigneeNew,saveTaskForPub} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
@@ -988,6 +1020,7 @@
                   }]
               },
               loading: false,
+              dataLoading: true,
               userId:this.$store.getters.userInfo.userId,
               taskIds: this.$route.query.taskIds,
               pId: this.$route.query.prcId,
@@ -1108,6 +1141,7 @@
                 modalShowFlag4: false, // drawer开关
                 url:'',
                 urlChild:'',
+                drawerModal:false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1430,6 +1464,17 @@
                     this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
                     this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
                     this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
+                    const dateArr = []
+                    if(this.form.commentCycleStart && this.form.commentCycleEnd){
+                        dateArr[0] = this.form.commentCycleStart
+                        dateArr[1] = this.form.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName);
+                    this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName);
+                    this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName);
+                    this.GLWJLAWSFileList=this.assemble(this.form.GLWJLAWS,this.form.GLWJLAWSName);
                 })
             },
             filterObj(obj){
@@ -1451,19 +1496,13 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
-                                    dateArr[0] = processForm.commentCycleStart
-                                    dateArr[1] = processForm.commentCycleEnd
-                                    this.commentCycleDate = dateArr
+                                if (processForm.form === undefined) {
+                                    this.getFormFieldList(processForm)
+                                } else {
+                                    //表单文件处理
+                                    this.getTaskId(processForm)
                                 }
 
-                                this.getFormFieldList(processForm)
-
-                                this.ZCWBLAWSFileList=this.assemble(processForm.ZCWBLAWS,processForm.ZCWBLAWSName);
-                                this.GCWBLAWSFileList=this.assemble(processForm.GCWBLAWS,processForm.GCWBLAWSName);
-                                this.JDWJLAWSFileList=this.assemble(processForm.JDWJLAWS,processForm.JDWJLAWSName);
-                                this.GLWJLAWSFileList=this.assemble(processForm.GLWJLAWS,processForm.GLWJLAWSName);
                             }
                         }).catch(e => {
                         })
@@ -1482,39 +1521,16 @@
                 return list;
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy'])
-                            this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx'])
-                            this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel'])
-                            this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
-                            this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
-                            this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                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 => {
                 })
             },
             // choiceZRRS () {
@@ -1546,25 +1562,66 @@
 
 
             },
+            checkedRoleTransfer (data) {
+                this.isSubmit = true
+                this.saveLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.isSubmit = false
+                    this.saveLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.$router.push({path:'/processCenter?tabsName=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 => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
           // z责任人会签姓名搜索
           filterNode(value, data) {
             if (!value) return true;
             return data.name.indexOf(value) !== -1;
           },
-          getTaskId () {
-            if(this.bpnId){
-                return new Promise((resolve, reject) => {
-                    queryTaskFirst({
-                        bpnId: this.bpnId
-                    }).then(res => {
-                        this.verifySarStandard = this.$route.query.verifySarStandard
-                        resolve(res || [])
-                    }, e => {
-                        reject(e)
-                    })
-                })
-            }
-          },
+          getTaskId (mesg) {
+              this.form = mesg.form
+              this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
+              let dateArr = []
+              if(mesg.commentCycleStart && mesg.commentCycleEnd){
+                  dateArr[0] = mesg.commentCycleStart
+                  dateArr[1] = mesg.commentCycleEnd
+                  this.commentCycleDate = dateArr
+              }
+              this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy'])
+              this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx'])
+              this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel'])
+              this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
+              this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
+              this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
+              this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName);
+              this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName);
+              this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName);
+              this.GLWJLAWSFileList=this.assemble(this.form.GLWJLAWS,this.form.GLWJLAWSName);
+              this.roleForm = mesg.roleForm
+              this.commentText = mesg.commentText
+            },
           // 将文本状态的id与name对应
           setMap(data){
             data.forEach(item => {
@@ -2278,6 +2335,10 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
               this.form.country=this.countryArr;
@@ -2288,30 +2349,32 @@
                 this.saveLoading = true
                 this.isSubmit = true
                 this.fileInfoHandle()
+                let startDate = ""
+                let endDate = ""
+                if(this.commentCycleDate && this.commentCycleDate.length > 0){
+                    startDate = this.commentCycleDate[0]
+                    endDate = this.commentCycleDate[1]
+                }else {
+                    startDate = ''
+                    endDate = ''
+                }
                 let _formData = new FormData()
-                // _formData.append('id', this.bpnId)
+                _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'laws1')
                 _formData.append('prcName', '政策入库流程')
                 _formData.append('json', JSON.stringify({
-                    // prcForm: this.prcForm,
-                    // sarAccessInfoList: this.sarAccessInfoList,
-                    // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-                    // bzqdForm: this.bzqdForm,
-                    // listInfo: this.listInfo,
-                    // id: this.id
-                    userId:this.userId,
-                    taskIds: this.taskIds,
-                    pId: this.pId,
-                    prcNum: this.prcNum,
-                    prcName: this.prcName,
-                  taskInfo: '申请人重新发起',
-                  form: this.form,
-                  roleForm: this.roleForm,
-                  commentText: this.commentText
+                    prcNum:this.prcNum,
+                    taskInfo: this.taskInfo,
+                    form: this.form,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText,
+                    commentCycleStart: startDate,
+                    commentCycleEnd: endDate,
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.isSubmit = false
                     this.saveLoading = false
                     this.$message.success('保存成功')
@@ -2353,6 +2416,10 @@
                         json.applyUpdUserId = this.form.applyUpdUserId
                         json.prcCreateUser = this.form.prcCreateUser
                         json.prcCreateUserName = this.form.prcCreateUserName
+                        if(this.commentCycleDate && this.commentCycleDate.length > 0){
+                            json.commentCycleStart = this.commentCycleDate[0]
+                            json.commentCycleEnd = this.commentCycleDate[1]
+                        }
 
                         this.$http.post('lawss/activiti/completeTask', {
                             taskIds: this.taskIds,
@@ -2398,45 +2465,60 @@
                     this.modelOptions = res.data
                 })
             },
+            getDicTypeListCode(res,json) {
+                return new Promise((resolve, reject) => {
+                    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                        _this: this
+                    }, res => {
+                        const history = res;
+                        resolve(history)
+                    })
+                })
+            },
+            async getDataAsync(){
+                let res = await this.getDicTypeListCode()
+                if(res && res.data){
+
+                    this.countryOptions=res.data.COUNTRY//国家地区
+                    this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+                    this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                    this.standStateOptions = res.data.WBZTCLASS // 文本状态
+                    this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+                    this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                    this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                    this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                    this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                    this.wssmrOptions = res.data.WSSMR // 我司署名人
+                    this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                    this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                    this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                    this.qcdwOption = res.data.QCDW // 体系类别
+                    this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                    this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+                    this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                    this.lawsTypeOptions = res.data.lawsType
+                    this.lawsTextStateOptions = res.data.lawsTextState
+                    this.lawsSyqyOptions = res.data.lawsSyqy
+                    this.lawsSycxOptions = res.data.lawsSycx
+                    this.lawsYearOptions = res.data.lawsYear
+                    this.lawsLabelOptions = res.data.lawsLabel
+                    this.CYSDLAWSOptions = res.data.CYSDLAWS
+                    this.TGRLAWSOptions = res.data.TGRLAWS
+                    this.TGDWLAWSOptions = res.data.TGDWLAWS
+                    this.NYLXLAWSOptions = res.data.NYLXLAWS
+                    this.YYRZLAWSOptions = res.data.YYRZLAWS
+                    this.ZRBMLAWSOptions = res.data.ZRBMLAWS
+                    this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
+
+                    this.dataLoading = false
+
+                }
+            },
         },
         mounted () {
+            this.getDataAsync()
             this.getData()
             this.processTable()
-            this.getTree()
-            this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                _this: this
-            }, res => {
-                this.countryOptions=res.data.COUNTRY//国家地区
-                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-                this.standStateOptions = res.data.WBZTCLASS // 文本状态
-                this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-                this.categoryOptions = res.data.NYLXCLASS // 能源类型
-                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-                this.cysdOptions = res.data.WSCYSD // 我司参与深度
-                this.wssmrOptions = res.data.WSSMR // 我司署名人
-                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-                this.qcdwOption = res.data.QCDW // 体系类别
-                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-                this.txlbOptions = res.data.TXLBCLASS // 体系类别
-                this.lawsTypeOptions = res.data.lawsType
-                this.lawsTextStateOptions = res.data.lawsTextState
-                this.lawsSyqyOptions = res.data.lawsSyqy
-                this.lawsSycxOptions = res.data.lawsSycx
-                this.lawsYearOptions = res.data.lawsYear
-                this.lawsLabelOptions = res.data.lawsLabel
-                this.CYSDLAWSOptions = res.data.CYSDLAWS
-                this.TGRLAWSOptions = res.data.TGRLAWS
-                this.TGDWLAWSOptions = res.data.TGDWLAWS
-                this.NYLXLAWSOptions = res.data.NYLXLAWS
-                this.YYRZLAWSOptions = res.data.YYRZLAWS
-                this.ZRBMLAWSOptions = res.data.ZRBMLAWS
-                this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
-            })
         }
 
     }
@@ -2444,6 +2526,9 @@
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
     .bzrkStep1 {
         /deep/.el-drawer__container {
             .prc-content-border {
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
index 5b317a525..378d68fc9 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
@@ -51,7 +51,9 @@
                                     <el-date-picker
                                             v-model="commentCycleDate"
                                             disabled
-                                            type="datetimerange"
+                                            type="daterange"
+                                            align="right"
+                                            unlink-panels
                                             range-separator="至"
                                             start-placeholder="开始日期"
                                             end-placeholder="结束日期"
@@ -243,30 +245,29 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '0'" label="政策文本" prop="ZCWBLAWSName" class="add-form-item form-item-disabled">
-                                    <div  v-if="ZCWBLAWSFileMap.length>0" v-for="(value,index)  in this.ZCWBLAWSFileMap" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile('ZCWBLAWS',value.id)">
-                                        <!-- {{ value.name }} -->
-                                        {{value.name}}
-                                    </div>
-                                    <div v-else>
-                                        - -
+                                    <div v-if="ZCWBLAWSFileMap.length > 0" v-for="(item,index) in ZCWBLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                        <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                        <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                            <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                        </span>
                                     </div>
                                 </el-form-item>
                                 <el-form-item label="解读文件" prop="JDWJLAWSName" class="add-form-item form-item-disabled">
-                                    <div v-if="JDWJLAWSFileMap.length>0" v-for="(value,index)  in this.JDWJLAWSFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('JDWJLAWS',value.id)">
-                                        {{value.name}}
-                                    </div>
-                                    <div v-else>
-                                        - -
+                                    <div v-if="JDWJLAWSFileMap.length > 0" v-for="(item,index) in JDWJLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                        <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                        <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                            <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                        </span>
                                     </div>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '1'" label="过程文本" prop="GCWBLAWSName" class="add-form-item form-item-disabled">
-                                    <div v-if="GCWBLAWSFileMap.length>0" v-for="(value,index)  in this.GCWBLAWSFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('GCWBLAWS',value.id)">
-                                        {{value.name}}
-                                    </div>
-                                    <div v-else>
-                                        - -
+                                    <div v-if="GCWBLAWSFileMap.length > 0" v-for="(item,index) in GCWBLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                        <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                        <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                            <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                        </span>
                                     </div>
                                 </el-form-item>
                             </el-col>
@@ -387,11 +388,11 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="GLWJLAWSFileMap.length>0" v-for="(value,index)  in this.GLWJLAWSFileMap" :key="index"  style="cursor: pointer;color: #00b7ee" @click="downloadFile('GLWJLAWS',value.id)">
-                                        {{value.name}}
-                                    </div>
-                                    <div v-else>
-                                        - -
+                                    <div v-if="GLWJLAWSFileMap.length > 0" v-for="(item,index) in GLWJLAWSFileMap" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
+                                        <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
+                                        <span style="margin-left: 7px;" v-if="item.id !== ''">
+                                            <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
+                                        </span>
                                     </div>
                                 </el-form-item>
                             </el-col>
@@ -540,6 +541,7 @@
 <!--                @submit="handleSubmit"-->
 <!--        >-->
 <!--        </ProcessFooter>-->
+        <loading :loading="dataLoading">正在加载数据</loading>
     </div>
 </template>
 
@@ -554,6 +556,7 @@
         name: "zcrkStep5",
         data () {
             return {
+                dataLoading: true,
               xgdFileId: '',
               fbgbjbdFileId: '',
               bpgFileId: '',
@@ -709,6 +712,25 @@
         },
       },
         methods: {
+            // 文件预览及下载
+            handleFilePreview(file) {
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
+
+                if (this.preview) {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
           downloadFile (fileType) {
               if(fileType === 'ZCWBLAWS'){
                   window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.ZCWBLAWSFileId
@@ -787,6 +809,17 @@
                     })
                 })
             },
+            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;
+            },
             /**
              * @description: 动态表单读取
              */
@@ -860,48 +893,69 @@
                     }
                 })
             },
+            getDicTypeListCode(res,json) {
+                return new Promise((resolve, reject) => {
+                    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                        _this: this
+                    }, res => {
+                        const history = res;
+                        resolve(history)
+                    })
+                })
+            },
+            async getDataAsync() {
+                let res = await this.getDicTypeListCode()
+                if (res && res.data) {
+
+                    this.countryOptions = res.data.COUNTRY//国家地区
+                    this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+                    this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                    this.standStateOptions = res.data.WBZTCLASS // 文本状态
+                    this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+                    this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                    this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                    this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                    this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                    this.wssmrOptions = res.data.WSSMR // 我司署名人
+                    this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                    this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                    this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                    this.qcdwOption = res.data.QCDW // 体系类别
+                    this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                    this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+                    this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                    this.lawsTypeOptions = res.data.lawsType
+                    this.lawsTextStateOptions = res.data.lawsTextState
+                    this.lawsSyqyOptions = res.data.lawsSyqy
+                    this.lawsSycxOptions = res.data.lawsSycx
+                    this.lawsYearOptions = res.data.lawsYear
+                    this.lawsLabelOptions = res.data.lawsLabel
+                    this.CYSDLAWSOptions = res.data.CYSDLAWS
+                    this.TGRLAWSOptions = res.data.TGRLAWS
+                    this.TGDWLAWSOptions = res.data.TGDWLAWS
+                    this.NYLXLAWSOptions = res.data.NYLXLAWS
+                    this.YYRZLAWSOptions = res.data.YYRZLAWS
+                    this.ZRBMLAWSOptions = res.data.ZRBMLAWS
+                    this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
+                    this.key++
+
+                    this.dataLoading = false
+
+                }
+            },
         },
         mounted () {
+            this.getDataAsync()
             this.getData()
-          this.processTable()
-            this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                _this: this
-            }, res => {
-                this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-                this.standStateOptions = res.data.WBZTCLASS // 文本状态
-                this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-                this.categoryOptions = res.data.NYLXCLASS // 能源类型
-                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-                this.cysdOptions = res.data.WSCYSD // 我司参与深度
-                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-                this.txlbOptions = res.data.TXLBCLASS // 体系类别
-                this.qcdwOption = res.data.QCDW // 体系类别
-                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-                this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-                this.lawsTypeOptions = res.data.lawsType
-                this.lawsTextStateOptions = res.data.lawsTextState
-                this.lawsSyqyOptions = res.data.lawsSyqy
-                this.lawsSycxOptions = res.data.lawsSycx
-                this.lawsYearOptions = res.data.lawsYear
-                this.lawsLabelOptions = res.data.lawsLabel
-                this.CYSDLAWSOptions = res.data.CYSDLAWS
-                this.TGRLAWSOptions = res.data.TGRLAWS
-                this.TGDWLAWSOptions = res.data.TGDWLAWS
-                this.NYLXLAWSOptions = res.data.NYLXLAWS
-                this.YYRZLAWSOptions = res.data.YYRZLAWS
-                this.ZRBMLAWSOptions = res.data.ZRBMLAWS
-                this.ZRGCSLAWSOptions = res.data.ZRGCSLAWS
-            })
         }
     }
 </script>
 
 <style lang="less" scoped>
     @import '~@/assets/styles/style';
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
     .bzrkStep2 {
         /deep/.el-drawer__container {
             .prc-content-border {