lilei 3 anni fa
parent
commit
f73e91d1da

+ 1 - 0
src/views/common/dingDepartUser.js

@@ -108,6 +108,7 @@ const DingDepartUser = {
         if(res.status == 200){
           this.genTreeNode()
         }
+        this.$emit("loaded")
       })
     }
   },

+ 24 - 29
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -19,42 +19,31 @@
             :label-col="formItemLayout.labelCol"
             :wrapper-col="formItemLayout.wrapperCol">
             <a-form-model-item label="审批人员" prop="approvers">
-              <a-row>
-                <a-col span="20">
-                  <dingDepartUser
-                    ref="departUserApp"
-                    id="departUser-approvers"
-                    v-model="form.approvers"
-                    @change="changeApprovers"
-                    allowClear
-                    placeholder="请选择审批人员"
-                  ></dingDepartUser>
-                </a-col>
-                <a-col span="4">
-                  <a-button type="link" shape="round" @click="$refs.departUserApp.updateDeptUser()">刷新人员</a-button>
-                </a-col>
-              </a-row>
+              <dingDepartUser
+                ref="departUserApp"
+                @loaded="uploading=false"
+                id="departUser-approvers"
+                v-model="form.approvers"
+                @change="changeApprovers"
+                allowClear
+                placeholder="请选择审批人员"
+              ></dingDepartUser>
             </a-form-model-item>
             <a-form-model-item label="抄送人" prop="ccList">
-              <a-row>
-                <a-col span="20">
-                  <dingDepartUser
-                    ref="departUserCc"
-                    id="departUser-ccList"
-                    v-model="form.ccList"
-                    allowClear
-                    placeholder="请选择抄送人"
-                  ></dingDepartUser>
-                </a-col>
-                <a-col span="4">
-                  <a-button type="link" shape="round" @click="$refs.departUserCc.updateDeptUser()">刷新人员</a-button>
-                </a-col>
-              </a-row>
+              <dingDepartUser
+                ref="departUserCc"
+                @loaded="uploading=false"
+                id="departUser-ccList"
+                v-model="form.ccList"
+                allowClear
+                placeholder="请选择抄送人"
+              ></dingDepartUser>
             </a-form-model-item>
           </a-form-model>
         </div>
         <div class="btn-cont">
           <a-button type="primary" id="departUser-save" @click="handleSave">确定</a-button>
+          <a-button :loading="uploading" style="margin-left: 15px;" @click="updateUser">刷新人员</a-button>
           <a-button id="departUser-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
         </div>
       </div>
@@ -75,6 +64,7 @@ export default {
   },
   data () {
     return {
+      uploading: false,
       spinning: false,
       isShow: this.openModal, //  是否打开弹框
       title: '',
@@ -97,6 +87,11 @@ export default {
     }
   },
   methods: {
+    updateUser () {
+      this.uploading = true
+      this.$refs.departUserApp.updateDeptUser()
+      this.$refs.departUserCc.updateDeptUser()
+    },
     changeApprovers (value) {
       this.form.approvers = value
       this.$refs.ruleForm.clearValidate()

+ 1 - 1
vue.config.js

@@ -107,7 +107,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.156/ocs-admin',
+        target: 'http://192.168.16.151:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
         // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,