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

src/pages/details/otherStandardDetails/index.vue

@@ -90,7 +90,7 @@
                           </span>
 <!--                          多个文件时-->
                           <span v-else-if="child.value && child.value.length > 0">
-                            <span style="margin-left: 19%">
+                            <div style="margin-left: 15%;margin-top: -60px;line-height: 90px">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -106,7 +106,7 @@
                                   class="icon-download2"
                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                               />
-                            </span>
+                            </div>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <el-button

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

@@ -208,12 +208,15 @@
     <!--        保存||提交-->
     <ProcessFooter
             v-show="verifySarStandard"
-            show-save
+            :show-save="false"
-            show-submit
+            show-over2
-            :saveLoading="saveLoading"
+            show-submit2
+            show-transfer
             :submitLoading="isSubmit"
-            @save="handleSave"
+            :saveLoading="saveLoading"
-            @submit="handleSubmit"
+            @transfer="handleTransfer"
+            @submit2="handle2"
+            @over2="handle1"
     >
     </ProcessFooter>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
@@ -352,6 +355,13 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -560,7 +570,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -2310,6 +2320,37 @@
                     this.rules.commentText[0].required = true;
                 }
             },
+            checkedRoleTransfer (data) {
+                this.assigneeNewLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.assigneeNewLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
+            handle1(){
+                this.formTongGuo.approvalOpinion = 1
+                this.handleSubmit()
+            },
+            handle2(){
+                this.formTongGuo.approvalOpinion = 0
+                this.handleSubmit()
+            },
             handleSubmit() {
                 this.getRule()
                 // const val= this.form.country;

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

@@ -2194,7 +2194,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {

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

@@ -2154,7 +2154,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {

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

@@ -2353,7 +2353,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2371,7 +2371,7 @@
                                     this.isSubmit = true
                                     this.saveLoading = true
                                     this.form.commentText = this.formTongGuo.commentText
-                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     // 会签意见存储
                                     const infoList = []
                                     const info = {}

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

@@ -2394,7 +2394,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2413,7 +2413,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,

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

@@ -314,13 +314,18 @@
     <ProcessFooter
             v-show="verifySarStandard"
             show-save
-            show-submit
+            show-over2
-            :saveLoading="saveLoading"
+            show-submit2
+            show-transfer
             :submitLoading="isSubmit"
+            :saveLoading="saveLoading"
             @save="handleSave"
-            @submit="handleSubmit"
+            @transfer="handleTransfer"
+            @submit2="handle2"
+            @over2="handle1"
     >
     </ProcessFooter>
+    </ProcessFooter>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
         <el-upload
                 multiple
@@ -457,6 +462,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -665,7 +678,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1383,6 +1396,25 @@
                     this.roleForm.hqUserName=nameList;
                 }
             },
+            checkedRoleTransfer (data) {
+                this.assigneeNewLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.assigneeNewLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -2234,6 +2266,22 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
+            handle1(){
+                this.formTongGuo.approvalOpinion = 1
+                this.handleSubmit()
+            },
+            handle2(){
+                this.formTongGuo.approvalOpinion = 0
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.handleSubmit()
+                    }
+                })
+            },
             //保存
             handleSave() {
             this.form.country=this.countryArr;

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

@@ -2333,7 +2333,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2352,7 +2352,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,

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

@@ -2394,7 +2394,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2413,7 +2413,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,

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

@@ -66,7 +66,6 @@
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
-          height="100%"
           ref="selection"
           :data="detailData"
           tooltip-effect="dark"

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

@@ -443,32 +443,34 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
+            <div style="height: calc(100% - 65px); overflow: auto;">
-              :data="productData"
+              <el-table
-              tooltip-effect="dark"
+                :data="productData"
-              style="width: 100%"
+                tooltip-effect="dark"
-              border
+                style="width: 100%"
-              ref="projectTable"
+                border
-              height="100%"
+                ref="projectTable"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
+                @selection-change="selectThree"
-            >
+              >
-              <el-table-column
+                <el-table-column
-                type="selection"
+                  type="selection"
-                width="55"
+                  width="55"
-                align="center">
+                  align="center">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                prop="productLine"
+                  prop="productLine"
-                label="产品线">
+                  label="产品线">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                show-overflow-tooltip
+                  show-overflow-tooltip
-                prop="uname"
+                  prop="uname"
-                label="产品线责任人">
+                  label="产品线责任人">
-              </el-table-column>
+                </el-table-column>
-            </el-table>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"

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

@@ -446,32 +446,34 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
+            <div style="height: calc(100% - 65px); overflow: auto">
-              :data="productData"
+              <el-table
-              tooltip-effect="dark"
+                :data="productData"
-              style="width: 100%"
+                tooltip-effect="dark"
-              border
+                style="width: 100%"
-              ref="projectTable"
+                border
-              height="100%"
+                ref="projectTable"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
+                @selection-change="selectThree"
-            >
+              >
-              <el-table-column
+                <el-table-column
-                type="selection"
+                  type="selection"
-                width="55"
+                  width="55"
-                align="center">
+                  align="center">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                prop="productLine"
+                  prop="productLine"
-                label="产品线">
+                  label="产品线">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                show-overflow-tooltip
+                  show-overflow-tooltip
-                prop="uname"
+                  prop="uname"
-                label="产品线责任人">
+                  label="产品线责任人">
-              </el-table-column>
+                </el-table-column>
-            </el-table>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"

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

@@ -759,6 +759,7 @@ export default {
             }
           }
         });
