Merge branch 'develop' into FOTON

src/main.js

@@ -72,8 +72,12 @@ router.beforeEach(function (to, from, next) {
   let prcName = to.query.prcName;
   let prcType = to.query.prcType;
   let routerType = to.query.routerType;
+  let unShowReceipt = to.query.unShowReceipt;
   let param = "taskIds=" + taskId + "&prcId=" + prcId
       + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
+  if (unShowReceipt) {
+    param += "&unShowReceipt=" + unShowReceipt
+  }
   let param4 = {
     path: path,
     token: token,

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

@@ -535,6 +535,11 @@ export default {
               message: '删除成功!'
             });
             this.getTree()
+          } else if(!res.ok) {
+            this.$message({
+              type: 'warning',
+              message: res.message
+            });
           }
         })
       }).catch(() => {

src/pages/details/otherBussStandardDetails/index.vue

@@ -354,9 +354,10 @@
                     <p class=""><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
                     <template v-for="(child, childIndex) in item.child1">
                       <div class="files-title" style="border-bottom: 1px solid #E5E5E5">
-                        <label style="float: left;">{{ child.attrName }}</label>
+                        <label style="float: left;min-height: 43px;line-height: 43px;">{{ child.attrName }}</label>
-                        <div style="margin-left: 220px;">
+                        <template style="margin-left: 220px;">
-                          <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="line-height: 50px;">
+                          <div style="position: relative;margin-left: 214px;">
+                            <div v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex">
                             <!--                          单个文件-->
                             <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 | ellipsis50 }}</a>
@@ -409,7 +410,8 @@
                             <!--                          <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>-->
                           </div>
-                        </div>
+                          </div>
+                        </template>
                         <template v-if="child.value === null" >-</template>
                       </div>
                     </template>

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

@@ -935,37 +935,40 @@ export default {
             })
           }
           break
-              //未符合项整改流程
+        //未符合项整改流程
         case '8' :
