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

src/views/main/BookingLedger/detail/modules/sedOperationArea.vue

@@ -72,7 +72,7 @@ export default {
   },
   data() {
     return {
-      id: this.$route.query.id,
+      // id: this.$route.query.id,
       PrintModalVisible: false,
       templateType: [],
       PrintType: '1',
@@ -116,7 +116,7 @@ export default {
       })
     },
     FSnhowPrintModal() {
-      if (this.details.id && this.details.id !== this.id) {
+      if (this.details.id) {
         this.cateCode = 'fendan_print'
         let printType = ''
         if (this.printType == 4) {
@@ -144,7 +144,7 @@ export default {
       let printType = this.PrintType == 4 ? 20 : 10
       BookingOrderPrintOrder({
         templateId,
-        bookingId: this.id,
+        bookingId: this.details.id,
         cateCode: this.cateCode,
         type: this.PrintType,
         printType

src/views/main/BookingLedger/detail/modules/sedOrder.vue

@@ -419,14 +419,13 @@ export default {
       tableRules: rules.tableRules,
       hasTableRules: false,
       inSave: false,
-      sedOrderList: JSON.parse(JSON.stringify(this.parSedOrderList)) || [],
+      sedOrderList: JSON.parse(JSON.stringify(this.parSedOrderList)) || []
       // inLoading: false
     }
   },
   watch: {
     parSedOrderList: {
-      handler(nval, oval) {
-      },
+      handler(nval, oval) {},
       deep: true
     },
     editDetails: {
@@ -470,7 +469,7 @@ export default {
       if (Object.keys(data).length > 0) {
         this.sedOrderList = JSON.parse(JSON.stringify(data))
       } else {
-         this.sedOrderList = []
+        this.sedOrderList = []
       }
       //  else if (this.parSedOrderList.length > 0) {
       //   this.sedOrderList = JSON.parse(JSON.stringify(this.parSedOrderList))
@@ -581,7 +580,9 @@ export default {
 
     changeDetailFun(data) {
       // console.log('== 分单改变2 load ==', this.inSave, this.inSecLoad)
-      if (this.inSave || this.inSecLoad || this.sedOrderList.length === 0) { return false }
+      if (this.inSave || this.inSecLoad || this.sedOrderList.length === 0) {
+        return false
+      }
       const { detail, type } = data
       if (!detail.bookingEDIExt) {
         detail.bookingEDIExt = bookingEDIExt
@@ -758,32 +759,33 @@ export default {
     changeParentTabs(type) {
       this.mainOrderActiveKey = type
     },
-    removeSedOrderFun (data, index) {
+    removeSedOrderFun(data, index) {
       this.deleteBookingOrder(data.id, index)
     },
-    removeFun () {
+    removeFun() {
       this.deleteBookingOrder(this.editDetails.id, this.editIndex)
     },
-    deleteBookingOrder (id, index) {
+    deleteBookingOrder(id, index) {
       // eslint-disable-next-line eqeqeq
       if (id == 0) {
         this.removeSucc(id, index)
         return false
       }
       this.inSecLoad = true
-      DeleteBookingOrder([id].toString()).then(res => {
-        if (res.success) {
-          this.$message.success('删除成功')
-          this.removeSucc(id, index)
-        } else {
-          this.$message.error(res.message)
-        }
-      })
-      .catch(err => {
-        console.log(err)
-      })
+      DeleteBookingOrder([id].toString())
+        .then(res => {
+          if (res.success) {
+            this.$message.success('删除成功')
+            this.removeSucc(id, index)
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+        .catch(err => {
+          console.log(err)
+        })
     },
-    removeSucc (id, index) {
+    removeSucc(id, index) {
       const removeIndex = index
       this.sedOrderList.splice(removeIndex, 1)
       this.$emit('sedOrderRemove', this.sedOrderList)
@@ -804,7 +806,7 @@ export default {
       }, 200)
       this.$forceUpdate()
     },
-    cancelRemove () {
+    cancelRemove() {
       console.log('== 取消删除 ==')
     }
   }

src/views/main/DjyTenantConfig/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <a-card :bordered="false" :bodyStyle="tstyle">
+    <a-card :bordered="false" :bodyStyle="tstyle">
       <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
         <a-form layout="inline">
           <a-row :gutter="48">
@@ -8,7 +8,7 @@
               <a-row :gutter="48">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="字段名称：">
-                    <a-input v-model="queryParam.fieldName" allow-clear placeholder="请输入字段名称" />
+                    <a-input v-model="queryParam.SearchValue" allow-clear placeholder="请输入字段名称" />
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -17,16 +17,16 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="FnQuery">查询</a-button>
                 <a-button style="margin-left: 8px" @click="FnReset">重置</a-button>
-                <a @click="toggleAdvanced" style="margin-left: 8px">
+                <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'" />
-                </a>
+                </a> -->
               </span>
             </a-col>
           </a-row>
         </a-form>
       </div>
-    </a-card> -->
+    </a-card>
     <a-card :bordered="false">
       <vxe-toolbar>
         <template #buttons>
@@ -77,6 +77,7 @@
 import { DjyTenantConfigPage, DjyTenantConfigSave } from '@/api/modular/main/DjyTenantConfig'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     addForm,
@@ -119,6 +120,9 @@ export default {
   mounted() {
     this.init()
   },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
   methods: {
     FnQuery() {
       let Rdata = []
@@ -168,6 +172,7 @@ export default {
       this.loading = true
       DjyTenantConfigPage(this.queryParam).then(res => {
         if (res.code == 200) {
+          console.log(this.userInfo)
           this.loadData = JSON.parse(res.data.rows[0].configJson)
           this.DisplayLoadData = this.loadData
         } else {