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

src/components/roleTree/index.vue

@@ -308,7 +308,8 @@
                             }
                         })
                         this.$http.get('SarInstitution/institution/getNextById', {
-                            ids: ids
+                            ids: ids,
+                            topNum: 3,
                         }, {
                             _this: this
                         }, res => {

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

@@ -321,8 +321,8 @@ export default {
               this.formKey++
           }
           if(data && data.length > 0){
-              const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+              const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-              const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+              const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
               this.qbfsForm.QCDWID = institutionIdList
               this.qbfsForm.QCDW = institutionNameList
           }

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

@@ -316,9 +316,9 @@ export default {
               this.qbfsForm.QCRBUSS=nameList;
               this.formKey++
           }
-          if(data !== undefined && data && data.length > 0){
+         if(data && data.length > 0){
-              const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+            const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-              const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+            const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
             this.qbfsForm.QCDWID = institutionIdList
             this.qbfsForm.QCDW = institutionNameList
          }

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

@@ -1868,11 +1868,13 @@
                 }
 
                 if(data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }
+
+                this.modalShowRoleFlag = false
             },
             checkedRole (data) {
                 if (this.type === 0) {

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

@@ -1340,7 +1340,24 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                    this.formKey++
                 }
+
+                if(data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
+
+                this.modalShowRoleFlag = false
+            },
+            unique(newArr) {
+                const res = new Map();
+                return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
             },
             checkedRole (data) {
                 if (this.type === 0) {

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

@@ -1397,11 +1397,13 @@
                 }
 
                 if(data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }
+
+                this.modalShowRoleFlag = false
             },
             unique(newArr) {
                 const res = new Map();

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

@@ -1485,11 +1485,13 @@
                 }
 
                 if(data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }
+
+                this.modalShowRoleFlag = false
             },
             unique(newArr) {
                 const res = new Map();

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

@@ -1398,11 +1398,13 @@
                 }
 
                 if(data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }
+
+                this.modalShowRoleFlag = false
             },
             unique(newArr) {
                 const res = new Map();

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

@@ -1495,11 +1495,13 @@
                 }
 
                 if(data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }
+
+                this.modalShowRoleFlag = false
             },
             unique(newArr) {
                 const res = new Map();

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

@@ -1790,9 +1790,10 @@
                     this.roleForm.bzUserName = nameList
                 }
 
-                if(data !== undefined && data && data.length > 0){
+                if(data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    console.log(data)
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }

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

@@ -1378,7 +1378,23 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                    this.formKey++
                 }
+                if(data !== undefined && data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
+
+                this.modalShowRoleFlag = false
+            },
+            unique(newArr) {
+                const res = new Map();
+                return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
             },
             checkedRole (data) {
                 if (this.type === 0) {

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

@@ -1433,8 +1433,8 @@
                     this.formKey++
                 }
                 if(data !== undefined && data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }

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

@@ -1768,8 +1768,8 @@
                     this.formKey++
                 }
                 if(data !== undefined && data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }

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

@@ -1640,6 +1640,18 @@
                     this.roleForm.bzUserId = idList
                     this.roleForm.bzUserName = nameList
                 }
+                if(data && data.length > 0){
+                    console.log(data)
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
+                this.modalShowRoleFlag = false
+            },
+            unique(newArr) {
+                const res = new Map();
+                return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
             },
             checkedRole (data) {
                 if (this.type === 0) {

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

@@ -1421,8 +1421,8 @@
                     this.formKey++
                 }
                 if(data !== undefined && data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }

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

@@ -1767,8 +1767,8 @@
                     this.formKey++
                 }
                 if(data !== undefined && data && data.length > 0){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionIdList = this.unique(data.map(item => item.topUnitId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.topUnit)).join(",")
                     this.form.QCDWID = institutionIdList
                     this.form.QCDW = institutionNameList
                 }

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

