Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/utils/request.js

@@ -64,7 +64,7 @@ service.interceptors.response.use(response => {
     return response
   }
   const code = response.data.code
-  if (code === 1011006 || code === 1011007 || code === 1011008 || code === 1011009) {
+  if (code === 1011006 || code === 1011007 || code === 1011008 || code === 1011009 || code === 401) {
     Modal.error({
       title: '提示：',
       content: response.data.message,

src/views/main/Customer/addForm.vue

@@ -508,10 +508,12 @@ export default {
   }
 }
 </script>
-<style scoped lang="less" scoped>
+<style scoped lang="less">
 .CsForm {
   background: #fff;
   padding: 25px;
+  height: 760px;
+  overflow-y: auto !important;
 }
 .CsForm .ant-form-item {
   margin-bottom: 10px;

src/views/main/Customer/editForm.vue

@@ -544,6 +544,8 @@ export default {
 .CsForm {
   background: #fff;
   padding: 25px;
+  height: 760px;
+  overflow-y: auto !important;
 }
 .CsFormTitle {
   border-bottom: 1px solid #c9c9c9;

src/views/main/DjyTenantConfig/addForm.vue

@@ -76,10 +76,13 @@ export default {
 
       BookingOrderGetFieldName().then(res => {
         let FieldNameList = []
-        Object.keys(res.data.order).forEach(item => {
+
-          FieldNameList.push({
+        Object.keys(res.data).forEach(item => {
-            code: item,
+          Object.keys(res.data[item]).forEach(item2 => {
-            name: res.data.order[item]
+            FieldNameList.push({
+              code: item2,
+              name: res.data[item][item2]
+            })
           })
         })
         this.FieldNameList = FieldNameList
@@ -120,7 +123,7 @@ export default {
               Changetype = true
             }
           })
-          console.log(this.data)
+
           if (Changetype) {
             configJson = [...this.data]
           } else {

src/views/main/DjyTenantConfig/editForm.vue

@@ -73,20 +73,20 @@ export default {
   methods: {
     // 初始化方法
     edit(record, loadData) {
-      console.log(record)
       this.data = loadData
       this.visible = true
       BookingOrderGetFieldName().then(res => {
         let FieldNameList = []
-        Object.keys(res.data.order).forEach(item => {
+        Object.keys(res.data).forEach(item => {
-          FieldNameList.push({
+          Object.keys(res.data[item]).forEach(item2 => {
-            code: item,
+            FieldNameList.push({
-            name: res.data.order[item]
+              code: item2,
+              name: res.data[item][item2]
+            })
           })
         })
         this.FieldNameList = FieldNameList
         this.FieldNameList2 = FieldNameList
-        console.log(this.FieldNameList)
       })
       setTimeout(() => {
         this.form.setFieldsValue({
@@ -94,11 +94,9 @@ export default {
           code: record.code,
           remarks: record.remarks
         })
-        console.log(this.form.getFieldsValue())
       }, 100)
     },
     handleSearch(value) {
-      console.log(value)
       let Rdata = []
       if (value) {
         this.FieldNameList2.forEach(item => {