-          if(row.taskInfo === '下发至标准法规工程师'){
+          if(row.taskInfo === '审核'){
             this.$router.push({
               name: 'wfhxzgStep2',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '确认+选择责任人') {
+          } else if (row.taskInfo === '合规排查(上传合规举证材料)') {
             this.$router.push({
               name: 'wfhxzgStep3',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '上传佐证材料填写信息') {
+          }else if (row.taskInfo === '审定') {
             this.$router.push({
               name: 'wfhxzgStep4',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }
@@ -989,6 +992,7 @@ export default {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
                 prcNum: row.prcNum,
+                taskAssignee: row.taskAssignee,
                 prcName: row.prcName,
                 prcType: row.prcType
               }

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -3,11 +3,11 @@
   <div class="bzrhStep1">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会入会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -258,13 +258,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
+                  <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="标准法规工程师"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -380,7 +380,7 @@
         name="file"
         drag
         :file-list="rh_pageData.infoSources"
-        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
+        accept=".docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
         :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
@@ -426,14 +426,10 @@
 </template>
 
 <script>
-import ProcessHeader from '../../components/ProcessHeader'
+import ProcessHeader from "../../components/ProcessHeader";
-import ProcessFooter from '../../components/ProcessFooter'
+import ProcessFooter from "../../components/ProcessFooter";
-import ProcessTitle from '../../components/ProcessTitle'
+import ProcessTitle from "../../components/ProcessTitle";
-import {
+import { completeTask, processBack, queryTaskFirst, saveTaskFirst, taskDel, upFile, workGroup } from "@/api/process.js";
-  saveTaskFirst,
-  completeTask, queryTaskFirst,
-  taskDel, workGroup, processBack,upFile
-} from '@/api/process.js'
 
 export default {
   components: {
@@ -595,26 +591,26 @@ export default {
     },
     // 文件上传限制条件
     handleBeforeUpload(file) {
-      var filename = file.name
+      var filename = file.name;
-      var index1 = filename.lastIndexOf('.')
+      var index1 = filename.lastIndexOf(".");
-      var index2 = filename.length
+      var index2 = filename.length;
-      var fileSuffix = filename.substring(index1, index2)
+      var fileSuffix = filename.substring(index1, index2);
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
+      if (fileSuffix === ".docx" || fileSuffix === ".DOCX"
-        || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
+        || fileSuffix === ".xls" || fileSuffix === ".xlsx" || fileSuffix === ".pdf" || fileSuffix === ".PDF"
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
+        || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG" || fileSuffix === ".pptx"
-        || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
+        || fileSuffix === ".doc" || fileSuffix === ".DOC" || fileSuffix === ".bmp") {
-        return true
+        return true;
       } else {
-        this.spinShow = false
+        this.spinShow = false;
-        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
+        this.$message.error("文件" + file.name + "格式不正确，请上传DOCX/PDF或XLS文件");
-        return false
+        return false;
       }
       // 判断文件上传大小
       // eslint-disable-next-line no-unreachable
       if (file.size / 1024 / 1024 <= 200) {
-        return true
+        return true;
       } else {
         this.$message.error('文件' + file.name + '大小不超过200M')
         return false
@@ -641,7 +637,8 @@ export default {
         if (res.ok) {
           this.handleOnsuccess(res)
         } else {
-          this.$message.warning('上传失败')
+          this.$message.warning("上传失败");
+          this.fileMadel = false;
         }
       })
     },

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -3,11 +3,11 @@
   <div class="bzchStep1">
     <ProcessHeader toggle>
       <template slot="proName">外部标准化协会参会流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">流程信息</div>
+      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -190,13 +190,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
-                  <h4>流程发起人</h4>
+                  <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" :disabled="true" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" :disabled="true" placeholder="标准法规工程师"></el-input>
                   </div>
                 </el-form-item>
               </el-card>

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

@@ -268,6 +268,7 @@
             <el-input
               type="textarea"
               :rows="3"
+              disabled
               resize="none"
               placeholder="请输入意见"
               v-model="commentText">

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

@@ -653,27 +653,10 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" clearable v-model="form.qcdw" placeholder="请选择起草单位" multiple filterable>
+                  <el-select :popper-append-to-body="false" multiple filterable clearable v-model="form.qcdw" placeholder="请选择起草单位">
-                    <el-option
+                    <el-option v-for="item in qcdwOption" :value="item.value" :key="item.value" :label="item.label" multiple filterable></el-option>
-                      v-for="item in qcdwOption"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                    ></el-option>
                   </el-select>
                 </el-form-item>
-                <!--<el-form-item v-show="form.standInData === '0'" label="体系类别" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
-                    <el-option
-                      v-for="item in txlbOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>-->
               </el-col>
               <el-col :span="12">
                 <!--适用产品线-->
@@ -790,7 +773,7 @@
                   ></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 v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceWSSMR('wssmr', '选择我司署名人', form.wssmr)">
                   </el-input>
                   <!--                                    <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
                   <!--                                      <el-option-->
@@ -1896,46 +1879,46 @@ export default {
         this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
       },
     },*/
-    'form.standNumber': {
+    // 'form.standNumber': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standNumber = this.form.standNumber
+    //     this.standardSearchForm.standNumber = this.form.standNumber
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standNumber': {
+    // 'standardSearchForm.standNumber': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standNumber = this.standardSearchForm.standNumber
+    //     this.form.standNumber = this.standardSearchForm.standNumber
-      },
+    //   },
-    },
+    // },
-    'form.standSort': {
+    // 'form.standSort': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standSort = this.form.standSort
+    //     this.standardSearchForm.standSort = this.form.standSort
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standSort': {
+    // 'standardSearchForm.standSort': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standSort = this.standardSearchForm.standSort
+    //     this.form.standSort = this.standardSearchForm.standSort
-      },
+    //   },
-    },
+    // },
-    'form.standName': {
+    // 'form.standName': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standName = this.form.standName
+    //     this.standardSearchForm.standName = this.form.standName
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standName': {
+    // 'standardSearchForm.standName': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standName = this.standardSearchForm.standName
+    //     this.form.standName = this.standardSearchForm.standName
-      },
+    //   },
-    },
+    // },
-    'form.standEnName': {
+    // 'form.standEnName': {
-      handler: function () {
+    //   handler: function () {
-        this.standardSearchForm.standEnName = this.form.standEnName
+    //     this.standardSearchForm.standEnName = this.form.standEnName
-      },
+    //   },
-    },
+    // },
-    'standardSearchForm.standEnName': {
+    // 'standardSearchForm.standEnName': {
-      handler: function () {
+    //   handler: function () {
-        this.form.standEnName = this.standardSearchForm.standEnName
+    //     this.form.standEnName = this.standardSearchForm.standEnName
-      },
+    //   },
-    },
+    // },
   },
   methods: {
     // 标准来源改变事件
@@ -2247,7 +2230,7 @@ export default {
                 this.form = JSON.parse(JSON.stringify(json))
                 this.getListTree(bringData)
                 this.form.standId = bringData.id
-                this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : ''
+                this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : ''
                 this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : ''
                 this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : ''
                 this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm && JSON.parse(JSON.stringify(json)).zrbm !== '[]' ? JSON.parse(JSON.stringify(json)).zrbm : ''
@@ -2255,6 +2238,7 @@ export default {
                 this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx && JSON.parse(JSON.stringify(json)).sycpx !== '[]' ? JSON.parse(JSON.stringify(json)).sycpx : ''
                 this.form.nylx = JSON.parse(JSON.stringify(json)).nylx && JSON.parse(JSON.stringify(json)).nylx !== '[]' ? JSON.parse(JSON.stringify(json)).nylx : ''
                 this.form.cllx = JSON.parse(JSON.stringify(json)).cllx && JSON.parse(JSON.stringify(json)).cllx !== '[]' ? JSON.parse(JSON.stringify(json)).cllx : ''
+                this.form.bfbdtbzh = JSON.parse(JSON.stringify(json)).bfdtbz && JSON.parse(JSON.stringify(json)).bfdtbz !== '[]' ? JSON.parse(JSON.stringify(json)).bfdtbz : ''
                 this.defaultCheckedKeys = [this.form.standSystem];
                 this.defaultCheckedKeys1 = [this.form.cycvppsbm];
                 this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -2530,7 +2514,18 @@ export default {
     },
     choiceWSSMR(type, title, id) {
       this.nodeList3 = []
-      this.nodeList.push(id)
+      if(id){
+        let nameId = id.split(',')
+        let idList = []
+        nameId.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList3.push(idList)
+      }
       this.userType = type
       this.drawerTitle = title
       this.modalShowRoleFlag5 = true

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

@@ -715,20 +715,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </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>
@@ -1171,6 +1168,13 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
+        let wssmrName = this.form.wssmrname
+        this.form.wssmr = wssmrName
+        this.form.sycpx = this.form.sycpx.split(',')
+        this.form.nylx = this.form.nylx.split(',')
+        this.form.cllx = this.form.cllx.split(',')
+        this.form.syrz = this.form.syrz.split(',')
+        this.form.syrz = this.form.syrz.split(',')
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]

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

@@ -702,20 +702,17 @@
               prop="name"
               label="任务步骤"
               align="center"
-              sortable="custom"
           >
           </el-table-column>
           <el-table-column
               prop="assignee"
               label="任务受理人"
               align="center"
-              sortable="custom"
           >
           </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>

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

@@ -128,7 +128,7 @@
                   </el-radio-group>
                   <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
-                <el-form-item v-show="form.standInData=='0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData=='1'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   <tree-select-new
                     :key="key"
@@ -1317,20 +1317,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </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>
@@ -1656,6 +1653,7 @@ export default {
         validFlag: '0',
         menuId: 'nomenu'
       },
+      loading: false,
       replaceLawsNumRow: [], // 代替政策号 数组内容
       replaceTotal: 0,
       selectedListRep: [],
@@ -1848,11 +1846,9 @@ export default {
       if (val === '1') {
         this.rules.standName[0].required = false
         this.rules.standEnName[0].required = true;
-        this.rules.standNature[0].required = false
       } else {
         this.rules.standName[0].required = true
         this.rules.standNature[0].required = true
-        this.rules.standEnName[0].required = false;
       }
       this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
     },
@@ -2607,31 +2603,49 @@ export default {
     /**
      * @description: 动态表单读取
      */
+    // getFormFieldList(item) {
+    //   this.$nextTick(() => {
+    //     this.form = JSON.parse(JSON.stringify(item))
+    //     this.defaultCheckedKeys = [this.form.standSystem];
+    //     this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+    //     this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+    //     this.defaultCheckedKeys3 = [this.form.dybxh];
+    //     this.treeCheckedKeys = this.form.treeListId.split(',')
+    //     this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+    //     this.form.standYear = this.form.standYear ? this.form.standYear : ''
+    //     this.form.prcNum = this.prcNum
+    //     this.form.prcName = this.prcName
+    //     this.form['id'] = item.id
+    //
+    //
+    //     // 遍历对象
+    //     for (const p in this.form) {
+    //       if (typeof (this.form[p]) != "function") {
+    //         this.initializeFileList(p, this.form[p]);
+    //       }
+    //     }
+    //
+    //     this.$forceUpdate()
+    //   })
+    // },
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        this.defaultCheckedKeys = [this.form.standSystem];
+        this.defaultCheckedKeys = [this.form.standSystem]
-        this.defaultCheckedKeys1 = [this.form.cycvppsbm];
+        this.defaultCheckedKeys1 = [this.form.cycvppsbm]
-        this.defaultCheckedKeys2 = [this.form.kccvppsbm];
+        this.defaultCheckedKeys2 = [this.form.kccvppsbm]
-        this.defaultCheckedKeys3 = [this.form.dybxh];
+        this.defaultCheckedKeys3 = [this.form.dybxh]
-        this.treeCheckedKeys = this.form.treeListId.split(',')
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? 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
-
-
-        // 遍历对象
-        for (const p in this.form) {
-          if (typeof (this.form[p]) != "function") {
-            this.initializeFileList(p, this.form[p]);
-          }
-        }
-
-        this.$forceUpdate()
       })
-    }, initializeFileList(property, value) {
+    },
+    initializeFileList(property, value) {
       switch (property) {
         case 'xgd':
           this.getFileList(value, this.xgdFileList);
@@ -2939,11 +2953,9 @@ export default {
         if (this.form.standInData === '1') {
           this.rules.standYear[0].required = false;
           this.rules.standName[0].required = false
-          this.rules.standNature[0].required = false
         } else {
           this.rules.standYear[0].required = true;
           this.rules.standName[0].required = true
-          this.rules.standNature[0].required = true
         }
       }
     },

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

@@ -662,20 +662,17 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </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>

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

@@ -39,6 +39,7 @@
                   <el-date-picker
                           v-model="form.endTime"
                           type="date"
+                          value-format="yyyy-MM-dd"
                           :picker-options="pickerOptions"
                           placeholder="请选择结束日期">
                   </el-date-picker>

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

@@ -40,6 +40,7 @@
                     v-model="form.endTime"
                     :picker-options="pickerOptions"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
@@ -814,6 +815,7 @@ export default {
       _formData.append('json', JSON.stringify({
         form: this.form,
         roleForm: this.roleForm,
+        filesId: this.addFjList,
         commentText1: this.commentText1
       }))
       saveTaskFirst(_formData).then(res => {

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

@@ -37,6 +37,7 @@
                     disabled
                     v-model="form.endTime"
                     type="date"
+                    value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>

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

@@ -35,6 +35,7 @@
                                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
+                                            value-format="yyyy-MM-dd"
                                             v-model="form.endTime"
                                             type="date"
                                             placeholder="请选择结束日期">

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

@@ -34,6 +34,7 @@
                                 </el-form-item>
                                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
+                                      value-format="yyyy-MM-dd"
                                             disabled
                                             v-model="form.endTime"
                                             type="date"

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

@@ -37,6 +37,7 @@
                                             disabled
                                             v-model="form.endTime"
                                             type="date"
+                                            value-format="yyyy-MM-dd"
                                             placeholder="请选择结束日期">
                                     </el-date-picker>
                                 </el-form-item>

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

@@ -35,6 +35,7 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
+                    value-format="yyyy-MM-dd"
                     v-model="form.endTime"
                     type="date"
                     placeholder="请选择结束日期">

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

@@ -349,6 +349,7 @@
     name: "bzzqyjStep5",
     data() {
       return {
+        clickFlag: false,
         commentText5: '',
         options: [],
         itemId: '',
@@ -460,35 +461,47 @@
         this.modalshowflag2 = false
       },
       itemEdit (row, index) {
-        this.itemId = row.id
+        if(this.clickFlag){
-        this.modalshowflag2 = true
+          this.itemId = row.id
-        this.editForm = {
+          this.modalshowflag2 = true
-          chapterNumber: row.chapterNumber,
+          this.editForm = {
-          chapterName: row.chapterName,
+            chapterNumber: row.chapterNumber,
-          oldText: row.oldText,
+            chapterName: row.chapterName,
-          newText: row.newText,
+            oldText: row.oldText,
-          reason: row.reason,
+            newText: row.newText,
-          cause: row.cause,
+            reason: row.reason,
-          department: row.department,
+            cause: row.cause,
-          responUserName: row.responUserName,
+            department: row.department,
-          responUser: row.responUser,
+            responUserName: row.responUserName,
-          state: row.state,
+            responUser: row.responUser,
-          source: row.source,
+            state: row.state,
-          id: row.id,
+            source: row.source,
+            id: row.id,
+          }
+        }else{
+         this.$message.warning('公开征求意见未结束，无法操作')
         }
       },
       itermsConditionsClose () {
         this.itermsConditionsFlag = false
       },
       itermsConditionsOpen (row) {
-        this.itermsConditionsFlag = true
+        if(this.clickFlag){
-        this.itermsConditionsTitle = row
+          this.itermsConditionsFlag = true
+          this.itermsConditionsTitle = row
+        }else{
+          this.$message.warning('公开征求意见未结束，无法操作')
+        }
       },
       downloadFile (attId) {
         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
       },
       handleTransfer() {
-        this.drawerModal = true
+        if(this.clickFlag){
+          this.drawerModal = true
+        }else{
+          this.$message.warning('公开征求意见未结束，无法操作')
+        }
       },
       checkedRole (data) {
         changeAssigneeNew({
@@ -539,42 +552,50 @@
       },
       //保存事件
       handleSave() {
-        this.saveLoading = true;
+        if(this.clickFlag){
-        let _formData = new FormData();
+          this.saveLoading = true;
-        let json = this.form;
+          let _formData = new FormData();
-        json.data = this.data;
+          let json = this.form;
-        _formData.append("id", this.bpnId || "");
+          json.data = this.data;
-        _formData.append("prcType", "3");
+          _formData.append("id", this.bpnId || "");
-        _formData.append("taskIds", this.taskIds);
+          _formData.append("prcType", "3");
-        _formData.append("json", JSON.stringify({
+          _formData.append("taskIds", this.taskIds);
-          form: json,
+          _formData.append("json", JSON.stringify({
-          commentText5: this.commentText5
+            form: json,
-        }));
+            commentText5: this.commentText5
-        saveTaskForPub(_formData).then(res => {
+          }));
-          this.saveLoading = false;
+          saveTaskForPub(_formData).then(res => {
-          this.$message.success("保存成功");
+            this.saveLoading = false;
-          this.bpnId = res.result;
+            this.$message.success("保存成功");
-        }).catch(e => {
+            this.bpnId = res.result;
-          this.saveLoading = false;
+          }).catch(e => {
-        });
+            this.saveLoading = false;
+          });
+        }else{
+          this.$message.warning('公开征求意见未结束，无法操作')
+        }
       },
       handleSubmit() {
-        let a = 0
+        if(this.clickFlag){
-        for (let b = 0; b < this.data.length;b++) {
+          let a = 0
-          if (this.data[b].state === '3' && !this.data[b].cause) {
+          for (let b = 0; b < this.data.length;b++) {
-            a++
+            if (this.data[b].state === '3' && !this.data[b].cause) {
+              a++
+            }
+            if(!this.data[b].sourceType){
+              this.data[b].sourceType = '定向'
+            }
           }
-        }
+          if (a > 0) {
-        if (a > 0) {
+            this.$message.warning('请输入不上报原因')
-          this.$message.warning('请输入不上报原因')
+            return;
-          return;
+          }
-        }
+          this.isSubmit = true;
-        this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
           json.commentText = this.commentText5;
           json.introduce = true;
-        this.$http.post("lawss/activiti/completeTask", {
+          this.$http.post("lawss/activiti/completeTask", {
             json: JSON.stringify(json),
             taskId: this.taskIds,
             userId: this.$store.getters.userInfo.userId
@@ -585,6 +606,9 @@
             }
             this.isSubmit = false;
           });
+        }else{
+          this.$message.warning('公开征求意见未结束，无法操作')
+        }
       },
       getData() {
         return new Promise((resolve, reject) => {
@@ -613,6 +637,16 @@
             this.json = data;
             this.getItemList(data.standId,this.form.textValue)
             this.data = newArr
+            this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
+              endTime: this.form.endTime
+            }, {}, res => {
+              //返回0 流程未到截止日期 不能进行操作
+              if (res.message === '0') {
+                this.clickFlag = false
+              } else {
+                this.clickFlag = true
+              }
+            })
             if (data.introduce) {
             } else {
               this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
@@ -624,6 +658,7 @@
                   item.responUser = item.userId
                   item.state = '1'
                   item.source = '2'
+                  item.sourceType = '公开'
                   this.data.push(item);
                 });
               });

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

@@ -200,20 +200,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </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>

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

@@ -200,20 +200,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </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>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -120,6 +120,8 @@
   <ProcessFooter
       show-submit
       :submitLoading="isSubmit"
+      show-transfer
+      @transfer="handleTransfer"
       @submit="handleSubmit"
   >
   </ProcessFooter>
@@ -273,22 +275,23 @@ export default {
     handleTransfer(){
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
-      this.selectPeople = row
     },
     //确认转办
     checkedRoles (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
         assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId, // 流程实例
-        pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
           this.processNum()
         } else {
           this.$message.warning(res.message)

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

@@ -126,6 +126,8 @@
           show-submit
           :submitLoading="isSubmit"
           :saveLoading="saveLoading"
+          show-transfer
+          @transfer="handleTransfer"
           @save="handleSave"
           @submit="handleSubmit"
   >
@@ -159,7 +161,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail,saveTaskForPub, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
 import formList from './common/formList.vue'
 
 export default {
@@ -303,10 +305,6 @@ export default {
     }
   },
   mounted() {
-    this.bpnId = this.$route.query.bpnId
-    if (this.bpnId !== undefined) {
-      this.getDataS()
-    }
     this.processTable()
     this.getData()
   },
@@ -442,32 +440,26 @@ export default {
         })
       })
     },
-    getDataS(){
+    getDataS(mesg){
-      queryTaskFirst({
+      this.qbfsForm = mesg.qbfsForm
-        bpnId: this.$route.query.bpnId
+      this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
-      }).then(res => {
+      this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
-        let mes = JSON.parse(res.mes)
+      this.qbfsForm['id'] = mesg.qbfsForm.id
-        console.log(mes)
+      this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
-        this.qbfsForm = mes.qbfsForm
+      this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
-        this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
+      this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
-        this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
+      this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
-        this.qbfsForm['id'] = mes.qbfsForm.id
+      this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
-        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+      this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
-        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+      this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
-        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
+      this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
-        this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
+      this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
-        this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
+      this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
-        this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
+      this.standardDrawer = false
-        this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
+      this.verifySarStandard = true
-        this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
+      this.commentText = mesg.commentText
-        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+      this.formKey++
-        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
+      this.$forceUpdate()
-        this.standardDrawer = false
-        this.verifySarStandard = true
-        this.commentText = mes.commentText
-        this.formKey++
-        this.$forceUpdate()
-      });
     },
     getData() {
       return new Promise((resolve, reject) => {
@@ -477,8 +469,12 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
+            if (processForm.qbfsForm === undefined) {
-          }
+              this.getFormFieldList(processForm)
+            } else {
+              //表单文件处理
+              this.getDataS(processForm)
+            }          }
         }).catch(e => {
         })
       })
@@ -541,13 +537,14 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('taskIds', this.$route.query.taskIds)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
         taskInfo: '复审',
         qbfsForm: this.qbfsForm,
         commentText: this.commentText
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
@@ -625,22 +622,23 @@ export default {
     handleTransfer(){
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
-      this.selectPeople = row
     },
     //确认转办
     checkedRoles (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
         assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId, // 流程实例
-        pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
           this.processNum()
         } else {
           this.$message.warning(res.message)

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

@@ -124,8 +124,10 @@
           v-show="verifySarStandard"
           show-save
           show-submit
+          show-transfer
           :submitLoading="isSubmit"
           :saveLoading="saveLoading"
+          @transfer="handleTransfer"
           @save="handleSave"
           @submit="handleSubmit"
   >
@@ -159,7 +161,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail,saveTaskForPub, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
 import formList from './common/formList.vue'
 
 export default {
@@ -273,10 +275,6 @@ export default {
     }
   },
   mounted() {
-    this.bpnId = this.$route.query.bpnId
-    if (this.bpnId !== undefined) {
-      this.getDataS()
-    }
     this.processTable()
     this.getData()
   },
@@ -400,16 +398,11 @@ export default {
         })
       })
     },
-    getDataS(){
+    getDataS(mesg){
-      queryTaskFirst({
+        this.qbfsForm = mesg.qbfsForm
-        bpnId: this.$route.query.bpnId
-      }).then(res => {
-        let mes = JSON.parse(res.mes)
-        console.log(mes)
-        this.qbfsForm = mes.qbfsForm
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
-        this.qbfsForm['id'] = mes.qbfsForm.id
+        this.qbfsForm['id'] = mesg.qbfsForm.id
         this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
         this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
         this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
@@ -422,10 +415,9 @@ export default {
         this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
         this.standardDrawer = false
         this.verifySarStandard = true
-        this.commentText = mes.commentText
+        this.commentText = mesg.commentText
         this.formKey++
         this.$forceUpdate()
-      });
     },
     getData() {
       return new Promise((resolve, reject) => {
@@ -435,7 +427,12 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
+            if (processForm.qbfsForm === undefined) {
+              this.getFormFieldList(processForm)
+            } else {
+              //表单文件处理
+              this.getDataS(processForm)
+            }
           }
         }).catch(e => {
         })
@@ -522,13 +519,14 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('taskIds', this.$route.query.taskIds)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
         taskInfo: '汇总',
         qbfsForm: this.qbfsForm,
         commentText: this.commentText
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
@@ -591,22 +589,23 @@ export default {
     handleTransfer(){
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
-      this.selectPeople = row
     },
     //确认转办
     checkedRoles (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
         assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId, // 流程实例
-        pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
           this.processNum()
         } else {
           this.$message.warning(res.message)

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

@@ -691,18 +691,20 @@ export default {
     },
     //确认转办
     checkedRoles (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
         assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId, // 流程实例
-        pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
           this.processNum()
         } else {
           this.$message.warning(res.message)

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

@@ -126,6 +126,8 @@
           show-submit
           :submitLoading="isSubmit"
           :saveLoading="saveLoading"
+          show-transfer
+          @transfer="handleTransfer"
           @save="handleSave"
           @submit="handleSubmit"
   >
@@ -159,7 +161,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
+import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub,saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
 import formList from './common/formList.vue'
 
 export default {
@@ -273,10 +275,6 @@ export default {
     }
   },
   mounted() {
-    this.bpnId = this.$route.query.bpnId
-    if (this.bpnId !== undefined) {
-      this.getDataS()
-    }
     this.processTable()
     this.getData()
   },
@@ -400,31 +398,26 @@ export default {
         })
       })
     },
-    getDataS(){
+    getDataS(mesg){
-      queryTaskFirst({
+      this.qbfsForm = mesg.qbfsForm
-        bpnId: this.$route.query.bpnId
+      this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
-      }).then(res => {
+      this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
-        let mes = JSON.parse(res.mes)
+      this.qbfsForm['id'] = mesg.qbfsForm.id
-        this.qbfsForm = mes.qbfsForm
+      this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
-        this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
+      this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
-        this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
+      this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
-        this.qbfsForm['id'] = mes.qbfsForm.id
+      this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
-        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+      this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
-        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+      this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
-        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
+      this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
-        this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
+      this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
-        this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
+      this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
-        this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
+      this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
-        this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
+      this.standardDrawer = false
-        this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
+      this.verifySarStandard = true
-        this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
+      this.commentText = mesg.commentText
-        this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
+      this.formKey++
-        this.standardDrawer = false
+      this.$forceUpdate()
-        this.verifySarStandard = true
-        this.commentText = mes.commentText
-        this.formKey++
-        this.$forceUpdate()
-      });
     },
     getData() {
       return new Promise((resolve, reject) => {
@@ -434,8 +427,12 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
+            if (processForm.qbfsForm === undefined) {
-          }
+              this.getFormFieldList(processForm)
+            } else {
+              //表单文件处理
+              this.getDataS(processForm)
+            }           }
         }).catch(e => {
         })
       })
@@ -521,13 +518,14 @@ export default {
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.userId)
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
+      _formData.append('taskIds', this.$route.query.taskIds)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
         taskInfo: '重新汇总',
         qbfsForm: this.qbfsForm,
         commentText: this.commentText
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
@@ -590,22 +588,23 @@ export default {
     handleTransfer(){
       this.drawerModal = true
       this.drawerTitle = '转办处理人'
-      this.selectPeople = row
     },
     //确认转办
     checkedRoles (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
         assignee: data[0].id, // 被委托人
-        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId, // 流程实例
-        pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.$router.push("/processCenter");
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
           this.processNum()
         } else {
           this.$message.warning(res.message)

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -36,12 +36,6 @@
                            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-->
@@ -86,6 +80,16 @@
           <!--                                            clearable-->
           <!--                                    ></el-input>-->
           <!--                                </el-form-item>-->
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable disabled>
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="企业标准号" v-show="fbNode || form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standCode" :disabled="disabledState"
@@ -99,6 +103,12 @@
                     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"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
           <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
             <el-datePicker v-model="form.putTime"
                            :editable="false"
@@ -106,16 +116,6 @@
                            value-format="yyyy-MM-dd"
             ></el-datePicker>
           </el-form-item>
-          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
-            <el-select v-model="form.standStatus" filterable disabled>
-              <el-option
-                      v-for="item in opinionsStand"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime"-->
           <!--                         :editable="false"-->
@@ -144,10 +144,10 @@
                     v-model="form.FBGBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
               <div style="width: 80%;">
                 <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -172,10 +172,10 @@
                     v-model="form.LSBBBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
               <div style="width: 80%;">
                 <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -202,10 +202,10 @@
                     v-model="form.XGDName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
               <div style="width: 80%;">
                 <div v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -230,10 +230,10 @@
                     v-model="form.QTWJBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
               <div style="width: 80%;">
                 <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -361,7 +361,7 @@
                     class="common-button-primary"
                     size="mini"
                     style="position:absolute;top: 10px;right: 0;"
-                    @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
+                    @click="selectLaws('DTQBBHBUSS','代替企标编号')"
             >{{'手动查找'}}</el-button>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
@@ -371,10 +371,10 @@
                     v-model="form.GLWJBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
               <div style="width: 80%;">
                 <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -433,7 +433,7 @@
                 class="common-button-primary"
                 size="mini"
                 style="position:absolute;top: 10px;right: 0;"
-                @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'"
+                @click="selectLaws('BDTQBBHBUSS','被代替企标编号')"
             >{{'手动查找'}}</el-button>
           </el-form-item>
           <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
@@ -671,10 +671,10 @@
         }
         return value
       },
-      ellipsis22 (value) {
+      ellipsis2 (value) {
         if (!value) return ''
-        if (value.length > 22) {
+        if (value.length > 12) {
-          return value.slice(0,22) + '...'
+          return value.slice(0,12) + '...'
         }
         return value
       }
@@ -813,7 +813,7 @@
         }, e => {
         })
       },
-      selectLaws (type) {
+      selectLaws (type,title) {
         // if (this.standNumFlag === 1) {
         // this.$refs.selections.selectAll(false)
         // }
@@ -821,7 +821,7 @@
         this.replaceLawsNumModel = true
         this.replaceLawType = ''
         this.replaceLawType = type
-        this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType);
+        this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType,title);
       },
       fileUpload (type) {
         // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表

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

@@ -22,16 +22,15 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
           <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
             <el-datePicker v-model="form.BARQ" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
-                           placeholder="请选择截止日期"
-                           :editable="false"
-            ></el-datePicker>
-          </el-form-item>
 
           <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
           <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
@@ -74,6 +73,16 @@
           <!--                                        clearable-->
           <!--                                ></el-input>-->
           <!--                            </el-form-item>-->
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable :disabled="disabledState">
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="企业标准号" v-show="form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standCode" :disabled="disabledState"
@@ -86,25 +95,17 @@
                     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 v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
             <el-datePicker v-model="form.putTime" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+
-            <el-select v-model="form.standStatus" filterable :disabled="disabledState">
-              <el-option
-                      v-for="item in opinionsStand"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                           :editable="false"
-            ></el-datePicker>
-          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
           <!--                         :editable="false"-->
@@ -126,7 +127,7 @@
       <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">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -138,7 +139,7 @@
             <!--          </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">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -152,7 +153,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -164,7 +165,7 @@
             <!--          </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">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -266,7 +267,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -519,8 +520,8 @@
       },
       ellipsis22 (value) {
         if (!value) return ''
-        if (value.length > 22) {
+        if (value.length > 12) {
-          return value.slice(0,22) + '...'
+          return value.slice(0,12) + '...'
         }
         return value
       }

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

@@ -35,12 +35,6 @@
             <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-->
@@ -78,22 +72,6 @@
           <!--                                        clearable-->
           <!--                                ></el-input>-->
           <!--                            </el-form-item>-->
-          <el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.standCode" :disabled="disabledState"
-                    clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                           :editable="false"></el-datePicker>
-          </el-form-item>
-          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.standEnName" :disabled="disabledState"
-                    clearable
-            ></el-input>
-          </el-form-item>
           <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable clearable :disabled="disabledState" >
               <el-option
@@ -104,6 +82,28 @@
               ></el-option>
             </el-select>
           </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 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 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="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
           <!--                         :editable="false"-->
@@ -125,7 +125,7 @@
       <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">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -137,7 +137,7 @@
             <!--          </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">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -151,7 +151,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -163,7 +163,7 @@
             <!--          </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">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -265,7 +265,7 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -518,8 +518,8 @@
       },
       ellipsis22 (value) {
         if (!value) return ''
-        if (value.length > 22) {
+        if (value.length > 12) {
-          return value.slice(0,22) + '...'
+          return value.slice(0,12) + '...'
         }
         return value
       }

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

@@ -42,6 +42,12 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+                                    <el-datePicker v-model="form.issueTime"
+                                                   placeholder="请选择发布日期"
+                                                   :editable="false"
+                                    ></el-datePicker>
+                                </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
                                     <el-datePicker v-model="form.BARQ"
                                                    :editable="false"
@@ -49,12 +55,6 @@
                                                    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-->
@@ -117,6 +117,16 @@
 <!--                                        根据企标编号、企标名称查询-->
 <!--                                    </el-button>-->
 <!--                                </el-form-item>-->
+                                <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.standStatus" filterable clearable>
+                                        <el-option
+                                                v-for="item in opinionsStand"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
                                 <el-form-item label="企业标准号" v-show="form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -131,6 +141,12 @@
                                             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"
+                                                   placeholder="请选择截止日期"
+                                                   :editable="false"
+                                    ></el-datePicker>
+                                </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
                                     <el-datePicker v-model="form.putTime"
                                                    :editable="false"
@@ -138,22 +154,6 @@
                                                    value-format="yyyy-MM-dd"
                                     ></el-datePicker>
                                 </el-form-item>
-                                <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standStatus" filterable clearable>
-                                        <el-option
-                                                v-for="item in opinionsStand"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                    <el-datePicker v-model="form.issueTime"
-                                                   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"-->
@@ -372,6 +372,10 @@
                                 <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.DTQBBHBUSS"
+                                            type="textarea"
+                                            resize="none"
+                                            :autosize="true"
+                                            :title="form.DTQBBHBUSS"
                                             placeholder="请输入代替标准号"
                                             clearable
                                     ></el-input>
@@ -411,6 +415,10 @@
                                 <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
                                   <el-input
                                       v-model="form.BDTQBBHBUSS"
+                                      type="textarea"
+                                      resize="none"
+                                      :autosize="true"
+                                      :title="form.BDTQBBHBUSS"
                                       placeholder="请输入被代替企标编号"
                                       clearable
                                   ></el-input>
@@ -720,7 +728,7 @@
         >
             <div class="search-area">
                 <div class="left">
-                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                         <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                             <el-select
                                 :popper-append-to-body="false"
@@ -773,14 +781,14 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        label="标准编号">
+                        label="企标编号">
                     <template slot-scope="scope">
                         <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                     </template>
                 </el-table-column>
                 <el-table-column
                         prop="standName"
-                        label="标准名称">
+                        label="企标名称">
                 </el-table-column>
                 <el-table-column
                         prop="issueTime"
@@ -1008,7 +1016,7 @@
                 :multiple=false
                 :lazy=false
                 :modalShowFlag="modalShowFlag1"
-                :drawerTitle="drawerTitle1"
+                :drawerTitle="drawerTitle"
                 width = "500"
                 :data="standSystemOptions"
                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -1898,14 +1906,20 @@
                       let mes = JSON.parse(res.mes)
                       mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                       this.form = mes.form
-                      this.roleForm = mes.roleForm
+                      this.form['id'] = mes.form.id
-                      this.commentText = mes.commentText
+                      this.standardCheckedList = []
+                      this.standardCheckedList.push({id:mes.form.id})
+                      this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                      this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                      this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                       this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                       this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                       this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                       this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                       this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                       this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                      this.roleForm = mes.roleForm
+                      this.commentText = mes.commentText
                   })
               }else {
                   this.form.XCSJBUSS = this.dateFormatter()
@@ -1980,6 +1994,16 @@
                     XCSJBUSS: '',
                 } // 标准信息
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             handleProcessStandardNext(status) {
                 switch (status) {
                     // 新增
@@ -2017,11 +2041,11 @@
                               this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
                               this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
                               this.form['id'] = bringData.id
+                              this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                              this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                              this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                               this.standardDrawer = false
                               this.verifySarStandard = true
-                              this.busVsFunc()
-                              this.modelFunc()
-                              this.$forceUpdate()
                               this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                               this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                               this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
@@ -2036,7 +2060,7 @@
                               this.FBGBUSSFileList= []
                               this.FBGBUSS = ""
                               this.FBGBUSSName = ""
-                                console.log(this.form)
+                              this.$forceUpdate()
                             }
                             // 遍历对象初始化文件信息
                             for(const p in this.form) {
@@ -2503,6 +2527,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2541,7 +2566,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false

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

@@ -648,7 +648,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -782,6 +781,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -648,7 +648,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -782,6 +781,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -573,7 +573,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst,queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -648,7 +648,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -782,6 +781,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -233,6 +233,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -268,7 +270,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -321,14 +323,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -371,6 +373,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -561,7 +571,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -586,7 +596,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -800,6 +810,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1098,6 +1109,27 @@
             },
         },
         methods: {
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1151,9 +1183,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1365,32 +1399,35 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    }).then(res => {
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
-                        this.form = mes.form
+                this.getStandInfoByReviseStatus()
-                        this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.getStandInfoByReviseStatus()
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                this.formKey++
-                        this.roleForm = mes.roleForm
+            },
-                        this.commentText = mes.commentText
+            filterObj(obj){
-                        this.formKey++
+                if(obj && obj !== ''){
-                    })
+                    if(obj instanceof Array){
-                }else {
+                        return obj;
-                    this.form.XCSJBUSS = this.dateFormatter()
+                    }else {
+                        return obj.split(",")
+                    }
                 }
+                return "";
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -1935,6 +1972,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -1973,7 +2011,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2255,27 +2293,32 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss2')
                 _formData.append('prcName', '企标制修订-产品标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2519,8 +2562,11 @@
                     this.form.prcName = this.prcName
                     this.form.issueTime = this.dateFormatter()
                     this.form['id'] = item.id
-                    this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
+                    this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
                     this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
                     this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
                     this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
@@ -2528,6 +2574,12 @@
                     this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
                     this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                     this.getStandInfoByReviseStatus()
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
                     this.formKey++
                 })
             },