@@ -856,8 +856,8 @@ export default {
       let idList = "", nameList = ""
       let unitList = "", unitNameList = ""
       data.forEach(item => {
-        unList.push(item.institutionName)
+        unList.push(item.topUnit)
-        uidList.push(item.institutionId)
+        uidList.push(item.topUnitId)
         if (nameList.length) {
           nameList += ",";
           idList += ",";
@@ -866,8 +866,8 @@ export default {
         }
         idList += item.id;
         nameList += item.name;
-        unitList += item.institutionId
+        unitList += item.topUnit
-        unitNameList += item.institutionName
+        unitNameList += item.topUnitId
       });
       let unNameList = []
       let unIdList = []

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

@@ -717,8 +717,8 @@ export default {
         }
         idList += item.id;
         nameList += item.name;
-        unitList += item.institutionId
+        unitList += item.topUnitId
-        unitNameList += item.institutionName
+        unitNameList += item.topUnit
       });
       if(this.roleType === '1'){
         this.$set(this.addQblxData, 'drafter', idList)

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

@@ -1254,8 +1254,8 @@ export default {
         }
         idList += item.id;
         nameList += item.name;
-        unitList += item.institutionId
+        unitList += item.topUnitId
-        unitNameList += item.institutionName
+        unitNameList += item.topUnit
       });
       if(this.roleType === '1'){
         this.$set(this.qbfsForm, 'drafter', idList)

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

@@ -22,6 +22,15 @@
               <el-form-item class="add-form-item form-item-disabled" label="项目名称" prop="projectName">
                 <el-input v-model="listForm.projectName" clearable disabled placeholder="请输入项目名称"></el-input>
               </el-form-item>
+              <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                <el-date-picker
+                        :picker-options="pickerOptions"
+                        v-model="listForm.endTime"
+                        type="date"
+                        placeholder="请选择截止日期"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>

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

@@ -36,6 +36,15 @@
                   clearable
                 ></el-input>
               </el-form-item>
+              <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                <el-date-picker
+                        :picker-options="pickerOptions"
+                        v-model="listForm.endTime"
+                        type="date"
+                        placeholder="请选择截止日期"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>

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

@@ -36,6 +36,15 @@
                   clearable
                 ></el-input>
               </el-form-item>
+              <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
+                <el-date-picker
+                        :picker-options="pickerOptions"
+                        v-model="listForm.endTime"
+                        type="date"
+                        placeholder="请选择截止日期"
+                        value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>

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

@@ -108,6 +108,7 @@
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import {inboundLiaisonDetail,processCreateStand,saveTaskForPub,changeAssigneeNew} from 'api/process'
+    import hwh5 from '@/api/hwh5-cloudonline.js'
     import axios from "axios";
 
     export default {
@@ -170,6 +171,7 @@
                         this.drawerModal = false
                         this.$message.success('调整成功')
                         this.processNum()
+                        hwh5.close()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                     } else {
                         this.$message.warning(res.message)
@@ -258,6 +260,7 @@
                         }, {}, res => {
                             if (res.success) {
                                 this.$message.success('提交成功')
+                                hwh5.close()
                                 this.$router.push('/processCenter')
                             }
                             this.isSubmit = false

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -1111,8 +1111,8 @@
                     }
                     idList += item.id
                     nameList += item.name
-                    bmIdList += item.institutionId
+                    bmIdList += item.topUnitId
-                    bmNameList += item.institutionName
+                    bmNameList += item.topUnit
                 })
                 if (this.type === 'resPerson') {
                     this.addForm.resPerson = idList

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -197,19 +197,30 @@
               width="150"
             >
               <template slot-scope="scope">
-                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
-                    scope.row.standSortShow
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
-                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                </a>
-                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
-                    scope.row.standSortShow
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
-                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                </a>
-                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
-                    scope.row.standSortShow
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
-                  }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                </a>
-                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
+                <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
-                    scope.row.standSortShow
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
-                  }}
+                </a>
-                  {{ scope.row.standNumber }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)" >
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+                </a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+                </a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" class="table-jump" @click="handlePreview(scope.row)">
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+                </a>
+                <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
+                  {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+                </a>
               </template>
             </el-table-column>
             <el-table-column
@@ -225,6 +236,9 @@
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standName
                   }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @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>
@@ -243,6 +257,9 @@
                 <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" @click="handlePreview(scope.row)" class="table-jump">{{
                     scope.row.standEnName
                   }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165" @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>
@@ -260,6 +277,9 @@
                 <div v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
+                <div v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">
+                  {{ formatIssueDate(scope.row.issueTime) }}
+                </div>
                 <div v-else style="color: #333333">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </div>
@@ -277,6 +297,9 @@
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     scope.row.SSRQ
                   }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
+                    scope.row.SSRQ
+                  }}</span>
                 <span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
 
               </template>
@@ -292,6 +315,9 @@
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     scope.row.XCXSSRQ
                   }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
+                    scope.row.XCXSSRQ
+                  }}</span>
                 <span v-else style="color: #333333">{{
                     scope.row.XCXSSRQ
                   }}</span>
@@ -308,6 +334,9 @@
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     scope.row.ZCCSSRQ
                   }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
+                    scope.row.ZCCSSRQ
+                  }}</span>
                 <span v-else style="color: #333333">{{
                     scope.row.ZCCSSRQ
                   }}</span>
@@ -329,6 +358,9 @@
                 <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
+                <span v-else-if="textStatusMap[scope.row.textStatus] === '参考' " style="color: #98E165">{{
+                    textStatusMap[scope.row.textStatus]
+                  }}</span>
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>