Merge pull request 'master' (#683) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/683

src/assets/styles/index.scss

@@ -588,23 +588,3 @@ html, body, #app, .el-container, .el-aside, .el-main {
     position: relative;
   }
 }
-//绘制下拉选择框远程搜索时右侧的箭头
-.el-select {
-  .el-select__wrapper {
-    .el-select__suffix::before {
-      content: "";
-      width: 6px;
-      height: 6px;
-      border: solid #a8abb2;
-      border-width: 0 0 1px 1px;
-      transform: translate(-50%, -50%) rotate(-45deg);
-    }
-  }
-
-  .is-focused {
-    .el-select__suffix::before {
-      margin-top: 10px;
-      transform: translate(-50%, -50%) rotate(-225deg) !important;
-    }
-  }
-}

src/components/DetailComponent/ApprovalDetail.vue

@@ -6,7 +6,7 @@
       </el-col>
       <el-form :model="attachmentParam" inline style="margin-top: 15px;margin-left: 15px">
         <el-form-item label="标签" prop="tag">
-          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable remote style="width: 300px">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable  style="width: 300px">
             <el-option
                 v-for="item in tagsOption"
                 :key="item.value"
@@ -567,10 +567,11 @@ watch(() => props.loading, (newVal) => {
       .cell {
         margin-left: -160px !important;
       }
+    }
   }
-}
+
   .el-table__body {
-    .el-table__cell:last-child{
+    .el-table__cell:last-child {
       .cell {
         margin-left: -160px !important;
       }

src/components/DetailComponent/ProjectApply.vue

@@ -6,7 +6,7 @@
       </el-col>
       <el-form :model="attachmentParam" inline style="margin-left: 15px">
         <el-form-item label="标签" prop="tag">
-          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
+          <el-select v-model="attachmentParam.tag" placeholder="请选择标签" clearable filterable  style="width: 300px">
             <el-option
                 v-for="item in tagsOption"
                 :key="item.value"

src/components/TagAndFileUpload.vue

@@ -3,7 +3,7 @@
   <el-form :model="formData" ref="tagForm" label-width="auto" :rules="rules">
     <el-form-item label="标签名称" prop="tagName">
       <el-input v-model="formData.tagName" placeholder="请输入标签名称" style="width: 300px" v-if="showInput"/>
-      <el-select v-model="formData.tagName" placeholder="请选择标签" clearable filterable style="width: 300px" v-else>
+      <el-select v-model="formData.tagName" placeholder="请选择标签" remote clearable filterable style="width: 300px" v-else>
         <el-option
             v-for="item in tagsOption"
             :key="item.label"

src/fvcomponents/fvSearchForm/index.vue

@@ -118,4 +118,30 @@ onMounted(() => {
   justify-content: space-evenly;
   align-items: center;
 }
+
+</style>
+<style lang="scss">
+.search-form{
+  //绘制下拉选择框远程搜索时右侧的箭头
+  .el-select {
+    .el-select__wrapper {
+      .el-select__suffix::before {
+        content: "";
+        width: 6px;
+        height: 6px;
+        border: solid #a8abb2;
+        border-width: 0 0 1px 1px;
+        transform: translate(-50%, -50%) rotate(-45deg);
+      }
+    }
+
+    .is-focused {
+      .el-select__suffix::before {
+        margin-top: 10px;
+        transform: translate(-50%, -50%) rotate(-225deg) !important;
+      }
+    }
+  }
+
+}
 </style>

src/views/expense-management/share/add.vue

@@ -24,7 +24,7 @@
           <el-table-column prop="projectId" label="项目名称" min-width="230">
             <template #default="scope">
               <el-form-item prop="time" :rules="scope.row.projectId?'1':rules.projectId">
-                <el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable filterable>
+                <el-select v-model="scope.row.projectId" placeholder="请选择项目名称" clearable filterable remote>
                   <el-option
                       v-for="item in nameOptions"
                       :key="item.value"

src/views/project-management/implementation/attachment.vue

@@ -3,7 +3,7 @@
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e" label-position="left" label-width="left"></fvForm>
   <el-form :model="attachment" inline style="margin-top: 15px">
     <el-form-item label="标签" prop="tag">
-      <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable remote style="width: 300px">
+      <el-select v-model="attachment.tag" placeholder="请选择标签" clearable filterable style="width: 300px">
         <el-option
             v-for="item in tagsOption"
             :key="item.value"