@@ -2551,14 +2603,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-                                this.getFormFieldList(processForm)
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2628,38 +2678,21 @@
 
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -219,6 +219,8 @@
             :uploadFile="uploadFileStatus"
             :uploadedFile="!uploadFileStatus"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @uploadFile="handleUploadFile"
             @uploadedFile="handleUploadedFile"
             @submit="handleSubmit"
@@ -362,6 +364,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"-->
@@ -573,7 +583,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process";
+    import {saveTaskFirst, changeAssigneeNew,queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -668,7 +678,6 @@
                 XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -784,6 +793,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1208,6 +1218,27 @@
                     this.roleForm.hqUserName=nameList;
                 }
             },
+            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)
+                    }
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -1251,6 +1282,16 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             getTaskId () {
                 if(this.$route.query.bpnId){
                     queryTaskFirst({
@@ -1260,6 +1301,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -1830,7 +1874,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2249,6 +2293,10 @@
                     this.rules.commentText[0].required = true;
                 }
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             handleSubmit() {
                 // this.getRule()
                 // const val= this.form.country;
@@ -2358,6 +2406,9 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
             assemble(ids,names){
@@ -2397,7 +2448,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.XGDileList=this.assemble(processForm.XGD,processForm.XGDName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                                 this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
                             }
                         }).catch(e => {

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

@@ -275,6 +275,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -310,7 +312,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -363,14 +365,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -413,6 +415,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -604,7 +614,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -630,7 +640,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -844,6 +854,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1168,6 +1179,27 @@
                     })
                 }
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1197,9 +1229,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1425,29 +1459,22 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        bpnId: this.$route.query.bpnId
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                    }).then(res => {
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                this.formKey++
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -1992,6 +2019,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2035,7 +2063,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2350,27 +2378,32 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss2')
                 _formData.append('prcName', '企标制修订-产品标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2572,9 +2605,36 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2596,22 +2656,12 @@
                             if (res) {
                                 this.taskInfo = '企标编写汇总修订'
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2619,38 +2669,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -571,7 +571,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst,queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -646,7 +646,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -781,6 +780,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2296,8 +2296,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -296,6 +296,8 @@
             show-submit
             :submitLoading="isSubmit"
             :saveLoading="saveLoading"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -507,6 +509,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"-->
@@ -717,7 +727,7 @@
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -967,6 +977,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1622,6 +1633,27 @@
                     this.roleForm.hqUserName=nameList;
                 }
             },
+            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)
+                    }
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -1665,27 +1697,20 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        bpnId: this.$route.query.bpnId
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                    }).then(res => {
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        let mes = JSON.parse(res.mes)
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form = mes.form
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.summaryList=this.assemble(mesg.summary,mesg.summaryName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.summaryList=this.assemble(mes.summary,mes.summaryName);
-                        this.roleForm = mes.roleForm
-                        this.formTongGuo.commentText = mes.commentText
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2507,6 +2532,10 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2522,6 +2551,7 @@
                 _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', 'buss2')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2533,7 +2563,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2722,8 +2752,35 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryList=this.assemble(item.summary,item.summaryName);
+                    this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2767,21 +2824,12 @@
                             if (res) {
                                 this.taskInfo = '会签征求意见'
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
-                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })
@@ -2789,39 +2837,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            console.log(this.$store.getters.userInfo)
+            // this.getTaskId()
-            this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -345,6 +345,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -380,7 +382,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -433,14 +435,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -483,6 +485,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -674,7 +684,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -700,7 +710,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -914,6 +924,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1248,6 +1259,27 @@
                 }
 
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1289,9 +1321,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1517,29 +1551,32 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        bpnId: this.$route.query.bpnId
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                    }).then(res => {
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                this.formKey++
-                        this.roleForm = mes.roleForm
+            },
-                        this.commentText = mes.commentText
+            filterObj(obj){
-                        this.formKey++
+                if(obj && obj !== ''){
-                    })
+                    if(obj instanceof Array){
-                }else {
+                        return obj;
-                    this.form.XCSJBUSS = this.dateFormatter()
+                    }else {
+                        return obj.split(",")
+                    }
                 }