+        this.$refs.table.clearSelection()
         this.projectModel = false;
       }
 
@@ -778,7 +779,7 @@ export default {
           this.selectList.map(item => {
             let index;
             index = this.breakdownList.findIndex(items => {
-              return items.itemsName === item.itemsName;
+              return items.itemsName === item.itemsName  && items.projectName === item.projectName;
             });
             if (index > -1) {
               this.breakdownList.splice(index, 1);
@@ -874,6 +875,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.breakdownList = this.breakdownList;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "5");

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

@@ -731,6 +731,7 @@ export default {
               item.implementerId = this.$store.getters.userInfo.userId;
               item.implementer = this.$store.getters.userInfo.userName;
             });
+            // this.commentText = ''
             this.dataList = item.step3DTOS;
             this.dataList.forEach(item => {
               this.$set(item,'complianceReasons', '')
@@ -740,6 +741,7 @@ export default {
             })
           } else {
             this.dataList = item.dataList;
+            // this.commentText = ''
             this.dataList.forEach(item => {
               item.implementerId = this.$store.getters.userInfo.userId;
               item.implementer = this.$store.getters.userInfo.userName;
@@ -870,7 +872,7 @@ export default {
     saveBatchEditForm() {
       this.dataList.forEach(item => {
         this.selectList.forEach(items => {
-          if (item.itemNum === items.itemNum) {
+          if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
             item.complianceReasons = this.batchEditForm.complianceReasons;
             //不合规
             item.noCompliance = this.batchEditForm.noCompliance;
@@ -881,6 +883,7 @@ export default {
           }
         });
       });
+      this.$refs.multipleTable.clearSelection()
       this.modalShowFlag = false;
     },
     cancelBatchEditForm() {

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

@@ -568,6 +568,7 @@ export default {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')
       }else{
+        this.isSubmit = true
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
         this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
@@ -584,6 +585,7 @@ export default {
             this.$message.success(res.message)
             this.$router.push('/processCenter')
           }
+          this.isSubmit = false
         }, e => {
         });
       }

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

@@ -553,6 +553,7 @@ export default {
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm.id = item.id
+        // this.commentText = ''
         this.dataList = item.dataList
       })
     },

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

@@ -425,7 +425,7 @@ export default {
             this.$router.push({
               name: 'bussLibrary1',
               query: {
-                type: '1',
+                type: 'buss1',
                 processName: '发起企标制修订流程',
                 bpnId: id,
                 verifySarStandard: true,
@@ -439,7 +439,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProduct2',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -449,7 +449,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProduct3',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -459,7 +459,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProductC3',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -469,7 +469,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProduct6',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -479,7 +479,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProductC6',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -490,7 +490,7 @@ export default {
             this.$router.push({
               name: 'bussLibraryProduct1',
               query: {
-                type: '1',
+                type: 'buss2',
                 processName: '发起企标制修订流程',
                 bpnId: id,
                 verifySarStandard: true,

src/pages/searchCenter/pages/advancedSearch.vue

@@ -975,7 +975,7 @@
                         show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : scope.row.numbershow}}</span>
+                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : filterTitle(scope.row.numbershow)}}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -1912,6 +1912,14 @@
         this.page = 1;
         this.searchSarBykey();
       },
+      filterTitle(title){
+        if(title && (title.indexOf(",") !== -1)){
+          let titleSpt = title.split(",");
+          return titleSpt.length > 1 ? titleSpt[titleSpt.length-1] : titleSpt[0]
+        }else {
+          return title;
+        }
+      },
       judgeRolePermiOnSar(item, type) {
         let pagetype;
         if (type !== 5 && item.type === "msgdyinfo") {

src/pages/searchCenter/pages/standardSearch.vue

@@ -243,7 +243,7 @@
                                 <div v-for="(item,key) in Allitems" :key="key" class="AllBox">
                                     <div class="AllBoxTitle">
                                         <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
-                                        <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
+                                        <span style="cursor:pointer;" class="AllBoxText" v-html="filterTitle(item.title)" @click="toPage(item)"></span>
                                         <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
                                     </div>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
@@ -479,6 +479,14 @@
             itermsConditionsClose () {
                 this.itermsConditionsFlag = false
             },
+            filterTitle(title){
+                if(title && (title.indexOf(",") !== -1)){
+                    let titleSpt = title.split(",");
+                    return titleSpt.length > 1 ? titleSpt[titleSpt.length-1] : titleSpt[0]
+                }else {
+                    return title;
+                }
+            },
             // 跳转
             toPage (item) {
                 // 国内外----两个值