chenrui 1 gadu atpakaļ
vecāks
revīzija
c45282f8f0

+ 11 - 1
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -41,6 +41,12 @@
                 :id="'cust-'+index"
                 :ref="'custList-'+record.no"
                 placeholder="请选择(输入名称搜索)"></custList>
+              <supplier
+                v-show="record.splitObjType=='SUPPLIER'"
+                style="width: 100%;"
+                enableFlag="1"
+                v-model="record.splitObjSn"
+                placeholder="请选择(输入名称搜索)"></supplier>
               <span v-if="!record.splitObjType">--</span>
             </template>
             <!-- 费用承担金额 -->
@@ -123,8 +129,9 @@ import { VSelect } from '@/components'
 import department from './department.js'
 import employee from './employee.js'
 import custList from '@/views/common/custList.vue'
+import supplier from '@/views/common/supplier.js'
 export default {
-  components: { VSelect, department, employee, custList },
+  components: { VSelect, department, employee, custList, supplier },
   name: 'EpenseCdfModal',
   props: {
     list: { //  弹框显示状态
@@ -188,6 +195,9 @@ export default {
         this.$set(row, 'splitObjName', undefined)
         this.$refs['custList-' + row.no].dealerName = []
       }
+      if (row.splitObjType == 'SUPPLIER') {
+        this.$set(row, 'splitObjSn', undefined)
+      }
       this.$emit('fyTotal', this.fyTotal())
     },
     // 经销商

+ 11 - 11
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -155,9 +155,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaArea:{
+        subareaArea: {
           subareaName: undefined, //  所属区域
-          subareaAreaName: undefined, // 分区
+          subareaAreaName: undefined // 分区
         },
         provinceSn: undefined, // 省份
         provinceName: '',
@@ -197,7 +197,7 @@ export default {
           this.form.cityName = row.cityName
           this.form.subareaArea.subareaName = row.subareaArea.subareaName
           this.form.subareaArea.subareaAreaName = row.subareaArea.subareaAreaName
-          this.subareaList = [row.subareaArea.subareaName,row.subareaArea.subareaAreaName]
+          this.subareaList = [row.subareaArea.subareaName, row.subareaArea.subareaAreaName]
         } else {
           this.form.accountNameSn = ''
           this.form.provinceSn = ''
@@ -215,7 +215,7 @@ export default {
       })
     },
     // 分区
-    subareaChange(val, row){
+    subareaChange (val, row) {
       this.form.subareaArea.subareaName = val[0] ? val[0] : ''
       this.form.subareaArea.subareaAreaName = val[1] ? val[1] : ''
     },
@@ -246,9 +246,9 @@ export default {
             if (res.data.accountType == 'CUSTOMER') {
               this.$refs.custList.setDufaultVal(res.data.accountName)
             }
-            this.form.subareaArea.subareaName = res.data.subareaNames||''
-            this.form.subareaArea.subareaAreaName = res.data.subareaAreaName||''
-            this.subareaList = res.data.subareaNames ?  [res.data.subareaNames,res.data.subareaAreaName] : undefined
+            this.form.subareaArea.subareaName = res.data.subareaNames || ''
+            this.form.subareaArea.subareaAreaName = res.data.subareaAreaName || ''
+            this.subareaList = res.data.subareaNames ? [res.data.subareaNames, res.data.subareaAreaName] : undefined
           }, 200)
           this.spinning = false
         })
@@ -293,9 +293,9 @@ export default {
           form.citySn = form.citySn ? form.citySn : ''
           form.cityName = form.cityName ? form.cityName : ''
           form.expense = Math.abs(form.expense)
-          
+
           console.log(form)
-        
+
           _this.spinning = true
           expenseAcctDetailSave(form).then(res => {
             if (res.status == 200) {
@@ -323,9 +323,9 @@ export default {
         id: undefined,
         accountType: undefined, // 记帐类型
         accountNameSn: undefined, //  记账名称
-        subareaArea:{
+        subareaArea: {
           subareaName: undefined, //  所属区域
-          subareaAreaName: undefined, // 分区
+          subareaAreaName: undefined // 分区
         },
         provinceSn: undefined, // 省份
         provinceName: '',