+                return "";
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2084,6 +2121,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2127,7 +2165,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2442,27 +2480,32 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss2')
                 _formData.append('prcName', '企标制修订-产品标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2663,6 +2706,24 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                     this.formKey++
                 })
             },
@@ -2687,22 +2748,12 @@
                             if (res) {
                                 this.taskInfo = '意见汇总及标准修改'
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2741,7 +2792,7 @@
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -668,7 +668,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 dataLoading: true,
                 disabledState: true,
                 taskInfo:'标准化复审',
@@ -802,6 +801,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2400,6 +2400,10 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
             assemble(ids,names){
@@ -2464,6 +2468,16 @@
                     })
                 }
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             processTable () {
                 this.$nextTick(() => {
                     Promise.all([this.getTaskId()]).then((value) => {

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

@@ -573,7 +573,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst,queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -648,7 +648,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -782,6 +781,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2297,8 +2297,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -648,7 +648,6 @@
                     }]
                 },
                 loading: false,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 dataLoading: true,
                 disabledState: true,
@@ -782,6 +781,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2297,8 +2297,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -275,6 +275,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -310,7 +312,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -363,14 +365,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -413,6 +415,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -604,7 +614,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -630,7 +640,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -844,6 +854,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1169,6 +1180,27 @@
                 }
 
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1198,9 +1230,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1426,29 +1460,22 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        bpnId: this.$route.query.bpnId
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                    }).then(res => {
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                this.formKey++
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -1993,6 +2020,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2036,7 +2064,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2351,27 +2379,32 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss2')
                 _formData.append('prcName', '企标制修订-产品标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2573,9 +2606,37 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2597,22 +2658,12 @@
                             if (res) {
                                 this.taskInfo = '企标编写汇总修订'
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2651,7 +2702,7 @@
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -345,6 +345,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -380,7 +382,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -433,7 +435,7 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                     <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
@@ -441,7 +443,7 @@
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -484,6 +486,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -675,7 +685,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -706,7 +716,9 @@
         inboundLiaisonDetail,
         processModelHisOneCount,
         queryTaskFirst,
-        saveTaskFirst
+        saveTaskFirst,
+        changeAssigneeNew,
+        saveTaskForPub
     } from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -922,6 +934,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1256,6 +1269,27 @@
                 }
 
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1297,9 +1331,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1525,29 +1561,33 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        bpnId: this.$route.query.bpnId
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                    }).then(res => {
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+
-                        let mes = JSON.parse(res.mes)
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        this.form = mes.form
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.roleForm = mes.roleForm
+                this.formKey++
-                        this.commentText = mes.commentText
+            },
-                        this.formKey++
+            filterObj(obj){
-                    })
+                if(obj && obj !== ''){
-                }else {
+                    if(obj instanceof Array){
-                    this.form.XCSJBUSS = this.dateFormatter()
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
                 }
+                return "";
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2092,6 +2132,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2135,7 +2176,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2450,27 +2491,32 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss2')
                 _formData.append('prcName', '企标制修订-产品标准')
                 _formData.append('json', JSON.stringify({
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2670,7 +2716,25 @@
                     this.form = JSON.parse(JSON.stringify(item))
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
                     this.form['id'] = item.id
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                     this.formKey++
                 })
             },
@@ -2695,22 +2759,12 @@
                             if (res) {
                                 this.taskInfo = '意见汇总及标准修改'
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2718,38 +2772,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -25,6 +25,7 @@
                         :BZSMBUSSFileList = "BZSMBUSSFileList"
                         :QTWJBUSSFileList = "QTWJBUSSFileList"
                         :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :XGDFileList = "XGDFileList"
                         :disabledState = "disabledState"
                         :verifySarStandard = "verifySarStandard"
                         :opinionsShow = "true"
@@ -653,9 +654,9 @@
                 LSBBBUSSFileList: [],
                 QTWJBUSSFileList: [],
                 GLWJBUSSFileList: [],
+                XGDFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -2227,8 +2228,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2262,6 +2276,7 @@
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
                             }
                         }).catch(e => {
                         })

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

