Merge remote-tracking branch 'origin/develop' into develop

src/components/roleTree/index.vue

@@ -62,6 +62,7 @@
             </el-tree>
             <div id="roleFormButton" class="demo-drawer-footer">
                 <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消</el-button>
             </div>
             <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>

src/pages/details/otherStandardDetails/index.vue

@@ -408,12 +408,14 @@
                   </template>
                 </p>
                 <el-button
-                    v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
+                    v-for="itemNam in itemExistList"
+                    v-if="child.attrField === itemNam "
                     @click="showItemsModel(child.attrField)"
                     class="decomposition-btn"
                     icon="icon-separate"
                 >标准分解单
                 </el-button>
+
               </div>
             </div>
 
@@ -519,6 +521,7 @@
       </div>
       <div class="content">
         <el-table
+            @sort-change='sort'
             ref="multipleTable"
             :data="standItemList"
             tooltip-effect="dark"
@@ -535,6 +538,7 @@
               align="center">
           </el-table-column>
           <el-table-column
+              sortable="custom"
               show-overflow-tooltip
               prop="itemsNum"
               label="条款号"
@@ -593,21 +597,28 @@
           </el-table-column>
           <el-table-column
               prop="dutyEngineer"
-              label="责任工程师">
+              label="责任工程师"
+              width="100">
           </el-table-column>
           <el-table-column
+              show-overflow-tooltip
               prop="comparedWithPrevious"
               label="基于上一版本差异"
               width="150">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
-              prop="complianceRequire"
+              label="符合性状态"
-              label="符合性状态">
+              width="100">
+            <template slot-scope="scope">
+              {{scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-'}}
+            </template>
           </el-table-column>
           <el-table-column
+              show-overflow-tooltip
               prop="complianceState"
-              label="合规性分析">
+              label="合规性分析"
+              width="100">
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
@@ -1229,6 +1240,7 @@ export default {
   },
   data() {
     return {
+      itemExistList:[],
       interpretationContent: '',
       relatedTermsDrawerVisible: false,
       btnLoading: false,
@@ -1256,6 +1268,8 @@ export default {
       knowType: '',
       KnowTitle: '',
       knowIdList: '',
+      order:'',
+      orderBy:'',
       total7: 0,
       page7: 1,
       pageSize7: this.$store.getters.userInfo.configContent,
@@ -2120,6 +2134,8 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
+          this.itemExistList=this.sarStandardsInfoEO.attrInfoMap.itemExistList;
+          console.log("hllo",this.sarStandardsInfoEO);
           if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
             this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
           }
@@ -2340,13 +2356,18 @@ export default {
         }.bind(this)
       })
     },
+    sort(column){
+        this.order=column.order;
+        this.orderBy=column.prop;
+        this.selectSarStandItems();
+    },
     // 分解单----查看标准条款相关
     selectSarStandItems(id, flag) {
       this.standItemSearch.standId = this.sarStandardsInfoEO.id
       this.standItemSearch.fileType = this.fileType
       this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
         ...this.standItemSearch,
-        pageSize: this.pageSize7, page: this.page7,
+        pageSize: this.pageSize7, page: this.page7,order:this.order,orderBy:this.orderBy
       }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
@@ -3079,7 +3100,6 @@ export default {
         justify-content: space-between;
         height: 50px;
         border-bottom: 1px solid #E5E5E5;
-
         .modular-header-title {
           font-size: 18px;
           font-weight: bold;

src/pages/home1/components/release/index.vue

@@ -2,9 +2,11 @@
 <template>
   <div class="release">
     <ul>
-      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
+      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
+        <div style="height: 18px;">
           <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-        <span class="time">{{item.issueTime }}</span>
+          <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+        </div>
       </li>
     </ul>
   </div>
@@ -66,6 +68,12 @@ export default {
           _this: this
         }, res => {
           this.standardReleaseList = res.data
+          let arr = res.data
+          arr.forEach(item => {
+            if(item.standName !== ""){
+              this.standardReleaseList.push(item)
+            }
+          })
         }, e => {
         })
       },
@@ -93,3 +101,4 @@ export default {
     }
   }
 </style>
+

src/pages/home1/components/solicitopinions/index.vue

@@ -2,9 +2,11 @@
 <template>
   <div class="solicitopinions">
     <ul>
-      <li v-for="item in domesticDynamics" :key="item.id" class="time-title" v-if="updateTime < item.endTime">
+      <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
+        <div style="height: 18px">
           <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
           <span class="time">{{ item.endTime }}</span>
+        </div>
       </li>
     </ul>
   </div>
