Browse Source

Merge branch 'edit' into live

戴艳蓉 3 years ago
parent
commit
0329f73319
2 changed files with 5 additions and 24 deletions
  1. 2 2
      src/views/interest/handover/addEdit.vue
  2. 3 22
      src/views/interest/handover/index.vue

+ 2 - 2
src/views/interest/handover/addEdit.vue

@@ -25,7 +25,7 @@
             class="demo-ruleForm"
           >
             <el-form-item label="离职人部门" prop="leaves_part">
-              <el-input v-model="ruleForm.leaves_part" :disabled="isDetail" />
+              <all-organize :size="searchSize" />
             </el-form-item>
             <el-form-item label="离职人" prop="leaves">
               <el-input v-model="ruleForm.leaves" :disabled="isDetail" />
@@ -51,7 +51,7 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/interest/account";
+import asyncRequest from "@/apis/service/interest/handover";
 import resToken from "@/mixins/resToken";
 export default {
   name: "Account",

+ 3 - 22
src/views/interest/handover/index.vue

@@ -30,28 +30,9 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-                <!-- <el-col :span="4" style="width: 120px">
-                  <el-select
-                    :size="searchSize"
-                    v-model="parmValue.status"
-                    filterable
-                    clearable
-                    placeholder="账号状态"
-                    style="width: 100%"
-                    @change="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                  >
-                    <el-option
-                      v-for="item in statusList"
-                      :key="'status' + item.code"
-                      :label="item.name"
-                      :value="item.code"
-                    />
-                  </el-select>
-                </el-col> -->
+                <el-col :span="4" style="width: 320px">
+                  <all-organize :size="searchSize" />
+                </el-col>
                 <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"