@@ -126,10 +126,10 @@
                   v-model="form.FBGBUSSName"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
+          <div style="display: flex;justify-content: space-between;margin-left: 12px;">
             <div style="width: 80%;">
               <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -154,10 +154,10 @@
                   v-model="form.LSBBBUSSName"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
+          <div style="display: flex;justify-content: space-between;margin-left: 12px;">
             <div style="width: 80%;">
               <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -184,10 +184,10 @@
                   v-model="form.BZSMBUSSName"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
+          <div style="display: flex;justify-content: space-between;margin-left: 12px;">
             <div style="width: 80%;">
               <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -212,10 +212,10 @@
                   v-model="form.QTWJBUSSName"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
+          <div style="display: flex;justify-content: space-between;margin-left: 12px;">
             <div style="width: 80%;">
               <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -353,7 +353,7 @@
                   class="common-button-primary"
                   size="mini"
                   style="position:absolute;top: 10px;right: 0;"
-                  @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
+                  @click="selectLaws('DTQBBHBUSS','代替企标编号')"
           >{{'手动查找'}}</el-button>
         </el-form-item>
         <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
@@ -368,7 +368,7 @@
                   class="common-button-primary"
                   size="mini"
                   style="position:absolute;top: 10px;right: 0;"
-                  @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
+                  @click="selectLaws('CYBZ','采用标准')"
           >{{'手动查找'}}</el-button>
         </el-form-item>
         <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
