Procházet zdrojové kódy

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

lilei před 2 roky
rodič
revize
42f737e1f9

+ 5 - 3
src/views/dealerManagement/businessOwnerSettings/addModal.vue

@@ -17,8 +17,7 @@
         :rules="rules"
       >
         <a-form-model-item label="人员名称" prop="userSn">
-          <userName v-if="!itemId" ref="userName" id="businessOwnerSettings-userSn" @change="userChange"></userName>
-          <span v-else>{{ user_name }}</span>
+          <userName ref="userName" id="businessOwnerSettings-userSn" @change="userChange"></userName>
         </a-form-model-item>
         <a-form-model-item label="人员类型" prop="bizUserType">
           <v-select
@@ -110,6 +109,8 @@ export default {
               _this.$emit('ok', res.data)
               _this.isShow = false
             }
+          }).catch(err => {
+            _this.spinning = false
           })
         } else {
           console.log('error submit!!')
@@ -128,7 +129,8 @@ export default {
       this.form.userSn = val.key
     },
     getEditInfo (obj) {
-      this.user_name = obj.userName
+      // this.user_name = obj.userName
+      this.$refs.userName.setDufaultVal(obj.userName)
       this.form = {
         userSn: obj.userSn,
         bizUserType: obj.bizUserType, // 人员类型

+ 14 - 8
src/views/reportData/returnGoodsPresentation/list.vue

@@ -19,7 +19,8 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="客户名称">
-                <a-input id="returnGoodsPresentationList-dealerName" v-model.trim="queryParam.dealer.dealerName" allowClear placeholder="请输入客户名称"/>
+                <custList id="salesPresentationList-dealerSn" ref="custList" @change="custChange"></custList>
+                <!-- <a-input id="returnGoodsPresentationList-dealerName" v-model.trim="queryParam.dealer.dealerName" allowClear placeholder="请输入客户名称"/> -->
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -112,6 +113,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
+import custList from '@/views/common/custList.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import AreaList from '@/views/common/areaList.js'
@@ -121,7 +123,7 @@ import { returnDocReportTitle, reportSalesReturnThjdReportList, reportSalesRetur
 export default {
   name: 'ReturnGoodsPresentationList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, AreaList, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, AreaList, reportModal, custList },
   data () {
     return {
       spinning: false,
@@ -132,12 +134,12 @@ export default {
         beginDate: '',
         endDate: '',
         salesReturnBillNo: '',
-        subareaArea:{
+        subareaArea: {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
         dealer: {
-          'dealerName': '',
+          'dealerSn': '',
           'provinceSn': undefined,
           'citySn': undefined,
           'districtSn': undefined,
@@ -146,7 +148,7 @@ export default {
       },
       columns: [],
       countLabel: [],
-      countBrandLabel:[],
+      countBrandLabel: [],
       rules: {
         'time': [{ required: true, message: '请选择调拨日期', trigger: 'change' }]
       },
@@ -218,6 +220,9 @@ export default {
         }
       })
     },
+    custChange (val) {
+      this.queryParam.dealer.dealerSn = val.key
+    },
     //  创建时间  change
     dateChange (date) {
       if (date[0] && date[1]) {
@@ -228,7 +233,7 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
-    subareaChange(val){
+    subareaChange (val) {
       this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
       this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
     },
@@ -255,6 +260,7 @@ export default {
         this.$refs.subarea.clearData()
         this.$refs.areaList.clearData()
       }
+      this.$refs.custList.resetForm()
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
     },
@@ -268,8 +274,8 @@ export default {
       const _this = this
       const tableTitle = await returnDocReportTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')<0)
-      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌')>=0)
+      this.countLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') < 0)
+      this.countBrandLabel = tableTitle.count.filter(item => item.title.indexOf('品牌') >= 0)
       this.columns.map(item => {
         let mw = 40
         if (item.customRender == 'amount') {