@@ -27,22 +29,9 @@ export default {
   mounted() {
     this.getDate();
     this.getAdvice();
-    this.addDate();
+    // this.addDate();
   },
   methods: {
-    //获取当前年月日
-    addDate() {
-      const nowDate = new Date();
-      const date = {
-        year: nowDate.getFullYear(),
-        month: nowDate.getMonth() + 1,
-        date: nowDate.getDate()
-      };
-      const newmonth = date.month > 10 ? date.month : "0" + date.month;
-      const day = date.date > 10 ? date.date : "0" + date.date;
-      this.updateTime = date.year + "-" + newmonth + "-" + day;
-      console.log("当前时间" + this.updateTime);
-    },
     //截取时间
     getDate(date) {
       return date != null ? date.substring(0, date.indexOf(" ")) : "";
@@ -51,11 +40,16 @@ export default {
     getAdvice() {
       this.$http.get("slrs/sar-public-idea/SelectAllPage", {
         page: 1,
-        size: 1000,
+        size: 1000
       }, {
         _this: this
       }, res => {
-        this.domesticDynamics = res.data.records
+        let arr = res.data.records;
+        arr.forEach(item => {
+          if (item.cname !== "") {
+            this.domesticDynamics.push(item);
+          }
+        });
       }, e => {
 
       });

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

@@ -621,19 +621,18 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '标准法规部经理审批') {
+            this.$router.push({
+              name: 'xmqdqrStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
-          // else if (row.taskInfo === '上传佐证材料填写信息') {
-          //   this.$router.push({
-          //     name: 'wfhxzgStep4',
-          //     query: {
-          //       taskIds: row.taskIds,
-          //       prcId: row.prcId,
-          //       prcNum: row.prcNum,
-          //       prcName: row.prcName,
-          //       prcType: row.prcType
-          //     }
-          //   })
-          // }
           break
 
       }

src/pages/localTool/standContrast/index.vue

@@ -51,12 +51,14 @@
                 align="center">
               </el-table-column>
               <el-table-column
+                show-overflow-tooltip
                 prop="oldStandNum"
                 label="旧文档文本号"
                 align="center"
               >
               </el-table-column>
               <el-table-column
+               show-overflow-tooltip
                 prop="oldStandName"
                 label="旧文档文本名称"
                 align="center">
@@ -67,11 +69,13 @@
                 align="center">
               </el-table-column>
               <el-table-column
+                show-overflow-tooltip
                 prop="newStandNum"
                 label="新文档文本号"
                 align="center">
               </el-table-column>
               <el-table-column
+                show-overflow-tooltip
                 prop="newStandName"
                 label="新文档文本名称"
                 align="center">

src/pages/localTool/standardWarning.vue

@@ -109,7 +109,7 @@
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -172,7 +172,7 @@
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -237,7 +237,7 @@
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
                     <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -301,7 +301,7 @@
                 </el-table-column>
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                     <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
                   </template>
                 </el-table-column>

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -85,6 +85,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -243,6 +245,7 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                foldFormFlag: false,
                 fileMadel2: false,
                 nodeList: [],
                 nodeList2: [],
@@ -314,6 +317,9 @@
             ProcessTitle
         },
         methods: {
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getData () {
                 queryTaskFirst({
                     bpnId: this.$route.query.bpnId

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

@@ -21,7 +21,7 @@
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
-          <div class="prc-content-border">
+          <div class="prc-content-border" v-if="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
               </el-col>
             </el-row>
           </div>
+          <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+          <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         </el-form>
         <ProcessTitle>
           <template slot="title">调研信息</template>
@@ -199,6 +201,7 @@ export default {
   name: "bzdyStep1-9",
   data() {
     return {
+      foldFormFlag: false,
       histortData: [],
       commentText: '',
       tableData: [],
@@ -230,6 +233,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
           <ProcessTitle>
             <template slot="title">基础信息</template>
           </ProcessTitle>
-          <div class="prc-content-border">
+          <div class="prc-content-border" v-if="foldFormFlag === false">
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -85,6 +85,8 @@
               </el-col>
             </el-row>
           </div>
+          <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+          <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
         </el-form>
       </div>
       <el-collapse accordion>
@@ -244,6 +246,7 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      foldFormFlag: false,
       fileMadel2: false,
       commentText: '',
       nodeList: [],
@@ -316,6 +319,9 @@ export default {
     ProcessTitle
   },
   methods: {
+    foldForm() {
+      this.foldFormFlag = !this.foldFormFlag
+    },
     checkedRole2 (data) {
       var idList = ''
       var nameList = ''

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -71,6 +71,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -152,9 +154,17 @@
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 @save="handleSave"
+                show-transfer
+                @transfer="handleTransfer"
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <Role-tree
                 is-title="选择责任部门对接人"
                 :is-visible.sync="modalshowflag2"
@@ -168,12 +178,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep2",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -209,6 +222,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -60,6 +60,17 @@
                                         - -
                                     </div>
                                 </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <ProcessTitle>
+                        <template slot="title">调研回执</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -80,6 +91,13 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
+                                <el-form-item label="回执说明" prop="title" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.dyhz"
+                                            placeholder="请输入回执说明"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -163,10 +181,18 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     class="upload-demo"
@@ -193,12 +219,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep3",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -207,6 +236,7 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
+                    dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
@@ -232,6 +262,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -304,6 +370,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.json.dyhz = this.form.dyhz
                         this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
@@ -341,6 +408,7 @@
                         this.form.responUserListName = data.form.responUserListName
                         this.form.fileName = data.form.fileName || data.fileName || ''
                         this.form.fileId = data.form.fileId || data.fileId || ''
+                        this.form.dyhz = data.form.dyhz || data.dyhz || ''
                     }).catch(e => {
                     })
                 })

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -71,6 +71,33 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
+                    <ProcessTitle>
+                        <template slot="title">调研回执</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.file" class="fileClass" @click="updateFile(form.file)">
+                                        {{ form.fileName }}
+                                    </div>
+                                    <div v-else>
+                                        - -
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="调研回执" prop="dyhz" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.dyhz"
+                                            placeholder="请输入调研回执"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
                 </el-form>
             </div>
             <el-collapse accordion>
@@ -154,10 +181,18 @@
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
+                show-transfer
+                @transfer="handleTransfer"
                 approval
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
     </div>
 </template>
 
@@ -165,12 +200,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep4",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
@@ -179,6 +217,7 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
+                    dyhz: '',
                     title: '', // 调研标题
                     date: '', // 完成时间
                     modelList: [],
@@ -205,6 +244,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -264,6 +339,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.dyhz = data.dyhz || data.form.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -63,6 +63,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -81,6 +83,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -89,7 +92,7 @@
                                 align="center">
                         </el-table-column>
                         <el-table-column
-                                label="文件"
+                                label="回执文件"
                                 align="center">
                             <template slot-scope="scope">
                                 <div @click="updateFile(scope.row.fileId)" class="fileClass">
@@ -97,6 +100,12 @@
                                 </div>
                             </template>
                         </el-table-column>
+
+                        <el-table-column
+                                prop="dyhz"
+                                label="回执说明"
+                                align="center">
+                        </el-table-column>
                     </el-table>
                 </div>
                 <el-collapse accordion>
@@ -178,10 +187,18 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     class="upload-demo"
@@ -208,12 +225,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,saveTaskForPub} from 'api/process'
+    import {inboundLiaisonDetail,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep5",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -244,6 +264,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,
@@ -342,6 +398,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -74,6 +76,7 @@
                             ref="selection"
                     >
                         <el-table-column
+                                label="序号"
                                 type="index"
                                 width="55"
                                 align="center">
@@ -175,10 +178,18 @@
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @submit="handleSubmit"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     multiple
@@ -204,12 +215,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail} from 'api/process'
+    import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep6",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +255,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -75,6 +77,7 @@
                     >
                         <el-table-column
                                 type="index"
+                                label="序号"
                                 width="55"
                                 align="center">
                         </el-table-column>
@@ -175,10 +178,18 @@
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @submit="handleSubmit"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     multiple
@@ -204,12 +215,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail} from 'api/process'
+    import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep7",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +255,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -76,6 +78,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -175,10 +178,18 @@
                 :saveLoading="saveLoading"
                 @submit="handleSubmit"
                 show-back
+                show-transfer
+                @transfer="handleTransfer"
                 @back="handleSubmitNo"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     multiple
@@ -204,12 +215,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail} from 'api/process'
+    import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep8",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +255,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -21,7 +21,7 @@
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-if="foldFormFlag === false">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
@@ -58,6 +58,8 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
+                    <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
                 </el-form>
                 <ProcessTitle>
                     <template slot="title">调研信息</template>
@@ -76,6 +78,7 @@
                         <el-table-column
                                 type="index"
                                 width="55"
+                                label="序号"
                                 align="center">
                         </el-table-column>
                         <el-table-column
@@ -175,10 +178,18 @@
                 @back="handleSubmitNo"
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @submit="handleSubmit"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
             <el-upload
                     multiple
@@ -204,12 +215,15 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail} from 'api/process'
+    import {inboundLiaisonDetail,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzdyStep9",
         data() {
             return {
+                drawerModal: false,
+                foldFormFlag: false,
                 histortData: [],
                 commentText: '',
                 tableData: [],
@@ -241,6 +255,42 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
+            foldForm() {
+                this.foldFormFlag = !this.foldFormFlag
+            },
             getHistoryData () {
                 this.$http.get('lawss/activiti/get_list_by_instance', {
                     prcNum: this.$route.query.prcNum,

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

@@ -161,12 +161,14 @@
           </template>
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           prop="technicalRequir"
           width="150"
           label="核心技术要求"
           align="center">
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           v-if="sarType === 'INLAND'"
           prop="changePoint"
           width="150"
@@ -174,6 +176,7 @@
           align="center">
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           v-if="sarType === 'FOREIGN'"
           prop="changePoint"
           width="150"
@@ -191,6 +194,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          show-overflow-tooltip
           prop="complianceState"
           width="150"
           label="合规性分析"

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

@@ -258,10 +258,18 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <Role-tree
                 check-box
                 :is-title="drawerTitle"
@@ -286,12 +294,14 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from 'api/process'
+    import {inboundLiaisonDetail, processCreateStand, saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzjdStep2",
         data() {
             return {
+                drawerModal: false,
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
                 itermsConditionsFlag: false,
@@ -331,6 +341,39 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             //折叠/展开基础信息方法
             foldForm() {
               this.foldFormFlag = !this.foldFormFlag
@@ -454,8 +497,13 @@
                         console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let arr

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

@@ -171,7 +171,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求">
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -182,7 +182,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异">
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -194,7 +194,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" >
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
                         </div>
                     </template>
                 </el-table-column>
@@ -214,7 +214,7 @@
                         align="center">
                     <template slot-scope="scope">
                         <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析">
+                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
                         </div>
                     </template>
                 </el-table-column>
@@ -344,10 +344,18 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
+                show-transfer
+                @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-drawer
                 title="批量填写"
                 :visible.sync="modalshowflag"
@@ -359,18 +367,21 @@
                         <el-input
                                 v-model="plForm.technicalRequir"
                                 placeholder="请输入核心技术要求"
+                                maxlength="500"
                         ></el-input>
                     </el-formItem>
                     <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
                         <el-input
                                 v-model="plForm.changePoint"
                                 placeholder="请输入国内标准的差异点"
+                                maxlength="500"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
                         <el-input
                                 v-model="plForm.changePoint"
                                 placeholder="请输入上一版本差异点"
+                                maxlength="500"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
@@ -385,6 +396,7 @@
                         <el-input
                                 v-model="plForm.complianceState"
                                 placeholder="请输入合规性分析"
+                                maxlength="500"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
@@ -430,12 +442,14 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzjdStep3",
         data() {
             return {
+                drawerModal: false,
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
                 itermsConditionsFlag: false,
@@ -488,6 +502,39 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             //折叠/展开基础信息方法
             foldForm() {
               this.foldFormFlag = !this.foldFormFlag
@@ -589,15 +636,23 @@
                                 num6++
                             }
                         }
+                        if (this.form.itemsNum1) {
                             if (num1 > 0) {
                                 this.$message.warning('请输入核心技术要求')
-                        } else if (num2 > 0) {
+                                return
+                            }
+                        } else {
+                            if (num2 > 0) {
                                 if (this.sarType === 'INLAND') {
                                     this.$message.warning('请输入国内标准的差异点')
+                                    return
                                 } else {
                                     this.$message.warning('请输入基于上一版本差异')
+                                    return
                                 }
-                        } else if (num3 > 0) {
+                            }
+                        }
+                        if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
                         } else if (num4 > 0) {
                             this.$message.warning('请输入新车型实施日期')
@@ -634,11 +689,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        console.log(data);
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         let itemList

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

@@ -160,12 +160,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
@@ -173,6 +175,7 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'FOREIGN'"
                         prop="changePoint"
                         width="150"
@@ -190,6 +193,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="complianceState"
                         width="150"
                         label="合规性分析"
@@ -314,9 +318,17 @@
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
+                show-transfer
+                @transfer="handleTransfer"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
@@ -333,12 +345,14 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzjdStep4",
         data() {
             return {
+                drawerModal: false,
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
                 itermsConditionsFlag: false,
@@ -369,6 +383,39 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             //折叠/展开基础信息方法
             foldForm() {
               this.foldFormFlag = !this.foldFormFlag
@@ -438,8 +485,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

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

@@ -160,12 +160,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
@@ -173,6 +175,7 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'FOREIGN'"
                         prop="changePoint"
                         width="150"
@@ -190,6 +193,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="complianceState"
                         width="150"
                         label="合规性分析"
@@ -311,11 +315,19 @@
                 :saveLoading="saveLoading"
                 @save="handleSave"
                 @submit="handleSubmit"
+                show-transfer
+                @transfer="handleTransfer"
                 show-back
                 @back="handleSubmitNo"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
@@ -333,12 +345,14 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzjdStep5",
         data() {
             return {
+                drawerModal: false,
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
                 itermsConditionsFlag: false,
@@ -369,6 +383,39 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             //折叠/展开基础信息方法
             foldForm() {
               this.foldFormFlag = !this.foldFormFlag
@@ -438,8 +485,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

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

@@ -161,12 +161,14 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'INLAND'"
                         prop="changePoint"
                         width="150"
@@ -174,6 +176,7 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         v-if="sarType === 'FOREIGN'"
                         prop="changePoint"
                         width="150"
@@ -191,6 +194,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="complianceState"
                         width="150"
                         label="合规性分析"
@@ -312,9 +316,17 @@
                 :saveLoading="saveLoading"
                 @save="handleSave"
                 @submit="handleSubmit"
+                show-transfer
+                @transfer="handleTransfer"
                 submitBTNText="同意"
         >
         </ProcessFooter>
+        <Role-tree
+                check-box
+                is-title="转办处理人"
+                :is-visible.sync="drawerModal"
+                @checkedRole="checkedRole"
+        ></Role-tree>
         <el-dialog
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
@@ -332,12 +344,14 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+    import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+    import axios from "axios";
 
     export default {
         name: "bzjdStep6",
         data() {
             return {
+                drawerModal: false,
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
                 itermsConditionsFlag: false,
@@ -368,6 +382,39 @@
             ProcessTitle
         },
         methods: {
+            handleTransfer() {
+                this.drawerModal = true
+            },
+            checkedRole (data) {
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             //折叠/展开基础信息方法
             foldForm() {
               this.foldFormFlag = !this.foldFormFlag
@@ -437,8 +484,13 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
-                        this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+                        if (data.form) {
-                        this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+                            this.form.itemsName1 = data.form.itemsName1 || ''
+                            this.form.itemsNum1 = data.form.itemsNum1 || ''
+                        } else {
+                            this.form.itemsName1 = data.itemsName1 || ''
+                            this.form.itemsNum1 = data.itemsNum1 || ''
+                        }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList

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

@@ -299,66 +299,6 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            style="display: none;"
-                                            v-model="form.zbjbdName"
-                                            clearable
-                                    ></el-input>
-                                    <div v-if="form.zbjbdName">
-<!--                                        {{ form.zbjbdName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('zbjbd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('zbjbd')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            style="display: none;"
-                                            v-model="form.bpgName"
-                                            clearable
-                                    ></el-input>
-                                    <div v-if="form.bpgName">
-<!--                                        {{ form.bpgName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('bpg')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('bpg')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
-                                </el-form-item>
                               <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
                                 <el-input
                                     disabled
@@ -389,6 +329,66 @@
                                   </el-button>
                                 </div>
                               </el-form-item>
+                              <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    style="display: none;"
+                                    v-model="form.caName"
+                                    clearable
+                                ></el-input>
+                                <div v-if="form.caName">
+                                  <!--                                        {{ form.caName }}-->
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="margin-left: 10px"
+                                      @click="fileUpload('ca')">
+                                    <i class="el-icon-upload el-icon--right"></i>
+                                    查看已上传的文件
+                                  </el-button>
+                                </div>
+                                <div v-else>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      @click="fileUpload('ca')">
+                                    <i class="el-icon-upload el-icon--right"></i>
+                                    点击上传
+                                  </el-button>
+                                </div>
+                              </el-form-item>
+                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.zbjbdName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.zbjbdName">
+<!--                                        {{ form.zbjbdName }}-->
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('zbjbd')">
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                         查看已上传的文件
+                                        </el-button>
+                                    </div>
+                                    <div v-else>
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                @click="fileUpload('zbjbd')">
+                                          <i class="el-icon-upload el-icon--right"></i>
+                                            点击上传
+                                        </el-button>
+                                    </div>
+                                </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
@@ -421,66 +421,6 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            style="display: none;"
-                                            v-model="form.zqyjgName"
-                                            clearable
-                                    ></el-input>
-                                    <div v-if="form.zqyjgName">
-<!--                                        {{ form.zqyjgName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('zqyjg')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('zqyjg')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
-                                </el-form-item>
-                                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            style="display: none;"
-                                            v-model="form.caName"
-                                            clearable
-                                    ></el-input>
-                                    <div v-if="form.caName">
-<!--                                        {{ form.caName }}-->
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                style="margin-left: 10px"
-                                                @click="fileUpload('ca')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                         查看已上传的文件
-                                        </el-button>
-                                    </div>
-                                    <div v-else>
-                                        <el-button
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('ca')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
-                                </el-form-item>
                               <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
                                 <el-input
                                     disabled
@@ -511,6 +451,66 @@
                                   </el-button>
                                 </div>
                               </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    style="display: none;"
+                                    v-model="form.bpgName"
+                                    clearable
+                                ></el-input>
+                                <div v-if="form.bpgName">
+                                  <!--                                        {{ form.bpgName }}-->
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="margin-left: 10px"
+                                      @click="fileUpload('bpg')">
+                                    <i class="el-icon-upload el-icon--right"></i>
+                                    查看已上传的文件
+                                  </el-button>
+                                </div>
+                                <div v-else>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      @click="fileUpload('bpg')">
+                                    <i class="el-icon-upload el-icon--right"></i>
+                                    点击上传
+                                  </el-button>
+                                </div>
+                              </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    style="display: none;"
+                                    v-model="form.zqyjgName"
+                                    clearable
+                                ></el-input>
+                                <div v-if="form.zqyjgName">
+                                  <!--                                        {{ form.zqyjgName }}-->
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="margin-left: 10px"
+                                      @click="fileUpload('zqyjg')">
+                                    <i class="el-icon-upload el-icon--right"></i>
+                                    查看已上传的文件
+                                  </el-button>
+                                </div>
+                                <div v-else>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      @click="fileUpload('zqyjg')">
+                                    <i class="el-icon-upload el-icon--right"></i>
+                                    点击上传
+                                  </el-button>
+                                </div>
+                              </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -788,20 +788,6 @@
                                       @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
                                   >{{'手动查找'}}</el-button>
                                 </el-form-item>
-                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.yybj"
-                                            placeholder="请输入引用标准"
-                                            clearable
-                                    ></el-input>
-                                    <el-button
-                                            type="primary"
-                                            class="common-button-primary"
-                                            size="mini"
-                                            style="position:absolute;top: 10px;right: 0;"
-                                            @click="selectLaws('yybj'),config.attrName = '引用标准'"
-                                    >{{'手动查找'}}</el-button>
-                                </el-form-item>
                               <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                                 <el-input
                                     v-model="form.cbbh"
@@ -816,6 +802,20 @@
                                     @click="selectLaws('cbbh'),config.attrName = '采标编号'"
                                 >{{'手动查找'}}</el-button>
                               </el-form-item>
+                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.yybj"
+                                            placeholder="请输入引用标准"
+                                            clearable
+                                    ></el-input>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('yybj'),config.attrName = '引用标准'"
+                                    >{{'手动查找'}}</el-button>
+                                </el-form-item>
 <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
 <!--                                    <el-input-->
 <!--                                            v-model="form.byybj"-->

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

@@ -241,17 +241,17 @@
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                              {{ form.bpgName }}
+                              {{ form.ssgName }}
                             </div>
                             <div v-else>
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                              {{ form.ssgName }}
+                              {{ form.caName }}
                             </div>
                             <div v-else>
                               - -
@@ -267,22 +267,6 @@
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                              {{ form.zqyjgName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                              {{ form.caName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
                           <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
                             <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
                               {{ form.jdwjName }}
@@ -291,6 +275,22 @@
                               - -
                             </div>
                           </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                              {{ form.bpgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                              {{ form.zqyjgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
                         </el-col>
                       </el-row>
                     </div>
@@ -469,14 +469,6 @@
                                       <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.xglc"
-                                            placeholder="请输入相关流程"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                               <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
                                 <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
                                   {{ form.glwjName }}
@@ -495,14 +487,6 @@
                                     clearable
                                 ></el-input>
                               </el-form-item>
-                              <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.yybj"
-                                            placeholder="请输入引用标准"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                               <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                                 <el-input
                                     disabled
@@ -511,19 +495,11 @@
                                     clearable
                                 ></el-input>
                               </el-form-item>
-                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
+                              <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
-                                            v-model="form.byybj"
+                                            v-model="form.yybj"
-                                            placeholder="请输入被引用标准"
+                                            placeholder="请输入引用标准"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.chjl"
-                                            placeholder="请输入参会记录"
                                             clearable
                                     ></el-input>
                                 </el-form-item>

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

@@ -234,17 +234,17 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                    {{ form.bpgName }}
+                    {{ form.ssgName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                  <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                    {{ form.ssgName }}
+                    {{ form.caName }}
                   </div>
                   <div v-else>
                     - -
@@ -260,22 +260,6 @@
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                    {{ form.zqyjgName }}
-                  </div>
-                  <div v-else>
-                    - -
-                  </div>
-                </el-form-item>
-                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                    {{ form.caName }}
-                  </div>
-                  <div v-else>
-                    - -
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
                   <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
                     {{ form.jdwjName }}
@@ -284,6 +268,22 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                  <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                    {{ form.bpgName }}
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
+                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                  <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                    {{ form.zqyjgName }}
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -488,14 +488,6 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.yybj"
-                      placeholder="请输入引用标准"
-                      clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
@@ -504,6 +496,14 @@
                       clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      v-model="form.yybj"
+                      placeholder="请输入引用标准"
+                      clearable
+                  ></el-input>
+                </el-form-item>
 <!--                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
 <!--                  <el-input-->
 <!--                      disabled-->

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

@@ -292,34 +292,6 @@
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.bpgName"
-                          clearable
-                  ></el-input>
-                  <div v-if="form.bpgName">
-                    {{ form.bpgName }}
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('bpg')">
-                      重新上传
-                    </el-button>
-                  </div>
-                  <div v-else>
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('bpg')">
-                      点击上传
-                    </el-button>
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
                   <el-input
                           disabled
@@ -348,6 +320,34 @@
                     </el-button>
                   </div>
                 </el-form-item>
+                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      style="display: none;"
+                      v-model="form.caName"
+                      clearable
+                  ></el-input>
+                  <div v-if="form.caName">
+                    {{ form.caName }}
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('ca')">
+                      重新上传
+                    </el-button>
+                  </div>
+                  <div v-else>
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('ca')">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
@@ -378,62 +378,6 @@
                     </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.zqyjgName"
-                          clearable
-                  ></el-input>
-                  <div v-if="form.zqyjgName">
-                    {{ form.zqyjgName }}
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('zqyjg')">
-                      重新上传
-                    </el-button>
-                  </div>
-                  <div v-else>
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('zqyjg')">
-                      点击上传
-                    </el-button>
-                  </div>
-                </el-form-item>
-                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          style="display: none;"
-                          v-model="form.caName"
-                          clearable
-                  ></el-input>
-                  <div v-if="form.caName">
-                    {{ form.caName }}
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            style="margin-left: 10px"
-                            @click="fileUpload('ca')">
-                      重新上传
-                    </el-button>
-                  </div>
-                  <div v-else>
-                    <el-button
-                            type="primary"
-                            class="common-button-primary"
-                            size="mini"
-                            @click="fileUpload('ca')">
-                      点击上传
-                    </el-button>
-                  </div>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
@@ -462,6 +406,62 @@
                     </el-button>
                   </div>
                 </el-form-item>
+                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      style="display: none;"
+                      v-model="form.bpgName"
+                      clearable
+                  ></el-input>
+                  <div v-if="form.bpgName">
+                    {{ form.bpgName }}
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px"
+                        @click="fileUpload('bpg')">
+                      重新上传
+                    </el-button>
+                  </div>
+                  <div v-else>
+                    <el-button
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        @click="fileUpload('bpg')">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.zqyjgName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.zqyjgName">
+                    {{ form.zqyjgName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('zqyjg')">
+                      重新上传
+                    </el-button>
+                  </div>
+                  <div v-else>
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('zqyjg')">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -722,21 +722,6 @@
                       @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
                   >{{'手动查找'}}</el-button>
                 </el-form-item>
-
-                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-                  <el-input
-                      v-model="form.yybj"
-                      placeholder="请输入引用标准"
-                      clearable
-                  ></el-input>
-                  <el-button
-                          type="primary"
-                          class="common-button-primary"
-                          size="mini"
-                          style="position:absolute;top: 10px;right: 0;"
-                          @click="selectLaws('yybj'),config.attrName = '引用标准'"
-                  >{{'手动查找'}}</el-button>
-                </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                   <el-input
                       v-model="form.cbbh"
@@ -751,6 +736,20 @@
                       @click="selectLaws('cbbh'),config.attrName = '采标编号'"
                   >{{'手动查找'}}</el-button>
                 </el-form-item>
+                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                  <el-input
+                      v-model="form.yybj"
+                      placeholder="请输入引用标准"
+                      clearable
+                  ></el-input>
+                  <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="mini"
+                          style="position:absolute;top: 10px;right: 0;"
+                          @click="selectLaws('yybj'),config.attrName = '引用标准'"
+                  >{{'手动查找'}}</el-button>
+                </el-form-item>
 <!--                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
 <!--                  <el-input-->
 <!--                      v-model="form.byybj"-->

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

@@ -228,17 +228,17 @@
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                              {{ form.bpgName }}
+                              {{ form.ssgName }}
                             </div>
                             <div v-else>
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                              {{ form.ssgName }}
+                              {{ form.caName }}
                             </div>
                             <div v-else>
                               - -
@@ -254,22 +254,6 @@
                               - -
                             </div>
                           </el-form-item>
-                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                              {{ form.zqyjgName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
-                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                              {{ form.caName }}
-                            </div>
-                            <div v-else>
-                              - -
-                            </div>
-                          </el-form-item>
                           <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
                             <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
                               {{ form.jdwjName }}
@@ -278,6 +262,22 @@
                               - -
                             </div>
                           </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                              {{ form.bpgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                              {{ form.zqyjgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
                         </el-col>
                       </el-row>
                     </div>
@@ -485,11 +485,11 @@
 
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                              <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                                 <el-input
                                     disabled
-                                            v-model="form.yybj"
+                                    v-model="form.bfbdtbzh"
-                                            placeholder="请输入引用标准"
+                                    placeholder="请输入部分代替标准号"
                                     clearable
                                 ></el-input>
                               </el-form-item>
@@ -501,6 +501,16 @@
                                     clearable
                                 ></el-input>
                               </el-form-item>
+                                <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.yybj"
+                                            placeholder="请输入引用标准"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+
+
 <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
 <!--                                    <el-input-->
 <!--                                            disabled-->

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

@@ -24,12 +24,10 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
+                <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -37,14 +35,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
@@ -52,12 +42,10 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
+                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.fjListId"
                     style="display: none;"
@@ -519,15 +507,6 @@ export default {
         this.total = res.data.count
         this.spinShow = false
       })
-      // var form = this.standCommonlySearch
-      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
-      //   _this: this
-      // }, res => {
-      //   this.standInfoList = res.data.records
-      //   this.total = res.data.total
-      //   this.spinShow = false
-      // }, e => {
-      // })
     },
     pageChange(page) {
       this.standCommonlySearch.page = page
@@ -561,11 +540,10 @@ export default {
           bringData.push(deposit.get(this.selectedList[i]));
         }
         if (bringData[0].standYear) {
-          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
         } else {
-          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
         }
-        this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
@@ -680,6 +658,9 @@ export default {
     }
   }
 
+  .el-input__icon {
+    width: 15px;
+  }
   position: relative;
   height: 100%;
 

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

@@ -24,26 +24,16 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
+                <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
                     placeholder="请输入标准编号"
                     clearable
-                  ></el-input>
+                  />
-                </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                          disabled
-                          v-model="form.cname"
-                          placeholder="请输入标准名称"
-                          clearable
-                  ></el-input>
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
@@ -52,18 +42,18 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
+                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
-                  <div class="addButton">
+                  <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
                   </div>
-                </el-form-item>
-                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.fjListId"
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -195,7 +185,8 @@
                   </el-formItem>
                   <el-formItem label="标准类别" prop="standSort" class="search-item">
                     <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
-                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                      <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                        {{ opt.label }}
                       </el-option>
                     </el-select>
                   </el-formItem>
@@ -211,11 +202,13 @@
                       size="mini"
                       class="common-button-primary"
 
-                            @click="sarStandCompareHisInfo">查询</el-button>
+                      @click="sarStandCompareHisInfo">查询
+                    </el-button>
                     <el-button
                       class="common-button-default"
                       size="mini"
-                            @click="clearSearchStand">清空</el-button>
+                      @click="clearSearchStand">清空
+                    </el-button>
                   </el-formItem>
                 </el-form>
               </div>
@@ -235,8 +228,12 @@
                 <el-table-column type="selection" width="55" align="center"/>
                 <el-table-column label="标准号" align="center">
                   <template slot-scope="scope">
-                    <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">
-                    <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                      {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
+                    </div>
+                    <div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                      {{ scope.row.standNumber }}
+                    </div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="cname" label="标准名称" align="center">
@@ -344,9 +341,6 @@ export default {
         endTime: [
           {required: true, message: '请输入标准结束日期', trigger: 'change'},
         ],
-        cname: [
-          { required: true, message: '请输入标准名称', trigger: 'change' },
-        ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},
         ]
@@ -508,15 +502,6 @@ export default {
         this.total = res.data.count
         this.spinShow = false
       })
-      // var form = this.standCommonlySearch
-      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
-      //   _this: this
-      // }, res => {
-      //   this.standInfoList = res.data.records
-      //   this.total = res.data.total
-      //   this.spinShow = false
-      // }, e => {
-      // })
     },
     pageChange(page) {
       this.standCommonlySearch.page = page
@@ -550,13 +535,12 @@ export default {
           bringData.push(deposit.get(this.selectedList[i]));
         }
         if (bringData[0].standYear) {
-          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
         } else {
-          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
         }
         this.form.standType = bringData[0].standType
         this.form.standId = bringData[0].id
-        this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
@@ -678,20 +662,27 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
 @import '~@/assets/styles/mixins';
+
 .bzzqyjStep1 {
   .myForm {
     /deep/ .el-form-item__content {
       line-height: 10px;
     }
   }
+
   /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
+  .el-input__icon {
+    width: 15px;
+  }
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -699,6 +690,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -706,12 +698,14 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -719,33 +713,41 @@ export default {
     height: calc(~'100% - 107px');
     overflow: auto;
   }
+
   .standardForComments {
     height: 100%;
     background: #fff;
+
     .el-divider--horizontal {
       display: block;
       height: 1px;
       width: 100%;
       margin: 0;
     }
+
     flex-direction: column;
+
     .action-bar {
       margin-bottom: 5px;
       padding: 0;
     }
+
     .content {
       flex: auto;
       overflow: hidden;
       display: flex;
       flex-direction: column;
+
       .table-wrap {
         flex: auto;
         overflow: hidden;
         position: relative;
       }
     }
+
     & > .pagination {
       position: static;
+
       /deep/ .pagination-slot {
         padding: 0;
       }

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,7 @@
                           style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
                   </div>
                 </el-form-item>
                 <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
@@ -149,8 +141,16 @@
       :saveLoading="saveLoading"
       @save="handleSave"
       @submit="handleSubmit"
+      show-transfer
+      @transfer="handleTransfer"
     >
     </ProcessFooter>
+    <Role-tree
+            check-box
+            is-title="转办处理人"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+    ></Role-tree>
     <Role-tree
       is-title="选择责任部门对接人"
       :is-visible.sync="modalshowflag"
@@ -164,12 +164,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew} from "api/process";
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep2",
   data() {
     return {
+      drawerModal: false,
       histortData: [],
       commentText: "",
       taskIds: this.$route.query.taskIds,
@@ -206,6 +208,39 @@ export default {
     ProcessTitle
   },
   methods: {
+    handleTransfer() {
+      this.drawerModal = true
+    },
+    checkedRole (data) {
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.userId, // 委托人
+        assignee: data[0].id, // 被委托人
+        pId: this.$route.query.prcId, // 流程实例
+      }).then(res => {
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.processNum()
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
     updataFj (item) {
       let id
       let type = item.fileName.split('.')

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -68,11 +62,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="addModal"
-                               size="mini">新增</el-button>
+                     size="mini">新增
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="addDelete"
-                               size="mini">删除</el-button>
+                     size="mini">删除
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -97,6 +93,7 @@
                     </el-table-column>
                     <el-table-column
                             prop="chapterNumber"
+                            align="center"
                             label="章条编号"
                             width="170px">
                         <template slot-scope="scope">
@@ -105,6 +102,7 @@
                     </el-table-column>
                     <el-table-column
                             prop="chapterName"
+                            align="center"
                             label="章节名称"
                             width="170px">
                         <template slot-scope="scope">
@@ -221,8 +219,16 @@
               :saveLoading="saveLoading"
               @save="handleSave"
               @submit="handleSubmit"
+              show-transfer
+              @transfer="handleTransfer"
       >
       </ProcessFooter>
+      <Role-tree
+              check-box
+              is-title="转办处理人"
+              :is-visible.sync="drawerModal"
+              @checkedRole="checkedRole"
+      ></Role-tree>
     </div>
 </template>
 
@@ -230,12 +236,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
+import {inboundLiaisonDetail, processCreateStand, saveTaskForPub,changeAssigneeNew} from 'api/process'
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep3",
   data() {
     return {
+        drawerModal: false,
       histortData: [],
       idList: [],
       data: [],
@@ -278,6 +286,39 @@
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -293,7 +334,8 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     handleSelectionChange(val) {
       this.idList = []
@@ -396,6 +438,7 @@
           var json = this.json
           json.commentText = this.commentText
           json.info = this.data
+          json.form = this.form
           json.department = this.$store.getters.userInfo.orgName
           this.$http.post('lawss/activiti/completeTask', {
             json: JSON.stringify(json),
@@ -439,6 +482,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep3 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -446,14 +490,21 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
+  .el-input__icon {
+    width: 15px;
+  }
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -461,6 +512,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -468,18 +520,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -487,6 +542,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -81,11 +75,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -110,10 +106,12 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
         </el-table>
@@ -195,6 +193,8 @@
               show-submit
               :submitLoading="isSubmit"
               :saveLoading="saveLoading"
+              show-transfer
+              @transfer="handleTransfer"
               @save="handleSave"
               @submit="handleSubmit"
               show-back
@@ -203,6 +203,12 @@
               submitBTNText="同意"
       >
       </ProcessFooter>
+      <Role-tree
+              check-box
+              is-title="转办处理人"
+              :is-visible.sync="drawerModal"
+              @checkedRole="checkedRole"
+      ></Role-tree>
   </div>
 </template>
 
@@ -210,12 +216,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process'
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep4",
   data() {
     return {
+        drawerModal: false,
       histortData: [],
       data: [],
       commentText: '',
@@ -257,6 +265,39 @@
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -272,12 +313,14 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     handleTabs(name) {
       this.active = name
     },
-            handleSave() {},
+    handleSave() {
+    },
     handleSubmit() {
       this.isSubmit = true
       var json = this.json
@@ -343,6 +386,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep4 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -350,14 +394,18 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -365,6 +413,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -372,18 +421,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -391,6 +443,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -81,11 +75,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -134,14 +130,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div style="margin: 5px 0;">
@@ -239,8 +238,16 @@
       :saveLoading="saveLoading"
       @save="handleSave"
       @submit="handleSubmit"
+      show-transfer
+      @transfer="handleTransfer"
     >
     </ProcessFooter>
+    <Role-tree
+            check-box
+            is-title="转办处理人"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+    ></Role-tree>
   </div>
 </template>
 
@@ -248,12 +255,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, saveTaskForPub, changeAssigneeNew } from "api/process";
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep5",
   data() {
     return {
+      drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -296,6 +305,39 @@ export default {
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -410,7 +452,7 @@ export default {
             item.type = false;
           });
           this.json = data;
-          this.data = data.summaryList
+          this.data = data.info
           if (data.introduce) {
           } else {
             this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -93,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -122,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>
@@ -218,10 +217,18 @@
       @submit="handleSubmit"
       show-back
       @back="handleSubmitNo"
+      show-transfer
+      @transfer="handleTransfer"
       approval
       submitBTNText="同意"
     >
     </ProcessFooter>
+    <Role-tree
+            check-box
+            is-title="转办处理人"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+    ></Role-tree>
   </div>
 </template>
 
@@ -229,12 +236,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep6",
   data() {
     return {
+      drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -280,6 +289,39 @@ export default {
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -387,13 +429,14 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg);
-          this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-          this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-          this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-          data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -68,11 +62,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                               size="mini">导出汇总单</el-button>
+                     size="mini">导出汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                               size="mini">导出征求意见搞</el-button>
+                     size="mini">导出征求意见搞
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -91,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -120,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>
@@ -218,8 +219,16 @@
       @back="handleSubmitNo"
       approval
       submitBTNText="同意"
+      show-transfer
+      @transfer="handleTransfer"
     >
     </ProcessFooter>
+      <Role-tree
+              check-box
+              is-title="转办处理人"
+              :is-visible.sync="drawerModal"
+              @checkedRole="checkedRole"
+      ></Role-tree>
   </div>
 </template>
 
@@ -227,12 +236,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process'
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep7",
   data() {
     return {
+        drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -275,6 +286,39 @@
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -290,7 +334,8 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     upload(row, title) {
       var params = {
@@ -314,7 +359,8 @@
           item.stateText = '不上报'
         }
       })
-                this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
+      })
     },
     stateText(row) {
       if (row === '1') {
@@ -326,7 +372,8 @@
     handleTabs(name) {
       this.active = name
     },
-            handleSave() {},
+    handleSave() {
+    },
     handleSubmit() {
       if (this.data.length < 1) {
         this.$message.warning('请输入征求意见搞')
@@ -376,13 +423,14 @@
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-                        this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-                        this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-                        this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-                        this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-                        data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }
@@ -403,6 +451,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep7 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -410,14 +459,18 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -425,6 +478,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -432,18 +486,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -451,6 +508,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.cname"
-                                            placeholder="请输入标准名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                                        <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -68,11 +62,13 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(data, '汇总单.xls')"
-                               size="mini">导出汇总单</el-button>
+                     size="mini">导出汇总单
+          </el-button>
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                               size="mini">导出征求意见搞</el-button>
+                     size="mini">导出征求意见搞
+          </el-button>
         </div>
         <el-table
           ref="multipleTable"
@@ -91,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -120,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>
@@ -216,10 +217,18 @@
       @submit="handleSubmit"
       show-back
       @back="handleSubmitNo"
+      show-transfer
+      @transfer="handleTransfer"
       approval
       submitBTNText="同意"
     >
     </ProcessFooter>
+      <Role-tree
+              check-box
+              is-title="转办处理人"
+              :is-visible.sync="drawerModal"
+              @checkedRole="checkedRole"
+      ></Role-tree>
   </div>
 </template>
 
@@ -227,12 +236,14 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+import {inboundLiaisonDetail, processCreateStand,changeAssigneeNew} from 'api/process'
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep8",
   data() {
     return {
+        drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -275,6 +286,39 @@
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -290,7 +334,8 @@
         prcNum: this.$route.query.prcNum,
       }, {}, res => {
         this.histortData = res
-                }, e => {})
+      }, e => {
+      })
     },
     upload(row, title) {
       var params = {
@@ -314,7 +359,8 @@
           item.stateText = '不上报'
         }
       })
-                this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
+      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
+      })
     },
     stateText(row) {
       if (row === '1') {
@@ -326,7 +372,8 @@
     handleTabs(name) {
       this.active = name
     },
-            handleSave() {},
+    handleSave() {
+    },
     handleSubmit() {
       if (this.data.length < 1) {
         this.$message.warning('请输入征求意见搞')
@@ -376,13 +423,14 @@
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-                        this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-                        this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-                        this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-                        this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-                        data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }
@@ -404,6 +452,7 @@
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .bzdyStep8 {
   /deep/ .el-drawer__container {
     .prc-content-border {
@@ -411,14 +460,18 @@
       padding: 0 20px 0;
     }
   }
+
   .fileClass {
     cursor: pointer;
   }
+
   .fileClass:hover {
     color: #0c91e5;
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -426,6 +479,7 @@
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -433,18 +487,21 @@
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -452,6 +509,7 @@
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

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

@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="24">
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                     disabled
                     v-model="form.cid"
@@ -32,14 +32,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.cname"
-                    placeholder="请输入标准名称"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -54,7 +46,9 @@
                     style="display: none;"
                   ></el-input>
                   <div style="display: flex;">
-                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      {{ item.fileName }}
+                    </div>
                   </div>
                 </el-form-item>
               </el-col>
@@ -93,11 +87,13 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            align="center"
             label="章条编号"
             width="170px">
           </el-table-column>
           <el-table-column
             prop="chapterName"
+            align="center"
             label="章节名称">
           </el-table-column>
           <el-table-column
@@ -122,14 +118,17 @@
           </el-table-column>
           <el-table-column
             prop="department"
+            align="center"
             label="提出部门">
           </el-table-column>
           <el-table-column
             prop="responUserName"
+            align="center"
             label="提出人">
           </el-table-column>
           <el-table-column
             prop="state"
+            align="center"
             label="处理意见">
             <template slot-scope="scope">
               <div>{{ stateText(scope.row.state) }}</div>
@@ -220,8 +219,16 @@
       @back="handleSubmitNo"
       approval
       submitBTNText="同意"
+      show-transfer
+      @transfer="handleTransfer"
     >
     </ProcessFooter>
+    <Role-tree
+            check-box
+            is-title="转办处理人"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRole"
+    ></Role-tree>
   </div>
 </template>
 
@@ -229,12 +236,14 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, processCreateStand } from "api/process";
+import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
+import axios from "axios";
 
 export default {
   name: "bzzqyjStep9",
   data() {
     return {
+      drawerModal: false,
       histortData: [],
       oldData: [],
       data: [],
@@ -277,6 +286,39 @@ export default {
     ProcessTitle
   },
   methods: {
+      handleTransfer() {
+          this.drawerModal = true
+      },
+      checkedRole (data) {
+          changeAssigneeNew({
+              taskId: this.$route.query.taskIds, // 任务id
+              userId:this.$store.getters.userInfo.userId, // 委托人
+              assignee: data[0].id, // 被委托人
+              pId: this.$route.query.prcId, // 流程实例
+          }).then(res => {
+              if (res.success) {
+                  this.drawerModal = false
+                  this.$message.success('调整成功')
+                  this.processNum()
+                  this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+              } else {
+                  this.$message.warning(res.message)
+              }
+          })
+      },
+      // 请求转换流程图
+      processNum (row) {
+          axios.request({
+              url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+              responseType: 'blob',
+              method: 'get',
+              params: {
+                  prcNum: this.$route.query.prcNum
+              }
+          }).then(res => {
+              this.processStep = window.URL.createObjectURL(res.data)
+          })
+      },
     updataFj(item) {
       let id
       let type = item.fileName.split('.')
@@ -381,13 +423,14 @@ export default {
           pId: this.pId
         }).then(res => {
           let data = JSON.parse(res.mesg)
-          this.form.cid = data.cid
+          this.form.fjList = data.fjList || data.form.fjList
-          this.form.endTime = data.endTime
+          this.form.fjListId = data.fjListId || data.form.fjListId
-          this.form.cname = data.cname
+          this.form.cid = data.cid || data.form.cid;
-          this.form.fjList = data.fjList
+          this.form.endTime = data.endTime || data.form.endTime;
-          this.form.fjListId = data.fjListId
+          this.form.cname = data.cname || data.form.cname;
+          this.oldData = JSON.parse(JSON.stringify(data.info))
           var arr = []
-          data.summaryList.forEach( item => {
+          data.info.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }

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

@@ -28,14 +28,16 @@
               </el-form-item>
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  @click.native="handlePreview(listForm)"
+                  readonly
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  @click.native="handlePreview(listForm)"
+                  readonly
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
                 ></el-input>
@@ -399,6 +401,8 @@ export default {
   },
   data() {
     return {
+      //用来判断提交事件条件是否满足
+      satisfyFlag: true,
       active: "1",
       standModel: false,
       sarAccessListDatas: [],
@@ -699,14 +703,19 @@ export default {
     //提交事件
     handleSubmit() {
       if (this.dataList.length < 1) {
+        this.satisfyFlag = false
         this.$message.warning("请添加产品线信息");
       }
       this.dataList.forEach(item => {
         if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+          this.satisfyFlag = false
           this.$message.warning("请选择分发责任人");
-        } else {
+        }
+      });
+      if(this.satisfyFlag){
+        this.isSubmit = true;
+        this.listForm.commentText = this.commentText;
         var json = Object.assign(this.listForm, this.roleForm);
-          this.isSubmit = true
         this.$refs["listForm"].validate((valid) => {
           if (valid) {
             this.$refs["roleForm"].validate((valid) => {
@@ -726,23 +735,21 @@ export default {
                         this.$message.success(res.message);
                         this.$router.push("/processCenter");
                       }
-                        this.isSubmit = false
+                      this.isSubmit = false;
                     });
                   }
                 });
               } else {
-                  this.isSubmit = false
+                this.isSubmit = false;
                 return this.$message.warning("请完善人员信息");
               }
             });
           } else {
-              this.isSubmit = false
+            this.isSubmit = false;
             return this.$message.warning("请完善基础信息");
           }
         });
       }
-      });
-
     },
     //选择拆分标准取消事件
     closeDrawer() {

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

@@ -25,26 +25,28 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  readonly
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  readonly
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                 ></el-input>
@@ -69,10 +71,6 @@
             width="55"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="条款号">
-          </el-table-column>
           <el-table-column
             prop="productLine"
             label="产品线">
@@ -284,6 +282,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -303,7 +312,6 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
-        console.log(item);
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName

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

@@ -25,28 +25,30 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -402,6 +404,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //点击查看详情
+    handlePreview(item){
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank")
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -424,7 +437,7 @@ export default {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
+        this.listForm.id = item.id
         this.dataList = item.dataList
       })
     },

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

@@ -28,14 +28,16 @@
               </el-form-item>
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  @click.native="handlePreview(listForm)"
+                  readonly
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  @click.native="handlePreview(listForm)"
+                  readonly
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
                 ></el-input>
@@ -387,6 +389,8 @@ export default {
   },
   data() {
     return {
+      //用来判断提交事件条件是否满足
+      satisfyFlag: true,
       active: "1",
       standModel: false,
       sarAccessListDatas: [],
@@ -672,12 +676,16 @@ export default {
     //提交事件
     handleSubmit() {
       if (this.dataList.length < 1) {
+        this.satisfyFlag = false
         this.$message.warning("请添加产品线信息");
       }
       this.dataList.forEach(item => {
         if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+          this.satisfyFlag = false
           this.$message.warning("请选择分发责任人");
-        } else {
+        }
+      });
+      if(this.satisfyFlag){
         this.isSubmit = true;
         this.listForm.commentText = this.commentText;
         var json = Object.assign(this.listForm, this.roleForm);
@@ -715,8 +723,6 @@ export default {
           }
         });
       }
-      });
-
     },
     //选择拆分标准取消事件
     closeDrawer() {

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

@@ -25,26 +25,28 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  readonly
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  disabled
+                  readonly
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                 ></el-input>
@@ -69,10 +71,6 @@
             width="55"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="条款号">
-          </el-table-column>
           <el-table-column
             prop="productLine"
             label="产品线">
@@ -352,6 +350,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -371,7 +380,6 @@ export default {
      */
     getFormFieldList (item) {
       this.$nextTick(() => {
-        console.log(item);
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName

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

@@ -25,28 +25,30 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -57,7 +59,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发落实人
+            </el-button>
           </div>
         </div>
         <el-table
@@ -122,7 +125,8 @@
             align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.implementerId" style="display: none;" />
-              <el-input v-model="scope.row.implementer" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)"/>
+              <el-input v-model="scope.row.implementer" placeholder="请选择落实人"
+                        @click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)" />
             </template>
           </el-table-column>
         </el-table>
@@ -274,8 +278,8 @@ export default {
       tabValue: "listOfCountries",
       selectedList: [],  //选择清单的选择框
       selectList: [], //选择标准的选择框
-      lsIndex: '',
+      lsIndex: "",
-      lsType: '',
+      lsType: "",
       bringData: [],
       commentText: "", //填写会签意见
       page: 1,
@@ -289,7 +293,7 @@ export default {
         qualityEngineer: "", //质量工程师
         breakdownList: [{    //分解单数据
           implementer: "",
-          implementerId:'',
+          implementerId: "",
           applyArctic: "",
           busStandCover: "",
           claimType: "",
@@ -302,7 +306,7 @@ export default {
         }],
         dataList: [{
           implementer: "",
-          implementerId:'',
+          implementerId: "",
           projectLine: "", //产品线
           uname: "",//产品线责任人
           distributePerson: "", //分发责任人
@@ -327,7 +331,7 @@ export default {
       },
       roleForm: {
         implementer: "",
-        implementerId: "",
+        implementerId: ""
       },
       choiceForm: {}, //选择标准清单列表
       user1: "",
@@ -341,44 +345,44 @@ export default {
   methods: {
     //确认转办
     checkedTransferRole(data) {
-      this.assigneeNewLoading = true
+      this.assigneeNewLoading = true;
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         assignee: data[0].id, // 被委托人
         userId: this.$store.getters.userInfo.userId, // 委托人
         pId: this.$route.query.prcId // 流程实例
       }).then(res => {
-        this.isTransfer = false
+        this.isTransfer = false;
         if (res.success) {
-          this.drawerModal = false
+          this.drawerModal = false;
-          this.$message.success('调整成功')
+          this.$message.success("调整成功");
           this.$router.push("/processCenter");
-          this.processNum()
+          this.processNum();
         } else {
-          this.$message.warning(res.message)
+          this.$message.warning(res.message);
         }
-      })
+      });
     },
     // 请求转换流程图
     processNum(row) {
       axios.request({
-        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        url: "/api/lawss/activiti/getImg?_t=" + new Date().getTime(),
-        responseType: 'blob',
+        responseType: "blob",
-        method: 'get',
+        method: "get",
         params: {
           prcNum: this.$route.query.prcNum
         }
       }).then(res => {
         // let blob = new Blob([res.data], {type: 'image/jpg'})
         // let url = window.URL.createObjectURL(res.data)
-        this.processStep = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data);
-      })
+      });
     },
     //转办事件
     handleTransfer() {
-      this.drawerModal = true
+      this.drawerModal = true;
-      this.drawerTitle = '转办处理人'
+      this.drawerTitle = "转办处理人";
-      this.selectPeople = row
+      this.selectPeople = row;
     },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -397,13 +401,23 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //点击查看详情
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -425,12 +439,11 @@ export default {
         this.listForm.breakdownList = [];
         for (let i = 0; i < item.pepdtos.length; i++) {
           for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
-            console.log(item.pepdtos[i].xCXSSRQ === null);
             if (item.pepdtos[i].xCXSSRQ === null) {
-              item.pepdtos[i].xCXSSRQ = ''
+              item.pepdtos[i].xCXSSRQ = "";
             }
             if (item.pepdtos[i].zCCSSRQ === null) {
-              item.pepdtos[i].zCCSSRQ = ''
+              item.pepdtos[i].zCCSSRQ = "";
             }
             this.listForm.breakdownList.push({
               itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -449,54 +462,55 @@ export default {
               qualityEngineerName: item.pepdtos[i].qualityEngineerName,
               standNumber: item.pepdtos[i].standNumber,
               standName: item.pepdtos[i].standName,
+              id: item.pepdtos[0].id,
               xCXSSRQ: item.pepdtos[i].XCXSSRQ,
-              zCCSSRQ : item.pepdtos[i].ZCCSSRQ,
+              zCCSSRQ: item.pepdtos[i].ZCCSSRQ
             });
           }
         }
       } else {
-        this.listForm = item.form
+        this.listForm = item.form;
-        this.listForm.breakdownList = item.form.breakdownList
+        this.listForm.breakdownList = item.form.breakdownList;
       }
 
     },
     checkedRole(data) {
       if (this.type === 1) {
-        this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id
+        this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id;
-        this.listForm.breakdownList[this.lsIndex].implementer = data[0].name
+        this.listForm.breakdownList[this.lsIndex].implementer = data[0].name;
       } else if (this.type === 2) {
         this.listForm.breakdownList.forEach(item => {
           this.selectList.forEach(items => {
             if (item === items) {
-              item.implementerId = data[0].id
+              item.implementerId = data[0].id;
-              item.implementer = data[0].name
+              item.implementer = data[0].name;
             }
-          })
+          });
-        })
+        });
       }
-      this.modalshowflag = false
+      this.modalshowflag = false;
     },
     cancleUserInfo() {
       this.modalshowflag = false;
     },
     choiceZRRS(row, type, index) {
-      this.type = type
+      this.type = type;
       if (type === 1) {
-        this.drawerTitle = '选择责任人'
+        this.drawerTitle = "选择责任人";
-        this.nodeList = []
+        this.nodeList = [];
-        this.lsIndex = index
+        this.lsIndex = index;
-        this.lsType = type
+        this.lsType = type;
-        this.nodeList.push(row)
+        this.nodeList.push(row);
-        this.modalshowflag = true
+        this.modalshowflag = true;
       } else if (type === 2) {
         // 批量
         if (this.selectList.length > 0) {
-          this.lsType = type
+          this.lsType = type;
-          this.nodeList = []
+          this.nodeList = [];
-          this.modalshowflag = true
+          this.modalshowflag = true;
-          this.drawerTitle = '批量选择责任人'
+          this.drawerTitle = "批量选择责任人";
         } else {
-          this.$message.warning('请选择要分发的数据')
+          this.$message.warning("请选择要分发的数据");
         }
       }
     },
@@ -507,24 +521,24 @@ export default {
     },
 
     //保存事件
-    // handleSave() {
+    handleSave() {
-    //   this.saveLoading = true;
+      this.saveLoading = true;
-    //   let _formData = new FormData();
+      let _formData = new FormData();
-    //   _formData.append("id", this.bpnId || "");
+      _formData.append("id", this.bpnId || "");
-    //   _formData.append("prcType", "5");
+      _formData.append("prcType", "5");
-    //   _formData.append('taskIds', this.taskIds)
+      _formData.append("taskIds", this.taskIds);
-    //   _formData.append("json", JSON.stringify({
+      _formData.append("json", JSON.stringify({
-    //     form: this.listForm,
+        form: this.listForm,
-    //     commentText: this.commentText
+        commentText: this.commentText
-    //   }));
+      }));
-    //   saveTaskForPub(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
-    //     this.saveLoading = false;
+        this.saveLoading = false;
-    //     this.$message.success("保存成功");
+        this.$message.success("保存成功");
-    //     this.bpnId = res.result;
+        this.bpnId = res.result;
-    //   }).catch(e => {
+      }).catch(e => {
-    //     this.saveLoading = false;
+        this.saveLoading = false;
-    //   });
+      });
-    // },
+    },
     //提交事件
     handleSubmit() {
       this.listForm.breakdownList.forEach(item => {
@@ -543,7 +557,7 @@ export default {
         this.listForm.approvalOpinion = "";
         this.listForm.signFlag = "";
         const json = JSON.stringify(this.listForm.breakdownList);
-        this.isSubmit = true
+        this.isSubmit = true;
         this.$http.post("lawss/activiti/completeTask", {
           taskIds: this.taskIds,
           userId: this.userId,
@@ -555,7 +569,7 @@ export default {
             this.$message.success(res.message);
             this.$router.push("/processCenter");
           }
-          this.isSubmit = false
+          this.isSubmit = false;
         }, e => {
         });
       } else {
@@ -573,7 +587,7 @@ export default {
     },
     //标准表格选择框改变
     selectStandChange(data) {
-      this.selectList = data
+      this.selectList = data;
     },
     selectThree() {
 

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

@@ -25,28 +25,30 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -370,6 +372,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -490,6 +494,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //点击查看详情
+    handlePreview(item){
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank")
+    },
     //将时间戳转换为日期格式
     getLocalTime(item) {
       return new Date(parseInt(item) * 1000).toLocaleDateString().replace(/:\d{1,2}$/, " ");
@@ -507,7 +522,6 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
-          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg);
             this.getFormFieldList(processForm);
@@ -543,6 +557,7 @@ export default {
           this.listForm["id"] = item.id;
           this.listForm.standName = item.step3DTOS[0].standName;
           this.listForm.standNumber = item.step3DTOS[0].standNumber;
+          this.listForm.id = item.step3DTOS[0].id;
           this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName;
           this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName;
           this.listForm.itemsName = item.step3DTOS[0].itemsName;

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

@@ -25,28 +25,30 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -334,6 +336,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -468,6 +472,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //点击查看详情
+    handlePreview(item){
+    let routeUrl = this.$router.resolve({
+      name: "OtherStandardDetails",
+      params: {
+        id: item.id,
+        pageType: "INLAND_STAND"
+       }
+    });
+    window.open(routeUrl.href, "_blank")
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -490,10 +505,10 @@ export default {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
         this.dataList = item.dataList
         this.listForm.standName = item.standName
         this.listForm.standNumber = item.standNumber
+        this.listForm.id = item.id
         this.listForm.qualityEngineerName = item.qualityEngineerName
         this.listForm.certifiedEngineerName = item.certifiedEngineerName
         this.listForm.responsibleUnit = item.responsibleUnit

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

@@ -25,28 +25,30 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -333,6 +335,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -467,6 +471,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //点击查看详情
+    handlePreview(item){
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank")
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -489,8 +504,8 @@ export default {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
         this.dataList = item.dataList
+        this.listForm.id = item.step3DTOS[0].id
         this.listForm.standName = item.step3DTOS[0].standName
         this.listForm.standNumber = item.step3DTOS[0].standNumber
         this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName

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

@@ -25,28 +25,30 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  disabled
+                  readonly
+                  @click.native="handlePreview(listForm)"
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
-                  disabled
+                  readonly
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -333,6 +335,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
@@ -467,6 +471,17 @@ export default {
     handleTabs(name) {
       this.active = name;
     },
+    //点击查看详情
+    handlePreview(item){
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank")
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -489,7 +504,7 @@ export default {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
+        this.listForm.id = item.id
         this.dataList = item.dataList
       })
     },

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -316,6 +316,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -271,6 +271,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -444,6 +444,7 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -316,6 +316,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -318,6 +318,8 @@ export default {
   },
   data() {
     return {
+      nodeList:[],
+      drawerTitle:'',
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,

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

@@ -106,6 +106,19 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+            <el-timeline-item timestamp="选择审批人" placement="top"
+                              :color="roleForm.approveId ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="approveName" style="margin-bottom: 0">
+                  <h4>审批人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.approveId" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.approveName" placeholder="选择法规部经理"
+                              @click.native="choiceZRR('approveId', '选择法规部经理', roleForm.approveId)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
           </el-form>
         </el-timeline>
       </div>
@@ -412,7 +425,9 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         confirmId: "",
-        confirmName: ""
+        confirmName: "",
+        approveId: "",
+        approveName: "",
       },
       //表单验证
       formRules: {
@@ -579,6 +594,9 @@ export default {
       if (this.type === "confirmId") {
         this.roleForm.confirmId = data[0].id;
         this.roleForm.confirmName = data[0].name;
+      }else if(this.type === "approveId"){
+        this.roleForm.approveId = data[0].id;
+        this.roleForm.approveName = data[0].name;
       }
       this.modalshowflag = false;
     },

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

@@ -2,7 +2,7 @@
   <div class="xmqdqr-step2">
     <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>
@@ -253,7 +253,7 @@ import ProcessTitle from "../../components/ProcessTitle";
 import { inboundLiaisonDetail, queryDetail } from "api/process";
 
 export default {
-  name: "xmqdqrStep1-2",
+  name: "xmqdqrStep1-3",
   components: {
     ProcessTitle,
     ProcessHeader,
@@ -348,44 +348,46 @@ export default {
     },
     //动态表单读取
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         if(item.form === undefined){
           this.qdform = JSON.parse(JSON.stringify(item));
           this.qdform.prcNum = this.prcNum;
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
+          this.dataList = item.dataList
           this.projectId = item.projectId
-          this.getStandData();
+          // this.getStandData();
         }else{
           this.qdform = item.form
           this.dataList =item.form.dataList
           this.projectId = item.form.projectId
-          this.getStandData();
+          // this.getStandData();
         }
       });
     },
     //查询清单下的标准
-    getStandData() {
+    // getStandData() {
-      this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
+    //   this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, {
-        _this: this
+    //     _this: this
-      }, res => {
+    //   }, res => {
-        this.dataList = res.data.records;
+    //     this.dataList = res.data.records;
-        this.dataList.forEach(item => {
+    //     this.dataList.forEach(item => {
-          // 责任部门转换
+    //       // 责任部门转换
-          if (item.zrbm !== null || item.zrbm !== "") {
+    //       if (item.zrbm !== null || item.zrbm !== "") {
-            let k = (item.zrbm || "").split(",");
+    //         let k = (item.zrbm || "").split(",");
-            for (let i in this.zrbmOptions) {
+    //         for (let i in this.zrbmOptions) {
-              for (let m = 0; m < k.length; m++) {
+    //           for (let m = 0; m < k.length; m++) {
-                if (this.zrbmOptions[i].value === k[m]) {
+    //             if (this.zrbmOptions[i].value === k[m]) {
-                  k[m] = this.zrbmOptions[i].label;
+    //               k[m] = this.zrbmOptions[i].label;
-                }
+    //             }
-                item.zrbm = k.join(",");
+    //             item.zrbm = k.join(",");
-              }
+    //           }
-            }
+    //         }
-          }
+    //       }
-        });
+    //     });
-      });
+    //   });
-    },
+    // },
     //添加标准勾选框数据
     selectStand(data) {
       this.standList = data;

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

@@ -105,6 +105,19 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+            <el-timeline-item timestamp="选择审批人" placement="top"
+                              :color="roleForm.approveId ? '#66b1ff' : ''">
+              <el-card>
+                <el-form-item prop="approveName" style="margin-bottom: 0">
+                  <h4>审批人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.approveId" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.approveName" placeholder="选择法规部经理"
+                              @click.native="choiceZRR('approveId', '选择法规部经理', roleForm.approveId)"></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
           </el-form>
         </el-timeline>
       </div>
@@ -412,7 +425,9 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
         confirmId: "",
-        confirmName: ""
+        confirmName: "",
+        approveId: "",
+        approveName:"",
       },
       //表单验证
       formRules: {
@@ -430,6 +445,9 @@ export default {
       roleFormRules: {
         confirmName: [
           { required: true, message: "请选择确认人", trigger: "change" }
+        ],
+        approveName: [
+          { required: true, message: "请选择审批人", trigger: "change" }
         ]
       }
     };
@@ -577,6 +595,9 @@ export default {
       if (this.type === "confirmId") {
         this.roleForm.confirmId = data[0].id;
         this.roleForm.confirmName = data[0].name;
+      }else if(this.type === "approveId"){
+        this.roleForm.approveId = data[0].id;
+        this.roleForm.approveName = data[0].name;
       }
       this.modalshowflag = false;
     },

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

@@ -340,7 +340,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="XCXSSRQ"
+                prop="xcxssrqgj"
                 align="center"
                 label="新车型实施日期">
                 <template slot-scope="scope">
@@ -349,7 +349,7 @@
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="ZCCSSRQ"
+                prop="zccssrqgj"
                 align="center"
                 label="在产车实施日期">
                 <template slot-scope="scope">
@@ -423,7 +423,9 @@ export default {
       isTransfer: false,
       // 调整处理人抽屉状态
       drawerModal: false,
+      drawerTitle:'',
       active: "1",
+      nodeList: [],
       loading: false,
       // 当前流程类型(1待办/2已办)
       processType: 1,

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

@@ -0,0 +1,671 @@
+<template>
+  <div class="xmqdqr-step2">
+    <ProcessHeader toggle>
+      <template slot="proName">项目清单确认流程</template>
+      <template slot="proNode">法规部经理审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="qdform"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.projectName"
+                  placeholder="请输入项目名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="detailedListName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="qdform.detailedListName"
+                  placeholder="请输入清单名称"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title style="margin-top:5px; margin-bottom: 5px">
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="65%"
+          @selection-change="selectStandChange"
+          style="width: 100%; border:1px solid #ccc"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            width="200px"
+            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 @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+            width="180px"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            width="190px"
+            align="center"
+            sortable
+            label="标准实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            sortable
+            width="190px"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+            width="180px"
+          >
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppsbm"
+            width="180px"
+            align="center"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="kccvppscn"
+            width="180px"
+            align="center"
+            label="卡车vpps中文名称">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppsbm"
+            width="180px"
+            align="center"
+            label="乘用车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            prop="cycvppscn"
+            width="180px"
+            align="center"
+            label="乘用车vpps中文名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.commentText }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+    <ProcessFooter
+      show-back
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedTransferRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+  </div>
+</template>
+
+<script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, queryDetail } from "api/process";
+
+export default {
+  name: "xmqdqrStep3",
+  components: {
+    ProcessTitle,
+    ProcessHeader,
+    ProcessFooter
+  },
+  data() {
+    return {
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      nodeList: [],
+      drawerTitle: '',
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      isSubmit: false,
+      isTransfer: false,
+      saveLoading: false,
+      projectId: "",
+      detailedId: "",
+      standSortOptions: [],
+      standList: [],
+      projectStand:[],
+      standardData: [],
+      page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
+      total: 0,
+      //查询清单下标准数据
+      standCommonlySearch: {
+        standSort: "",
+        standNumber: "",
+        standType: "",
+        page: 1,
+        Size: this.$store.getters.userInfo.configContent
+      },
+      //表单的数据
+      qdform: {
+        BZFlag: " ", //1审批通过 其他为驳回
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [],//流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      standMap: new Map(),
+      textStatusMap: {}// 文本状态id与name对应
+    };
+  },
+  methods: {
+    //确认转办
+    checkedTransferRole (data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        assignee: data[0].id, // 被委托人
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        pId: this.$route.query.prcId // 流程实例
+      }).then(res => {
+        this.isTransfer = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
+    // 请求转换流程图
+    processNum () {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : "",
+        shunxu: this.shunxu
+      }, {
+        loading: "loading",
+        _this: this
+      }, res => {
+        this.detailData = res;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        if(item.form === undefined){
+          this.qdform = JSON.parse(JSON.stringify(item));
+          this.qdform.prcNum = this.prcNum;
+          this.qdform.prcName = this.prcName;
+          this.dataList = item.dataList
+          this.qdform["id"] = item.id;
+          this.projectId = item.projectId
+          // this.getStandData();
+        }else{
+          this.qdform = item.form
+          this.dataList =item.form.dataList
+          this.projectId = item.form.projectId
+          // this.getStandData();
+        }
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      this.isSubmit = true;
+      this.qdform.passFlag = "0";
+      this.qdform.commentText = this.commentText;
+      this.qdform.dataList = this.dataList
+      const json = JSON.stringify(this.qdform);
+      this.$http.post("lawss/activiti/completeTask", {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
+        }
+        this.isSubmit = false;
+      }, e => {
+      });
+    },
+    //转办事件
+    handleTransfer(){
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+      this.selectPeople = row
+    },
+    //驳回事件
+    beforeBack() {
+      if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
+        this.$message.warning("请填写审批意见");
+      } else {
+        this.qdform.passFlag = "1";
+        this.qdform.commentText = this.commentText;
+        const json = JSON.stringify(this.qdform);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+        }, e => {
+        });
+      }
+    },
+    //添加标准勾选框数据
+    selectStand(data) {
+      this.standList = data;
+    },
+    selectStandChange(data){
+      this.projectStand = data
+    },
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准带入事件
+    okStand() {
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条数据进行添加')
+      }else{
+        this.standList.forEach(item =>{
+          if(item.ssrq === "-"){
+            item.ssrq = ''
+          }
+          if(item.zrbm === '[]'){
+            item.zrbm =''
+          }
+        })
+        this.standList.map(item => {
+          let addIndex
+          addIndex = this.dataList.findIndex(items =>{
+            return items.standId === item.id
+          })
+          if(addIndex > -1){
+            this.$message.warning('请勿重复添加数据')
+          }else{
+            this.dataList.push(item)
+          }
+        })
+
+        this.standModel = false
+      }
+
+    },
+    //添加标准的查询按钮
+    search() {
+      this.getStand();
+    },
+    clearSearch() {
+      this.standCommonlySearch = {
+        standSort: "",
+        standNumber: "",
+        standType: ""
+      };
+      this.getStand();
+    },
+    pageChange(page) {
+      this.page = page;
+      this.getStand();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+      this.getStand();
+    },
+    getStand(data) {
+      this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
+        id: this.detailedId,
+        page: this.page,
+        Size: this.pageSize,
+        ...this.standCommonlySearch
+      }, {
+        _this: this
+      }, res => {
+        if (res.data === null) {
+          this.standardData = "";
+          this.totalDo = "";
+        }
+        this.standardData = res.data.records;
+        this.standardData.forEach(item => {
+          if (item.zccssrqgj === "-") {
+            item.zccssrqgj = "";
+          }
+          if (item.xcxssrqgj === "-") {
+            item.xcxssrq = "";
+          }
+        });
+        this.total = res.data.total;
+      });
+    },
+    // 将文本状态的id与name对应
+    setMap(data) {
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label);
+      });
+    },
+  },
+  computed: {
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
+  },
+  mounted() {
+    this.processTable();
+    this.getData();
+    // 查询各下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", "", {
+      _this: this,
+      loading: "loading"
+    }, res => {
+      this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
+      this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别
+      this.standStateOptions = res.data.WBZTCLASS; // 文本状态
+      this.setMap(this.zrbmMap, res.data.ZRBMCLASS);
+      this.setMap(this.standStateOptions);
+      this.showLocalProductData(this.getLocalPro);
+    }, e => {
+    });
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
+
+.xmqdqr-step2 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>
+

src/pages/processCenter/pages/processDetail/index.vue

@@ -257,7 +257,7 @@ export default {
           this.toProcessDetail('bzzqyjStep1-9',row)
         }else if(prcType === '10'){
           //项目清单确认
-          this.toProcessDetail('xmqdqrStep1-2',row)
+          this.toProcessDetail('xmqdqrStep1-3',row)
         }
       } else {
         this.$message.warning('当前流程未全部办理完成，无法查看')

src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue

@@ -128,7 +128,7 @@
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '强制撤回']">强制撤回</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -856,6 +856,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if(row.taskInfo === '标准法规部经理审批'){
+            this.$router.push({
+              name: 'xmqdqrStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
       }

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -184,7 +184,7 @@
               label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: red"
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
@@ -198,11 +198,12 @@
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
               prop="standName"
               label="标准名称"
             >
               <template slot-scope="scope">
-                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: red">{{ scope.row.standName }}</a>
+                <a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{ scope.row.standName }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333" class="table-jump">{{ scope.row.standName }}</a>
               </template>
             </el-table-column>
@@ -212,7 +213,7 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ formatIssueDate(scope.row.issueTime) }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ formatIssueDate(scope.row.issueTime) }}</span>
                 <span v-else>{{ formatIssueDate(scope.row.issueTime) }}</span>
               </template>
             </el-table-column>
@@ -223,7 +224,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span>
 
               </template>
@@ -235,7 +236,7 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -245,7 +246,7 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
               </template>
             </el-table-column>
@@ -260,7 +261,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: red">{{ textStatusMap[scope.row.textStatus] }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
@@ -1857,7 +1858,6 @@ export default {
         synopsis: '', // 内容摘要
 
 
-
       }, // 分页查询过程中用到的对象
 
       //高级搜索映射
@@ -2392,7 +2392,6 @@ export default {
     },
     popoverHideQuery(ids, attrField) {
       console.log(ids)
-      console.log("-----------------------------")
       console.log(attrField)
     },
     popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2697,8 +2696,6 @@ export default {
       this.$nextTick(() => {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
-          console.log(this.formFieldList, 'assssssssssss')
-          console.log(item, 'itemitemitemitem')
           const formFieldList = this.formFieldList
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           if (this.sarStandardsInfoEO.standSystem) {
@@ -2750,7 +2747,6 @@ export default {
             })
           })
           this.dynamicFormField = displayLocation
-          console.log(this.dynamicFormField)
           this.loading = false
         })
       })
@@ -3003,8 +2999,12 @@ export default {
         userId: this.$store.getters.userInfo.userId
       }, {}, res => {
         if (res.ok) {
+          for (let i in res.data) {
+            let arr = res.data[i].children
+            arr.push(arr.shift())
             this.treeList = res.data
           }
+        }
       })
     },
     // 查询所有菜单
@@ -3138,8 +3138,6 @@ export default {
     },
     // 表格排序
     sortChange(sortObj) {
-      console.log(sortObj.column.order + "======" + sortObj.column.property)
-      console.log(sortObj, '升降序')
       if (sortObj.column.order !== 'normal') {
         this.nowOrder = ''
         this.orderBy = ''
@@ -3551,7 +3549,6 @@ export default {
                 sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
               })
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-              console.log(nowstandinfo, '提交参数')
               this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {
@@ -3629,7 +3626,6 @@ export default {
       formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
       formData.nowOrder = this.nowOrder
       // formData.orderBy = this.orderBy
-      console.log(this.selectSarMenu.id)
       // 处理我的收藏和个性化标签传参
       if (this.selectSarMenu.menuName === '我的收藏') {
         formData.menuId = undefined
@@ -3688,7 +3684,6 @@ export default {
             }
             if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
               res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
-              console.log(res.data.list[i].SSRQ);
             }
           }
           this.stahndinfoList = res.data.list
@@ -4876,7 +4871,6 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
-      console.log(this.textStatusMap, '文本状态的值')
     }
   },
   computed: {
@@ -5002,6 +4996,7 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
+
 /deep/ .tree-line {
   .el-tree-node {
     position: relative;
@@ -5082,9 +5077,11 @@ export default {
       /deep/ .el-card__body {
         padding: 0 !important;
       }
+
       .el-card {
         min-width: min-content;
       }
+
       height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
@@ -5133,6 +5130,7 @@ export default {
     .tree {
       left: -200px !important;
     }
+
     .tree-right {
       width: calc(~'100% - 15px') !important;
     }

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

@@ -297,8 +297,9 @@
           >
             <template slot-scope="scope">
 <!--                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>-->
-              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
-              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standCode }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -307,8 +308,9 @@
             label="中文名称"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -317,8 +319,9 @@
             label="英文名称"
           >
             <template slot-scope="scope">
-              <a v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
-              <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+              <a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
             </template>
           </el-table-column>
           <el-table-column
@@ -328,8 +331,9 @@
             width="110"
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
-              <span v-else>{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.issueTime ? scope.row.issueTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -339,8 +343,9 @@
             width="110"
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
-              <span v-else>{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">{{scope.row.putTime ? scope.row.putTime.slice(0, 10) : ''}}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -352,10 +357,13 @@
             >
 
               <template slot-scope="scope">
-                <span v-if="scope.row.standStatusShow === '作废' ||scope.row.standStatusShow === '参考' " style="color: red">
+                <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C">
                   {{scope.row.standStatusShow}}
                 </span>
-                <span v-else>
+                <span v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C">
+                  {{scope.row.standStatusShow}}
+                </span>
+                <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'">
                   {{scope.row.standStatusShow}}
                 </span>
               </template>
@@ -4149,6 +4157,7 @@ export default {
         .el-card{
           min-width: min-content;
         }
+        height: 95%;
         width: 95%;
         position: absolute;
         left: 0;

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -102,8 +102,11 @@
                     class="common-button-default"
                     size="mini"
                     v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'"
-                    @click="clearAllSearch('standCommonlySearch')">清空</el-button>
+                    @click="clearAllSearch('standCommonlySearch')">清空
-                  <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询</el-button>
+                  </el-button>
+                  <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+                    <i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'">&#xe7a5;</i>高级查询
+                  </el-button>
                 </el-form-item>
               </el-form>
             </div>
@@ -119,33 +122,40 @@
                    size="mini"
                    @click="addModal"
                    v-btn-permission="'ceb5fb1e00'"
-                     :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增</el-button>
+                   :disabled="addBtnDisabled"><i class="iconfont">&#xe84e;</i>新增
+        </el-button>
         <el-button class="common-button-default in-button"
                    size="mini"
                    :loading="searching"
                    @click="addImportModal(1)"
-                     v-btn-permission="'FQ5ECZ286K'"><i class="iconfont">&#xe6de;</i>导入</el-button>
+                   v-btn-permission="'FQ5ECZ286K'"><i class="iconfont">&#xe6de;</i>导入
+        </el-button>
         <el-button class="common-button-default export-button"
                    size="mini"
                    @click="exportStandard()"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
-                     v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出</el-button>
+                   v-btn-permission="'8871ed1be74cf65851659514880bb50a'"><i class="iconfont">&#xe6e9;</i>导出
+        </el-button>
         <el-button class="common-button-default delete-button"
                    :loading="delLoading"
                    size="mini"
                    @click="deleteStand(2)"
-                     v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+                   v-btn-permission="'4d01342db0f56f01bfceaee7b46904f4'"><i class="iconfont">&#xe61b;</i>批量删除
+        </el-button>
         <el-button class="common-button-default"
                    size="mini"
                    @click="deleteStandFromKind(2)"
-                     v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准</el-button>
+                   v-btn-permission="'29bf24bbd156c06f136cc89b1c7b2bb0'"><i class="iconfont">&#xe611;</i>移除标准
+        </el-button>
         <el-button class="common-button-default"
                    size="mini" :loading="searching"
                    @click="uploadImportModal(1)"
-                     v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载</el-button>
+                   v-btn-permission="'4mFaJU3fTS'"><i class="iconfont">&#xe825;</i>模板下载
+        </el-button>
         <el-button class="common-button-default"
                    size="mini" @click="configurationStandard"
-                     v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准</el-button>
+                   v-btn-permission="'590049684c0af005c6b3d1f0ebcf897e'"><i class="iconfont">&#xe669;</i>配置标准
+        </el-button>
       </div>
       <div class="content">
         <div class="table-wrap">
@@ -171,11 +181,15 @@
               label="标准号"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
-                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+                    scope.row.standSortShow
+                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                  {{ scope.row.standNumber }}</a>
               </template>
             </el-table-column>
             <el-table-column
+              show-overflow-tooltip
               prop="standName"
               label="标准名称"
             >
@@ -189,10 +203,8 @@
               width="110px"
               label="发布日期">
               <template slot-scope="scope">
-                <div>
+                <div style="color: #2d8cf0">
-                  <a>
                     {{ formatIssueDate(scope.row.issueTime) }}
-                  </a>
                 </div>
               </template>
             </el-table-column>
@@ -203,7 +215,7 @@
               label="实施日期">
               <template slot-scope="scope">
                 <!--                {{ formatIssueDate(scope.row.putTime) }}-->
-                <a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a>
+                <span style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
 
               </template>
             </el-table-column>
@@ -213,7 +225,7 @@
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>
+                <span style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -222,7 +234,7 @@
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a>
+                <span style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -236,7 +248,7 @@
               <!--                </el-tooltip>-->
               <!--              </template>-->
               <template slot-scope="scope">
-                <a>{{ textStatusMap[scope.row.textStatus] }}</a>
+                <span style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" fixed="right">
@@ -259,9 +271,13 @@
                       >
                         取消收藏
                       </el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">
+                        编辑
+                      </el-dropdown-item>
                       <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
-                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">
+                        删除
+                      </el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -956,8 +972,12 @@
         </div>
         <!--        提交/取消-->
         <div class="demo-drawer-footer">
-          <el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">保存</el-button>
+          <el-button v-show="modalshowtitle === '新增海外标准'" type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="saveBt">
-          <el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">提交</el-button>
+            保存
+          </el-button>
+          <el-button size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveOrUpdateStands" :loading="isSubmit">
+            提交
+          </el-button>
           <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
         </div>
       </el-drawer>
@@ -976,7 +996,8 @@
             class="newSearchBtn"
             @click="getLawsExplainQuoteRow(1,lawsExplainQuoteForm.pageSize, 'search')">
           </el-button>
-          <el-button type="primary" @click="getLawsExplainQuoteRow('')" size="mini" class="searchAngNewBtn">清空查询</el-button>
+          <el-button type="primary" @click="getLawsExplainQuoteRow('')" size="mini" class="searchAngNewBtn">清空查询
+          </el-button>
         </el-form>
         <el-table
           ref="selections"
@@ -1120,8 +1141,11 @@
           @pageChange="pageChangeItems"
           @pageSizeChange="pageSizeChangeItems"></pagination>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button size="mini" class="common-button-primary" icon="el-icon-check" @click="testItemsModel=false">取消</el-button>
+          <el-button size="mini" class="common-button-primary" icon="el-icon-check" @click="testItemsModel=false">取消
-          <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-close" @click="testItemsModellBt">提交</el-button>
+          </el-button>
+          <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-close" @click="testItemsModellBt">
+            提交
+          </el-button>
         </div>
       </el-dialog>
       <!--                  导入模态窗----失败有弹框                       -->
@@ -1155,7 +1179,8 @@
                 <el-formItem label="标准类别" prop="standSort" class="search-item">
                   <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
                              @keyup.enter.native="searchConfiguraStand" clearable>
-                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
+                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
+                      {{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-formItem>
@@ -1242,8 +1267,11 @@
             @pageSizeChange="configuraPageSizeChange"></pagination>
         </div>
         <div class="demo-drawer-footer">
-          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="saveConfigStand">提交</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" :loading="isSubmit" @click="saveConfigStand">
-          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancelConfigStand">取消</el-button>
+            提交
+          </el-button>
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="cancelConfigStand">取消
+          </el-button>
         </div>
       </el-drawer>
       <!--                树---新增二级菜单模态窗                 -->
@@ -1274,8 +1302,10 @@
             icon="el-icon-check"
             :loading="isSubmit"
             @click="newMenu"
-          >提交</el-button>
+          >提交
-          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetTreeDialog">取消</el-button>
+          </el-button>
+          <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="resetTreeDialog">取消
+          </el-button>
         </div>
       </el-dialog>
       <!--   分享           -->
@@ -1292,7 +1322,9 @@
           </dept-tree>
         </div>
         <div class="demo-drawer-footer">
-          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="shareStandardBt">提交</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="shareStandardBt">
+            提交
+          </el-button>
           <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="treeCancel">取消</el-button>
         </div>
       </el-drawer>
@@ -1347,11 +1379,13 @@
             class="common-button-primary"
             icon="el-icon-check"
             type="primary"
-                  @click="saveProduct('productModelAdd')">提交</el-button>
+            @click="saveProduct('productModelAdd')">提交
+          </el-button>
           <el-button
             class="common-button-default"
             icon="el-icon-close"
-                  @click="closeModal">取消</el-button>
+            @click="closeModal">取消
+          </el-button>
         </div>
       </el-drawer>
       <!-- 组件树-->
@@ -1397,7 +1431,9 @@
           <p v-html="importForm.content"></p>
         </div>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
+          <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">
+            确认
+          </el-button>
         </div>
       </el-dialog>
     </div>
@@ -2111,8 +2147,7 @@ export default {
       filterText: ''
     }
   },
-  props: {
+  props: {},
-  },
   watch: {
     'sarStandardsInfoEO.country': {
       handler(val) {
@@ -2162,7 +2197,6 @@ export default {
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      console.log(checkedData)
       debugger
       if (checkedData) {
         if (checkedData.length > 0) {
@@ -2207,7 +2241,6 @@ export default {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
-      console.log(this.textStatusMap, '外面的文本状态的值')
     },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
@@ -2255,7 +2288,8 @@ export default {
               } else {
                 this.productModal = true
               }
-            }, e => {})
+            }, e => {
+            })
           } else if (this.modalType === 2) {
             this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
               _this: this
@@ -2406,7 +2440,6 @@ export default {
     },
     // 点击查看
     handlePreview(item) {
-      console.log(item);
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
@@ -2440,7 +2473,6 @@ export default {
         Promise.all([this.queryDisplayLocation()]).then((values) => {
           const [displayLocation] = values
           const formFieldList = this.formFieldList
-            console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
           this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
           this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           if (item.country !== undefined && item.country !== null && item.country !== '') {
@@ -2713,8 +2745,12 @@ export default {
         userId: this.$store.getters.userInfo.userId
       }, {}, res => {
         if (res.ok) {
+          for (let i in res.data) {
+            let arr = res.data[i].children
+            arr.push(arr.shift())
             this.treeList = res.data
           }
+        }
       })
     },
     // 树-删除
@@ -3088,7 +3124,8 @@ export default {
         .then(_ => {
           done()
         })
-        .catch(_ => {})
+        .catch(_ => {
+        })
     },
     // 表单清空
     resetForm() {
@@ -3162,8 +3199,6 @@ export default {
 
 
               nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
-                        console.log("nowstandinfo");
-                        console.log(nowstandinfo);
               this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
                 _this: this
               }, res => {
@@ -3175,38 +3210,36 @@ export default {
                     sessionStorage.removeItem('STAND_INLAND')
                   }
 
-                                console.log("hello")
+                  let standardToLawsInfo = {
-                                console.log(formFieldList);
+                    'countryArea': '',
-                                let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''}
+                    'standId': '',
+                    'ssrq': '',
+                    'zccssrqgj': '',
+                    'xcxssrqgj': ''
+                  }
                   standardToLawsInfo.countryArea = nowstandinfo.country;
                   standardToLawsInfo.standId = nowstandinfo.id;
                   standardToLawsInfo.ssrq = nowstandinfo.SSRQ;
                   standardToLawsInfo.zccssrqgj = nowstandinfo.ZCCSSRQ;
                   standardToLawsInfo.xcxssrqgj = nowstandinfo.XCXSSRQ;
 
-                                console.log("country")
-                                console.log(standardToLawsInfo);
                   this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws',
                     standardToLawsInfo,
                     {_this: this}
                   )
 
 
-
                 }
               }, e => {
                 this.isSubmit = false
               })
 
 
-
-
-
-
             } else {
               this.isSubmit = false
             }
-                  }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -3374,7 +3407,6 @@ export default {
             }
             if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.SSRQ) {
               res.data.list[i].SSRQ = res.data.list[i].attrInfoMap.SSRQ
-              console.log(res.data.list[i].SSRQ);
             }
           }
           this.stahndinfoList = res.data.list
@@ -3439,7 +3471,8 @@ export default {
             this.zNodesSItem = JSON.parse(JSON.stringify(treeNode))
             this.searchInlandNodes = JSON.parse(JSON.stringify(treeNode))
           }
-        }, e => {})
+        }, e => {
+        })
     },
     // 所属部门选取
     treeDblClick(treeId, treeNode) {
@@ -4115,7 +4148,8 @@ export default {
             this.twoOptions = twoOptions
             // this.resolveFormFieldList()
           }
-        }, e => {})
+        }, e => {
+        })
     },
     /**
      * 展示位置
@@ -4263,8 +4297,14 @@ export default {
           if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
             rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
           } else {
-            rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
+            rule.push({
-          }        }
+              type: 'string',
+              max: item.attrLen,
+              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+              trigger: 'blur'
+            })
+          }
+        }
         if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH' || item.attrField === 'DXBZ') {
           if (item.attrField === 'CBBH') {
             rule.push({type: 'string', validator: this.verify.validateStandardItemNoRepeat, trigger: 'blur'})
@@ -4311,7 +4351,12 @@ export default {
             }
           }
           if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-            rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
+            rule.push({
+              type: 'string',
+              max: item.attrLen,
+              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+              trigger: 'change'
+            })
           }
           if (rule.length > 0) {
             rules[item.attrField] = rule
@@ -4344,7 +4389,12 @@ export default {
             }
           }
           if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
-            rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'})
+            rule.push({
+              type: 'string',
+              max: item.attrLen,
+              message: `${item.attrName}不能超过${item.attrLen}个字符`,
+              trigger: 'change'
+            })
           }
           if (rule.length > 0) {
             rules[item.attrField] = rule
@@ -4575,14 +4625,17 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree-add.png');
   background-size: 100% 100%;
 }
+
 /deep/ .expanded {
   background: url('~@/assets/images/shangqi/img/tree-sub.png');
   background-size: 100% 100%;
 }
+
 /deep/ .is-leaf {
   background-image: none;
   background-size: 100% 100%;
 }
+
 /deep/ .is-leaf-none {
   position: relative;
   display: inline-block;
@@ -4591,6 +4644,7 @@ export default {
   background: url('~@/assets/images/shangqi/img/none-file.png');
   background-size: 100% 100%;
 }
+
 /deep/ .is-show {
   position: relative;
   display: inline-block;
@@ -4599,11 +4653,13 @@ export default {
   background: url('~@/assets/images/shangqi/img/tree.png');
   background-size: 100% 100%;
 }
+
 /deep/ .tree-line {
   .el-tree-node {
     position: relative;
     padding-left: 0px; // 缩进量
   }
+
   .el-tree-node__children {
     padding-left: 16px; // 缩进量
   }
@@ -4619,6 +4675,7 @@ export default {
     border-width: 1px;
     border-left: 1px dashed #858990e0;
   }
+
   // 当前层最后一个节点的竖线高度固定
   .el-tree-node:last-child::before {
     height: 38px; // 可以自己调节到合适数值
@@ -4640,6 +4697,7 @@ export default {
   & > .el-tree-node::after {
     border-top: none;
   }
+
   & > .el-tree-node::before {
     border-left: none;
   }
@@ -4658,31 +4716,38 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
+
 #foreignStandardsAndRegulations {
   //background: #fff;
   display: flex;
   height: 100%;
   position: relative;
+
   .tree-content {
     background: #fff;
     width: 20%;
     position: relative;
+
     .tree {
       /deep/ .el-card__body {
         padding: 0 !important;
       }
+
       .el-card {
         min-width: min-content;
       }
+      height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
       left: 0;
     }
+
     .tree-collapse {
       position: absolute;
       right: 0;
     }
   }
+
   .tree-right {
     overflow-y: hidden;
     padding: 0;
@@ -4691,51 +4756,63 @@ export default {
     height: 100%;
     display: flex;
     flex-direction: column;
+
     .content {
       display: flex;
       flex-direction: column;
       position: relative;
       flex: auto;
+
       .table-wrap {
         flex: auto;
         overflow: hidden;
         display: flex;
         flex-direction: column;
       }
+
       .pagination {
         position: static;
+
         /deep/ .pagination-slot {
           padding: 0;
         }
       }
     }
   }
+
   .tree-close {
     .tree {
       left: -200px !important;
     }
+
     .tree-right {
       width: calc(~'100% - 15px') !important;
     }
+
     .side-bar-collapse {
       background: #5596CC !important;
       color: #FFF;
     }
   }
+
   .tree-closed {
     width: 15px !important;
   }
+
   .el-popover {
     height: 200px;
   }
+
   .el-col-12 {
     //width: 50%;
     //white-space: nowrap;
   }
+
   .form-upload-btn {
     width: 224px;
     //line-height: 20px;
   }
+
   .el-drawer__wrapper {
     .demo-drawer-content {
       .drawer-content {
@@ -4747,9 +4824,11 @@ export default {
     }
   }
 }
+
 .el-textarea__inner {
   line-height: 28px !important;
 }
+
 .btn-col {
   padding-top: 11px;
 }
@@ -4757,47 +4836,61 @@ export default {
 <style lang="less" scoped>
 #foreignStandardsAndRegulations {
   height: 100%;
+
   .tools-bar-wrapper {
     align-items: start;
     margin-bottom: 5px;
   }
+
   .content {
     height: calc(~'100% - 53px - 56px');
     background-color: #fff;
     padding: 0 10px;
-    .table{}
+
+    .table {
     }
+  }
+
   .draw-form-item {
     /deep/ .el-form-item__content {
       //width: 220px;
     }
   }
+
   .config-stands {
     /deep/ .el-form-item {
       margin-bottom: 0;
     }
+
     .pagination {
       bottom: 50px;
     }
   }
+
   .config-drawer {
     margin-top: 5px;
+
     .content {
       padding: 15px 0 0 0px;
+
       .el-table {
         overflow-y: auto;
       }
     }
   }
+
   .advanced-class {
     visibility: hidden;
   }
+
   .advanced-one {
     width: 80px;
   }
+
   .advanced-two {
     //
   }
+
   .advancedSearch-btn {
     padding: 12px 12px;
     color: #ffffff;
@@ -4805,6 +4898,7 @@ export default {
     border: none;
     border-radius: 20px;
   }
+
   .advancedSearch-btn-reduce {
     padding: 12px 12px;
     color: #999;
@@ -4812,9 +4906,11 @@ export default {
     border: 1px solid #DCDFE6;
     border-radius: 20px;
   }
+
   button.el-button.advancedSearch-btn-reduce.el-button--default {
     margin-left: 0;
   }
+
   .advance-dialog {
     .advance-dialog-form {
       /deep/ input.el-input__inner {
@@ -4823,14 +4919,17 @@ export default {
     }
   }
 }
+
 ::v-deep .el-drawer__header {
   & > span:first-child {
     outline: none !important;
   }
 }
+
 ::v-deep .el-drawer {
   outline: none !important;
 }
+
 .label-input-form {
   &.table-lattice {
     /deep/ .el-form-item__label {
@@ -4846,15 +4945,18 @@ export default {
       white-space: nowrap;
       text-overflow: ellipsis
     }
+
     /deep/ .el-input__inner {
       height: 30px;
       line-height: 30px;
       border-radius: 0 !important;
     }
   }
+
   .el-date-editor.el-input, .el-date-editor.el-input__inner {
     width: 190px
   }
+
   .classDisplay {
     display: none;
   }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue

@@ -193,20 +193,24 @@
                 align="center"
                 label="解读内容">
               <el-table-column
+                      show-overflow-tooltip
                       prop="coreTechnicalRequirement"
                       label="核心技术要求(简述、请勿抄写标准)">
               </el-table-column>
               <el-table-column
+                  show-overflow-tooltip
                       v-if="sarProject.position === '1'"
                       prop="comparedWithPrevious"
                       label="相对于上一版本变化点">
               </el-table-column>
               <el-table-column
+                  show-overflow-tooltip
                       v-if="sarProject.position === '2'"
                       prop="comparedDomesticStandard"
                       label="相对于国行标差异点">
               </el-table-column>
               <el-table-column
+                  show-overflow-tooltip
                       prop="complianceState"
                       label="合规性分析">
               </el-table-column>

src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue

@@ -163,7 +163,7 @@
         </el-table-column>
         <el-table-column
         prop="actualCloseTime"
-        width="150"
+        width="130"
         align="center"
         sortable
         label="实际关闭时间">

src/router/index.js

@@ -557,9 +557,18 @@ const routes = [
         }
       },
       {
-        path: '/xmqdqrStep1-2',
+        path: '/xmqdqrStep1-3',
-        name: 'xmqdqrStep1-2',
+        name: 'xmqdqrStep1-3',
-        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-2.vue'),
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step1-3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '项目清单确认流程'
+        }
+      },
+      {
+        path: '/xmqdqrStep3',
+        name: 'xmqdqrStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'),
         meta: {
           requireAuth: true,
           title: '项目清单确认流程'

src/sysConfig/index.js

@@ -4,8 +4,8 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-const devIp = '10.96.10.171'
+const devIp = '62.234.136.153'
-const devInterfacePORT = '9999'
+const devInterfacePORT = '8033'
 // const devIp = '10.5.103.101'
 // const devInterfacePORT = '9999'
 // 云端端口号