@@ -383,7 +383,7 @@
                   class="common-button-primary"
                   size="mini"
                   style="position:absolute;top: 10px;right: 0;"
-                  @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
+                  @click="selectLaws('YYBZ','引用标准')"
           >{{'手动查找'}}</el-button>
         </el-form-item>
       </el-col>
@@ -429,10 +429,10 @@
                   v-model="form.GLWJBUSSName"
                   clearable
           ></el-input>
-          <div style="display: flex;justify-content: space-between">
+          <div style="display: flex;justify-content: space-between;margin-left: 12px;">
             <div style="width: 80%;">
               <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -710,10 +710,10 @@ export default {
       }
       return value
     },
-    ellipsis22 (value) {
+    ellipsis2 (value) {
       if (!value) return ''
-      if (value.length > 22) {
+      if (value.length > 12) {
-        return value.slice(0,22) + '...'
+        return value.slice(0,12) + '...'
       }
       return value
     }
@@ -850,7 +850,7 @@ export default {
       }, e => {
       })
     },
-    selectLaws (type) {
+    selectLaws (type,title) {
       // if (this.standNumFlag === 1) {
       // this.$refs.selections.selectAll(false)
       // }
@@ -858,7 +858,7 @@ export default {
       this.replaceLawsNumModel = true
       this.replaceLawType = ''
       this.replaceLawType = type
-      this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType);
+      this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType,title);
     },
     fileUpload (type) {
       // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表

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

@@ -99,8 +99,8 @@
     <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">
+          <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -111,8 +111,8 @@
 <!--          </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">
+          <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -125,8 +125,8 @@
       </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">
+          <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -137,8 +137,8 @@
 <!--          </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">
+          <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -283,8 +283,8 @@
           </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">
+          <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -428,7 +428,7 @@
         <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                  <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass">
                       <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
                       <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -505,6 +505,13 @@ export default {
       }
       return value
     },
+      ellipsis2 (value) {
+          if (!value) return ''
+          if (value.length > 12) {
+              return value.slice(0,12) + '...'
+          }
+          return value
+      },
       ellipsis22 (value) {
           if (!value) return ''
           if (value.length > 22) {

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

@@ -110,8 +110,8 @@
       <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">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -122,8 +122,8 @@
             <!--          </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">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -136,8 +136,8 @@
         </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">
+            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -148,8 +148,8 @@
             <!--          </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">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -293,8 +293,8 @@
             </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">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :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="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -438,7 +438,7 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px" class="fileClass">
               <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
               <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
@@ -515,6 +515,13 @@
         }
         return value
       },
+      ellipsis2 (value) {
+        if (!value) return ''
+        if (value.length > 12) {
+          return value.slice(0,12) + '...'
+        }
+        return value
+      },
       ellipsis22 (value) {
         if (!value) return ''
         if (value.length > 22) {

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

@@ -718,7 +718,7 @@
         >
             <div class="search-area">
                 <div class="left">
-                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                         <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                             <el-select
                                 :popper-append-to-body="false"
@@ -771,14 +771,14 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
-                        label="标准编号">
+                        label="企标编号">
                     <template slot-scope="scope">
                         <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
                     </template>
                 </el-table-column>
                 <el-table-column
                         prop="standName"
-                        label="标准名称">
+                        label="企标名称">
                 </el-table-column>
                 <el-table-column
                         prop="issueTime"
@@ -1050,7 +1050,7 @@
                 :multiple=false
                 :lazy=false
                 :modalShowFlag="modalShowFlag1"
-                :drawerTitle="drawerTitle1"
+                :drawerTitle="drawerTitle"
                 width = "500"
                 :data="standSystemOptions"
                 :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -1862,13 +1862,13 @@
                       let mes = JSON.parse(res.mes)
                       mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                       this.form = mes.form
-                      this.roleForm = mes.roleForm
-                      this.commentText = mes.commentText
                       this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                       this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                       this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                       this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                       this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                      this.roleForm = mes.roleForm
+                      this.commentText = mes.commentText
                   })
               }else {
                   this.form.XCSJBUSS = this.dateFormatter()
@@ -2463,6 +2463,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2501,7 +2502,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false

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

@@ -581,7 +581,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst,queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -652,7 +652,6 @@
                 },
                 loading: false,
                 dataLoading: true,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,
@@ -786,6 +785,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',

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

@@ -581,7 +581,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
+    import {saveTaskFirst,queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -652,7 +652,6 @@
                 },
                 loading: false,
                 dataLoading: true,
-                drawerModal: false,
                 assigneeNewLoading: false,
                 disabledState: true,
                 userId:this.$store.getters.userInfo.userId,
