Parcourir la source

Merge branch 'develop_yh13' of jianguan-web/jg-ocs-html into pre-release

李磊 il y a 2 ans
Parent
commit
a568f654f0

+ 9 - 1
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -69,6 +69,10 @@ export default {
     useDingDefUser: { // 是否使用最新一次申请人员
       type: Boolean,
       default: false
+    },
+    showDefUser:{
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -143,8 +147,10 @@ export default {
     },
     async getDefAudit(){
       if(!this.useDingDefUser){
+        // 默认写死的人员
         const data = await getDefaultCofig({code:'EXPENSE_ACCOUNT_DING_USER'}).then(res => res.data)
         const ret = JSON.parse(data.value)
+        console.log(ret)
         this.form.approvers = this.getFormatUser(ret.approvers)
         this.form.ccList = this.getFormatUser(ret.ccList)
       }else{
@@ -178,7 +184,9 @@ export default {
         this.$emit('close')
         this.resetForm()
       }else{
-        this.getDefAudit()
+        if(this.showDefUser){
+          this.getDefAudit()
+        }
       }
     }
   }

+ 7 - 2
src/views/salesReturnManagement/billOfLading/add.vue

@@ -181,9 +181,9 @@
       modalTit="选择销退单"
       :chooseData="chooseData"
       :openModal="showXtModal"
-      @cancel="showXtModal=false"></selectXtModal>
+      @cancel="closeModal"></selectXtModal>
     <!-- 选择审核人员 -->
-    <chooseDepartUserModal :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
+    <chooseDepartUserModal :showDefUser="false" :openModal="openDepartUserModal" @close="closeModal" @submit="handleSubmit"></chooseDepartUserModal>
   </div>
 </template>
 
@@ -262,6 +262,11 @@ export default {
     openSelModal () {
       this.showXtModal = true
     },
+    closeModal(){
+      this.openDepartUserModal=false
+      this.showXtModal = false
+      this.spinning = false
+    },
     // 关联销售退货单
     getReturnOrderList () {
       pickUpDetailQueryList({ pickUpSn: this.$route.params.sn }).then(res => {