Merge branch 'develop' of ssh://gitlab.91isoft.com:10022/LAWS/laws-system-front-FOTON 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/bzdy/step1-9.vue

@@ -49,6 +49,38 @@
                     - -
                   </div>
                 </el-form-item>
+                <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.modelList.length > 0">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
+                      <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
+                      <el-button
+                        size="small"
+                        @click="updateFile(item)"
+                        icon="el-icon-download"
+                        style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
+                <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
+                  <div v-if="form.fjList.length > 0">
+                    <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
+                      <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
+                      <el-button
+                        size="small"
+                        @click="updateFile(item)"
+                        icon="el-icon-download"
+                        style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
                 <!--                                <el-form-item label="批准意见" prop="textpz" class="add-form-item form-item-disabled">-->
                 <!--                                    <el-input-->
                 <!--                                            v-model="form.textpz"-->
@@ -206,7 +238,9 @@ export default {
         date: '', // 完成时间
         hzfileId: '',
         hzfileName: '',
-        textpz: ''
+        textpz: '',
+        modelList:[],
+        fjList: []
       },
       formRules: {
         textpz: [
@@ -224,6 +258,10 @@ export default {
     ProcessTitle
   },
   methods: {
+    clickButtonToUpload(file) {
+      const attId = file.attId
+      this.$preview(attId)
+    },
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
     },
@@ -237,6 +275,10 @@ export default {
     updateFile (fileId) {
       window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
     },
+    updateFile2 (item) {
+      let id = item.id
+      window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
+    },
     // 导入按钮 上传之前的钩子
     beginImportFile (file) {
       var filename = file.name

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 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.qbfsForm.QCDWID = institutionIdList
               this.qbfsForm.QCDW = institutionNameList
           }

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

@@ -316,12 +316,12 @@ export default {
               this.qbfsForm.QCRBUSS=nameList;
               this.formKey++
           }
-          if(data !== undefined && data && data.length > 0){
-              const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
-              const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
-              this.qbfsForm.QCDWID = institutionIdList
-              this.qbfsForm.QCDW = institutionNameList
-          }
+         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.qbfsForm.QCDWID = institutionIdList
+            this.qbfsForm.QCDW = institutionNameList
+         }
 
           this.modalShowRoleFlag = false
       },

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 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
                 }
+
+                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 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
                 }
+
+                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 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
                 }
+
+                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 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
                 }
+
+                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 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
                 }
+
+                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){
-                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
-                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                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
                 }

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 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/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 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/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 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/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 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/qbzxdjhgk/component/establish.vue

@@ -856,8 +856,8 @@ export default {
       let idList = "", nameList = ""
       let unitList = "", unitNameList = ""
       data.forEach(item => {
-        unList.push(item.institutionName)
-        uidList.push(item.institutionId)
+        unList.push(item.topUnit)
+        uidList.push(item.topUnitId)
         if (nameList.length) {
           nameList += ",";
           idList += ",";
@@ -866,8 +866,8 @@ export default {
         }
         idList += item.id;
         nameList += item.name;
-        unitList += item.institutionId
-        unitNameList += item.institutionName
+        unitList += item.topUnit
+        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
-        unitNameList += item.institutionName
+        unitList += item.topUnitId
+        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
-        unitNameList += item.institutionName
+        unitList += item.topUnitId
+        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/regulatoryRepository/enterpriseStandardPlan/index.vue

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