@@ -786,6 +785,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -2221,7 +2221,7 @@
                 }
             },
             handleSubmit() {
-                // this.getRule()
+                this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {

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

@@ -234,6 +234,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -269,7 +271,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -322,14 +324,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -372,6 +374,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -562,7 +572,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -627,7 +637,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -838,6 +848,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1122,6 +1133,27 @@
             },
         },
         methods: {
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1178,9 +1210,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1392,33 +1426,23 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    }).then(res => {
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.formKey++
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -1968,6 +1992,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2006,7 +2031,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2309,18 +2334,23 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2330,7 +2360,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2539,7 +2569,6 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
-                    console.log(this.form)
                     this.form.topId = this.pId
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
@@ -2548,6 +2577,20 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
+                    this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
                     this.formKey++
                     // this.getStandInfoByReviseStatus()
                 })
@@ -2582,22 +2625,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
-                                this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2648,38 +2681,21 @@
 
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -235,6 +235,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -270,7 +272,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -323,14 +325,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -373,6 +375,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -563,7 +573,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -628,7 +638,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -839,6 +849,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1126,6 +1137,27 @@
             },
         },
         methods: {
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1182,9 +1214,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1396,35 +1430,25 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    }).then(res => {
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
-                        this.form = mes.form
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.formKey++
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -1975,6 +1999,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2013,7 +2038,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2311,18 +2336,23 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2332,7 +2362,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2581,8 +2611,22 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                    this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                    this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
-                    this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                    this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
+                    this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
                     this.formKey++
                 })
             },
@@ -2616,22 +2660,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
-                                this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2682,38 +2716,21 @@
 
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -344,6 +344,8 @@
             :uploadFile="uploadFileStatus"
             :uploadedFile="!uploadFileStatus"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @uploadFile="handleUploadFile"
             @uploadedFile="handleUploadedFile"
             @submit="handleSubmit"
@@ -487,6 +489,13 @@
             @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"-->
@@ -698,7 +707,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
+    import {changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOne,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -904,6 +913,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1463,6 +1473,27 @@
                     this.roleForm.hqUserName=nameList;
                 }
             },
+            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)
+                    }
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -2088,7 +2119,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2337,6 +2368,10 @@
                     })
                 })
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             handleUploadFile(){
                 this.fileType = '';
                 this.fileType = 'footFile';

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

@@ -279,6 +279,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -314,7 +316,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -367,14 +369,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -417,6 +419,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -673,7 +683,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -885,6 +895,7 @@
                 modelType:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1164,6 +1175,27 @@
             },
         },
         methods: {
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1220,9 +1252,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1449,31 +1483,21 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    }).then(res => {
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.roleForm = mesg.roleForm
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.commentText = mesg.commentText
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.formKey++
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2023,6 +2047,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2066,7 +2091,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2397,18 +2422,23 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2418,7 +2448,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2620,6 +2650,19 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.formKey++
                 })
             },
             filterObj(obj){
@@ -2652,55 +2695,29 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
                     })
                 }
             },
-            processTable () {
+            processTable() {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
             getDicTypeListCode(res,json) {
@@ -2715,7 +2732,7 @@
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
         }

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

@@ -470,6 +470,8 @@
             show-submit
             :submitLoading="isSubmit"
             :saveLoading="saveLoading"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -674,6 +676,14 @@
             @checkedRole="checkedRole2"
             :nodeList="nodeList2"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Role-tree
             check-box
             :is-title="drawerTitle"
@@ -891,7 +901,7 @@
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1135,6 +1145,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1787,6 +1798,27 @@
                     this.roleForm.hqUserName=nameList;
                 }
             },
+            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)
+                    }
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -1830,31 +1862,21 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                // this.getEvaluation()
-                    }).then(res => {
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.getEvaluation()
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.summaryList=this.assemble(mesg.summary,mesg.summaryName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryList=this.assemble(mes.summary,mes.summaryName);
-                        this.roleForm = mes.roleForm
-                        this.formTongGuo.commentText = mes.commentText
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2676,6 +2698,10 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2685,12 +2711,12 @@
 
                 this.summary=this.summaryList.map(item => item.id).join(",")
                 this.summaryName=this.summaryList.map(item => item.name).join(",")
-
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2702,7 +2728,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2894,6 +2920,19 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryList=this.assemble(item.summary,item.summaryName);
                 })
             },
             filterObj(obj){
@@ -2948,20 +2987,13 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
 
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
                             }
                         }).catch(e => {
                         })
@@ -2969,38 +3001,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -482,6 +482,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -517,7 +519,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -570,14 +572,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -620,6 +622,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -810,7 +820,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -876,7 +886,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1118,6 +1128,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1510,6 +1521,27 @@
                     }
                 }
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1566,9 +1598,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1796,33 +1830,23 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                // this.getEvaluation()
-                    }).then(res => {
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        this.form = mes.form
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.getEvaluation()
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.formKey++
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2372,6 +2396,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2415,7 +2440,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2743,18 +2768,23 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2764,7 +2794,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2971,6 +3001,20 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
                     this.formKey++
                 })
             },
@@ -3026,22 +3070,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -3049,38 +3083,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -462,7 +462,7 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
-    <!-- 福田全公司选人解决方案 -->
+    <!-- 福田全公司转办选人解决方案 -->
     <Role-tree
             check-box
             :is-title="drawerTitle"
@@ -679,7 +679,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne} from "api/process";
+    import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1503,35 +1503,23 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                if(this.form.fsRejectStatus === 1){
-                    }).then(res => {
+                    this.evaluationHisListByOne()
-                        this.verifySarStandard = this.$route.query.verifySarStandard
-                        let mes = JSON.parse(res.mes)
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                        this.form = mes.form
-                        if(this.form.fsRejectStatus === 1){
-                            this.evaluationHisListByOne()
-                        }else {
-                            this.getEvaluation()
-                        }
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
                 }
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
+                this.roleForm = mesg.roleForm
+                this.formTongGuo.commentText = mesg.commentText
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2347,6 +2335,7 @@
                 _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', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2356,7 +2345,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2545,6 +2534,18 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
                 })
             },
             filterObj(obj){
@@ -2612,20 +2613,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
                             }
                         }).catch(e => {
                         })
@@ -2633,38 +2626,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -591,7 +591,6 @@
                 },
                 loading: false,
                 dataLoading: true,
-                drawerModal: false,
                 taskInfo:'批准',
                 assigneeNewLoading: false,
                 disabledState: true,
@@ -726,6 +725,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',

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

@@ -690,7 +690,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne,evaluationHisListRepSum} from "api/process";
+    import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne,evaluationHisListRepSum} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -781,7 +781,6 @@
                 },
                 loading: false,
                 dataLoading: true,
-                drawerModal: false,
                 taskInfo:'标准法规部高级经理审核',
                 assigneeNewLoading: false,
                 disabledState: true,
@@ -917,6 +916,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1528,35 +1528,24 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                if(this.form.fsRejectStatus === 1){
-                    }).then(res => {
+                    this.evaluationHisListByOne()
-                        this.verifySarStandard = this.$route.query.verifySarStandard
-                        let mes = JSON.parse(res.mes)
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                        this.form = mes.form
-                        if(this.form.fsRejectStatus === 1){
-                            this.evaluationHisListByOne()
-                        }else {
-                            this.getEvaluation()
-                        }
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
                 }
+                this.evaluationHisListRepSum()
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
+                this.roleForm = mesg.roleForm
+                this.formTongGuo.commentText = mesg.commentText
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2356,6 +2345,7 @@
                 _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', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2365,7 +2355,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2585,6 +2575,19 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
                 })
             },
             filterObj(obj){
@@ -2667,20 +2670,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
                             }
                         }).catch(e => {
                         })
@@ -2688,38 +2683,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -355,6 +355,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -390,7 +392,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -443,7 +445,7 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
                     <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
@@ -451,7 +453,7 @@
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -494,6 +496,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -684,7 +694,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -709,7 +719,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -918,6 +928,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1333,6 +1344,27 @@
                     }
                 }
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1386,9 +1418,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1600,35 +1634,25 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form.evaluationData = []
-                    }).then(res => {
+                this.pid = this.form.topId
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.evaluationHisListRep()
-                        let mes = JSON.parse(res.mes)
+                this.getStandInfoByReviseStatus()
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.evaluationHisListRepSum()
-                        this.form = mes.form
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        this.form.evaluationData = []
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.pid = this.form.topId
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.evaluationHisListRep()
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.getStandInfoByReviseStatus()
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.evaluationHisListRepSum()
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                this.formKey++
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2153,6 +2177,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2191,7 +2216,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2455,18 +2480,23 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2477,7 +2507,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2711,6 +2741,20 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
+                    this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
                     this.formKey++
                 })
             },
@@ -2744,22 +2788,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
-                                this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2810,33 +2844,16 @@
 
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },

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

