Merge branch 'master' of http://git.xmmakeit.com/zhengyb/emaint-web-master

src/views/customerManagement/index.vue

@@ -389,7 +389,7 @@ export default {
       isEdit: false, //是否编辑客户
       isEdit: false, //是否编辑客户
       custModalTitle: '新增客户',
       custModalTitle: '新增客户',
       editCustModal: false, //编辑模态框
       editCustModal: false, //编辑模态框
-      editCustLoading: true,
+      // editCustLoading: true,
       companyList: [],
       companyList: [],
       deptList: [],
       deptList: [],
       editCustForm: {
       editCustForm: {
@@ -835,6 +835,7 @@ export default {
             self.editCustForm.officeLocation = data.officeLocation;
             self.editCustForm.officeLocation = data.officeLocation;
             self.editCustForm.priority = data.priority;
             self.editCustForm.priority = data.priority;
             self.editCustForm.sex = data.sex;
             self.editCustForm.sex = data.sex;
+            self.editCustForm.dataSource = data.dataSource;
             // self.getCompany()
             // self.getCompany()
             // self.getDept(data.companyCode)
             // self.getDept(data.companyCode)
             self.editCustModal = true;
             self.editCustModal = true;