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

src/views/businessSupport/questionAnswerLibrary/modules/QuizModal.vue

@@ -66,7 +66,7 @@
                         :filter-option="filterOption"
                         v-decorator="[ 'project', validatorRules.project]">
                 <a-select-option :value="undefined" :key="-1">请选择</a-select-option>
-                <a-select-option v-for="item in projectList" :value="item.id" :key="item.id">{{ item.projectName }}</a-select-option>
+                <a-select-option v-for="item in projectList" :value="item.id" :key="item.id" :title="item.projectName">{{ item.projectName }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -208,7 +208,7 @@ export default {
     },
     // 获取项目下拉框数据
     getCarTypeProjectList () {
-      getCarTypeProjectList().then(res => {
+      getCarTypeProjectList({ column: 'createTime', order: 'desc' }).then(res => {
         if (res.success) {
           this.projectList = res.result
         } else {

src/views/enterpriseStandardLibrary/standard/detail/module/SubmitQuestionModal.vue

@@ -23,8 +23,11 @@
         <a-col :span="12">
           <!--          项目-->
           <a-form-item :label="$t('project')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-select :placeholder="$t('pleaseSelect') + $t('project')" v-decorator="['project', validatorRules.project]">
+            <a-select :placeholder="$t('pleaseSelect') + $t('project')"
-              <a-select-option v-for="item in projectSelectOptions" :key="item.id">{{ item.projectName }}</a-select-option>
+                      v-decorator="['project', validatorRules.project]"
+                      show-search
+                      :filter-option="filterOption">
+              <a-select-option v-for="item in projectSelectOptions" :key="item.id" :title="item.projectName">{{ item.projectName }}</a-select-option>
             </a-select>
           </a-form-item>
         </a-col>
@@ -144,7 +147,7 @@ export default {
     },
     // 获取项目下拉框数据
     initProjectOptions () {
-      getCarTypeProjectList().then(res => {
+      getCarTypeProjectList({ column: 'createTime', order: 'desc' }).then(res => {
         if (res.success) {
           this.projectSelectOptions = res.result
         } else {
@@ -176,6 +179,9 @@ export default {
     },
     close () {
       this.visible = false
+    },
+    filterOption (input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     }
   }
 }

src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue

@@ -23,8 +23,11 @@
         <a-col :span="12">
           <!--          项目-->
           <a-form-item :label="$t('project')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-select :placeholder="$t('pleaseSelect') + $t('project')" v-decorator="['project', validatorRules.project]">
+            <a-select :placeholder="$t('pleaseSelect') + $t('project')"
-              <a-select-option v-for="item in projectSelectOptions" :key="item.id">{{ item.projectName }}</a-select-option>
+                      v-decorator="['project', validatorRules.project]"
+                      show-search
+                      :filter-option="filterOption">
+              <a-select-option v-for="item in projectSelectOptions" :key="item.id" :title="item.projectName">{{ item.projectName }}</a-select-option>
             </a-select>
           </a-form-item>
         </a-col>
@@ -146,7 +149,7 @@ export default {
     },
     // 获取项目下拉框数据
     initProjectOptions () {
-      getCarTypeProjectList().then(res => {
+      getCarTypeProjectList({ column: 'createTime', order: 'desc' }).then(res => {
         if (res.success) {
           this.projectSelectOptions = res.result
         } else {
@@ -189,6 +192,9 @@ export default {
     },
     close () {
       this.visible = false
+    },
+    filterOption (input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     }
   }
 }

src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue

@@ -21,12 +21,14 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('treeRight.administrativePrivileges')">
         <user-selection :placeholder="$t('pleaseSelect') + $t('treeRight.administrativePrivileges')"
                         type="checkbox"
+                        :name-str="model.authManageIdsDictText"
                         v-decorator="['authManageIds', validatorRules.authManageIds]" />
       </a-form-item>
       <!--查看权限-->
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('treeRight.checkPermissions')">
         <user-selection :placeholder="$t('pleaseSelect') + $t('treeRight.checkPermissions')"
                         type="checkbox"
+                        :name-str="model.authViewIdsDictText"
                         v-decorator="['authViewIds', validatorRules.authViewIds]" />
       </a-form-item>
       <!--文件夹顺序-->