@@ -279,6 +279,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -314,7 +316,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -367,14 +369,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -417,6 +419,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -673,7 +683,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -885,6 +895,7 @@
                 modelType:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1164,6 +1175,27 @@
             },
         },
         methods: {
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1220,9 +1252,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1449,31 +1483,21 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    }).then(res => {
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.roleForm = mesg.roleForm
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.formTongGuo.commentText = mesg.commentText
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.formKey++
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2023,6 +2047,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2066,7 +2091,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2397,18 +2422,23 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2418,7 +2448,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2620,6 +2650,20 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = item.commentCycleStart
+                        dateArr[1] = item.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.formKey++
                 })
             },
             filterObj(obj){
@@ -2652,21 +2696,12 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
-
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2674,33 +2709,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
             getDicTypeListCode(res,json) {
@@ -2715,7 +2733,7 @@
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
         }

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

@@ -482,6 +482,8 @@
             show-submit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
+            show-transfer
+            @transfer="handleTransfer"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -517,7 +519,7 @@
     >
         <div class="search-area">
             <div class="left">
-                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
                     <el-form-item label="标准来源" class="search-item" v-if="dataSource">
                         <el-select
                                 :popper-append-to-body="false"
@@ -570,14 +572,14 @@
                     align="center">
             </el-table-column>
             <el-table-column
-                    label="标准编号">
+                    label="企标编号">
                 <template slot-scope="scope">
                     <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="standName"
-                    label="标准名称">
+                    label="企标名称">
             </el-table-column>
             <el-table-column
                     prop="issueTime"
@@ -620,6 +622,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司转办选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <Mechanism-tree
             is-title="选择部门信息"
             :is-visible.sync="modalShowFlagZRBM"
@@ -810,7 +820,7 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
@@ -876,7 +886,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1118,6 +1128,7 @@
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1510,6 +1521,27 @@
                     }
                 }
             },
+            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)
+                    }
+                })
+            },
             drawerCheckZRBM(data) {
                 let idList = ''
                 let nameList = ''
@@ -1566,9 +1598,11 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = replaceLawsNumModel
                 this.replaceLawType = replaceLawType
+                this.config.attrName = title
                 this.getReplaceLawsNumRow()
             },
             emitDataLoading(boo){
@@ -1795,32 +1829,22 @@
                 if (!value) return true;
                 return data.name.indexOf(value) !== -1;
             },
-            getTaskId () {
+            getTaskId (mesg) {
-                if(this.$route.query.bpnId){
+                this.form = mesg.form
-                    queryTaskFirst({
+                this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-                        bpnId: this.$route.query.bpnId
+                this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-                    }).then(res => {
+                this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-                        this.verifySarStandard = this.$route.query.verifySarStandard
+                this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-                        let mes = JSON.parse(res.mes)
+                this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-                        mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-                        this.form = mes.form
+                this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                this.roleForm = mesg.roleForm
-                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                this.commentText = mesg.commentText
-                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                this.formKey++
-                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                        this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
-                        this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
-                        this.formKey++
-                    })
-                }else {
-                    this.form.XCSJBUSS = this.dateFormatter()
-                }
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2370,6 +2394,7 @@
                 // this.$refs.selections.selectAll(false)
                 // }
                 // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumForm.numberName = ""
                 this.replaceLawsNumModel = true
                 this.replaceLawType = ''
                 this.replaceLawType = type
@@ -2413,7 +2438,7 @@
                 //     this.$message.error('文件限制只可上传一个')
                 //     return false
                 // }
-                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
@@ -2741,18 +2766,23 @@
             handleUploadedFile(){
                 this.fileMadel = true
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
-
+                this.fileInfoHandle()
                 this.saveLoading = true
                 let _formData = new FormData()
                 _formData.append('id', this.bpnId || '')
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
+                _formData.append('taskIds', this.taskIds)
                 _formData.append('prcType', 'buss1')
                 _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
@@ -2762,7 +2792,7 @@
                     roleForm: this.roleForm,
                     commentText: this.formTongGuo.commentText
                 }))
-                saveTaskFirst(_formData).then(res => {
+                saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
                     this.bpnId = res.result
@@ -2969,6 +2999,20 @@
                     this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
                     this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
                     this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    const dateArr = []
+                    if(item.commentCycleStart && item.commentCycleEnd){
+                        dateArr[0] = processForm.commentCycleStart
+                        dateArr[1] = processForm.commentCycleEnd
+                        this.commentCycleDate = dateArr
+                    }
+
+                    this.footFileList=this.assemble(item.footFile,item.footFileName);
+                    this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
+                    this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
+                    this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
+                    this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
+                    this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
+                    this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
                     this.formKey++
                 })
             },
@@ -3024,22 +3068,13 @@
                         }).then(res => {
                             if (res) {
                                 const processForm = JSON.parse(res.mesg)
-                                const dateArr = []
+                                if (processForm.form === undefined) {
-                                if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                                    this.getFormFieldList(processForm)
-                                    dateArr[0] = processForm.commentCycleStart
+                                } else {
-                                    dateArr[1] = processForm.commentCycleEnd
+                                    //表单文件处理
-                                    this.commentCycleDate = dateArr
+                                    this.getTaskId(processForm)
                                 }
 
-                                this.getFormFieldList(processForm)
-                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
-                                this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
-                                this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
-                                this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
-                                this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
-                                this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
-                                this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
-                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -3047,38 +3082,21 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
+                this.$http.get("lawss/activiti/get_list_by_instance", {
-                    Promise.all([this.getTaskId()]).then((value) => {
+                    prcNum: this.$route.query.prcNum,
-                        if(value[0] &&value.length > 0){
+                    sortWord: this.shunxu ? this.paixu : "",
-                            let mes = JSON.parse(value[0].mes)
+                    shunxu: this.shunxu
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+                }, {
-                            this.form = mes.form
+                    loading: "loading",
-                            this.taskIds = mes.taskIds;
+                    _this: this
-                            this.pId = mes.pId;
+                }, res => {
-                            this.userId = mes.userId;
+                    this.detailData = res
-                            this.prcNum = mes.prcNum;
+                }, e => {
-                            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 => {})
-                    })
                 })
             },
         },
         mounted () {
-            this.getTaskId()
+            // this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -680,6 +680,8 @@ export default {
         reviewer: "",
         draftTime: "",
         isSubTime: "",
+        resPerson: "", // 评审责任人
+        drafter: "", // 起草人
         planStatus: "0",
         mergeReason: "",
         company: "",
@@ -988,12 +990,12 @@ export default {
           unIdList.push(item)
         }
       })
-      if(this.roleType === '1'){
+      if(this.type === '1'){
         this.$set(this.qbfsForm, 'drafter', idList)
         this.$set(this.qbfsForm, 'drafterName', nameList)
         this.$set(this.qbfsForm, 'unit', unIdList.join(','))
         this.$set(this.qbfsForm, 'unitName', unNameList.join(','))
-      }else if(this.roleType === '2'){
+      }else if(this.type === '2'){
         this.$set(this.qbfsForm, 'resPerson', idList)
         this.$set(this.qbfsForm, 'resPersonName', nameList)
       }

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

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

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

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

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

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

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

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

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

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

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

@@ -403,7 +403,6 @@
                 <el-table-column
                   prop="putTime"
                   label="实施日期"
-                  sortable
                   width="120"
                 >
                   <template slot-scope="scope">

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -115,7 +115,6 @@
           <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>
@@ -261,22 +260,28 @@ export default {
         if (item.passInfo !== 0) {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
           let fileData = JSON.parse(JSON.stringify(item)).dockUserList
-          for (let i = 0; i<fileData.length; i++) {
+          this.dataList = fileData[0].standardInfoList
-            if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
+          this.standardInfoList = this.dataList
-              this.dataList = fileData[0].standardInfoList
+          this.textarea = JSON.parse(JSON.stringify(item)).textarea
-              this.standardInfoList = this.dataList
+          /* 注释掉的代码 是因为后端已经分配过数据 前端不需要再做处理*/
-              this.textarea = JSON.parse(JSON.stringify(item)).textarea
+          // for (let i = 0; i<fileData.length; i++) {
-            }
+          //   if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
-          }
+          //     this.dataList = fileData[0].standardInfoList
+          //     this.standardInfoList = this.dataList
+          //     this.textarea = JSON.parse(JSON.stringify(item)).textarea
+          //   }
+          // }
         } else {
           let fileData = JSON.parse(JSON.stringify(item)).dockUserList
-          for (let i = 0; i<fileData.length; i++) {
+          this.dataList = fileData[0].standardInfoList
-            if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
+          this.standardInfoList = this.dataList
-              this.dataList = fileData[i].standardInfoList
+          // for (let i = 0; i<fileData.length; i++) {
-              this.standardInfoList = this.dataList
+          //   if (fileData[i].name.slice(0,fileData[i].name.indexOf('(')) === this.$store.getters.userInfo.userName) {
-              // this.textarea = JSON.parse(JSON.stringify(item)).commentText
+          //     this.dataList = fileData[0].standardInfoList
-            }
+          //     this.standardInfoList = this.dataList
-          }
+          //     // this.textarea = JSON.parse(JSON.stringify(item)).commentText
+          //   }
+          // }
         }
       })
     },

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

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

src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue

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

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

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

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

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

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

@@ -107,7 +107,7 @@
           </el-table-column>
           <el-table-column align="center" label="任务受理人" prop="assignee">
           </el-table-column>
-          <el-table-column align="center" label="创建时间" prop="createTime" sortable="custom">
+          <el-table-column align="center" label="创建时间" prop="createTime" >
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>

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

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

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

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

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

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