fix: bug

src/api/basic_data/sectorAllocation.js

@@ -4,7 +4,7 @@ export function getTradeConfigList(params) {
   return request({
     url: '/config/tradeConfig/listLevel',
     method: 'post',
-    data: params
+    params
   })
 }
 

src/views/basic_data/sectorAllocation.vue

@@ -132,19 +132,17 @@ export default {
     },
     getTradeConfigList(parentId = '') {
       getTradeConfigList({
-        keyword: this.keyword,
-        pageNum: this.currentPage,
-        pageSize: this.pageSize
+        keyword: this.keyword
       })
         .then(res => {
           this.listLoading = true
           if (!parentId) {
-            res.data.records.forEach(k => {
+            res.data.forEach(k => {
               if (!k.childList) {
                 k.childList = []
               }
             })
-            this.tableData = res.data.records
+            this.tableData = res.data
             this.listTotal = res.data.total
             this.listLoading = false
           }

src/views/commercialEngineering/components/base.vue

@@ -504,6 +504,8 @@ export default {
       if (newValue) {
         if (this.isTradeExaminer) {
           if (this.commonData.vicinityMarkers.length) {
+            console.log(this.commonData, 8888)
+
             this.markers = this.commonData.vicinityMarkers.map(k => {
               return {
                 id: '',
@@ -514,6 +516,12 @@ export default {
               }
             })
           }
+          this.markers.push({
+            name: this.formData.projectName,
+            center: [this.formData.lnt, this.formData.lat],
+            address: this.formData.address,
+            no: this.formData.projectNo
+          })
         } else {
           this.markers = [
             {

src/views/commercialEngineering/crossDistrict/crossDistrictkList.vue

@@ -237,7 +237,7 @@ export default {
                 申请修改
               </el-button>
             ) : null}
-            {this.isTradeExaminer && (row.orderStatus === 'OK' || row.orderStatus === 'FAIL' && row.isApplyUpdate) ? (
+            {this.isTradeExaminer && ((row.orderStatus === 'OK' || row.orderStatus === 'FAIL') && row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'

src/views/commercialEngineering/frock/frockList.vue

@@ -222,7 +222,7 @@ export default {
               更新
               </el-button> : null
             }
-            {!this.isTradeExaminer && (row.orderStatus === 'OK' || row.orderStatus === 'FAIL' && !row.isApplyUpdate) ? (
+            {!this.isTradeExaminer && ((row.orderStatus === 'WAIT' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'
@@ -236,7 +236,7 @@ export default {
                 申请修改
               </el-button>
             ) : null}
-            {this.isTradeExaminer && (row.orderStatus === 'OK' || row.orderStatus === 'FAIL' && row.isApplyUpdate) ? (
+            {this.isTradeExaminer && ((row.orderStatus === 'OK' || row.orderStatus === 'FAIL') && row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'

src/views/commercialEngineering/homeDecoration/homeDecorationList.vue

@@ -231,7 +231,7 @@ export default {
               更新
               </el-button> : null
             }
-            {!this.isTradeExaminer && (row.orderStatus === 'OK' || row.orderStatus === 'FAIL' && !row.isApplyUpdate) ? (
+            {!this.isTradeExaminer && ((row.orderStatus === 'WAIT' || row.orderStatus === 'FAIL') && !row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'
@@ -245,7 +245,7 @@ export default {
                 申请修改
               </el-button>
             ) : null}
-            {this.isTradeExaminer && (row.orderStatus === 'OK' || row.orderStatus === 'FAIL' && row.isApplyUpdate) ? (
+            {this.isTradeExaminer && ((row.orderStatus === 'OK' || row.orderStatus === 'FAIL') && row.isApplyUpdate) ? (
               <el-button
                 size='mini'
                 type='text'