Merge branch 'fix_bug_first_stage'

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -29,10 +29,10 @@
               <div class="title-text" :title="$t('areaOfResponsibility')">
                 <span>{{ $t('areaOfResponsibility') }}</span>
               </div>
-              <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
-                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
-                                 :type="'select'"
-                                 :triggerChange="false" :dictCode="'duty_territory'"/>
+              <j-multi-select-tag class="box-input" v-model="queryParam.dutyTerritory"
+                                  :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
+                                  :type="'select'"
+                                  :triggerChange="false" :dictCode="'duty_territory'"/>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -200,7 +200,7 @@
         class="tableList"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 170px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 186px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -273,6 +273,9 @@
            <span v-else>--</span>
         </span>
       </a-table>
+      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+        {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+      </div>
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -1386,9 +1389,15 @@
         if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') {
           roleCode = 0
         }
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
         let query = {
           ...this.queryParamQuery,
-          ...this.queryParam,
+          ...queryParam,
           projectLibraryId: this.$route.query.id,
           roleCode: roleCode
         }
@@ -2257,6 +2266,14 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+  .buttom-box {
+    width: 100%;
+    text-align: right;
+    font-size: 16px;
+    font-weight: 500;
+    color: #000F16;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {