diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/index.vue
index 64533b34..1c0dff43 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectbasic/index.vue
@@ -195,7 +195,7 @@ export default {
         isLeaf: "isLeaf"
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [],
       total: 0,
       queryData: {},
@@ -641,7 +641,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData();
-      this.initData();
+      // this.initData();
     },
     //初始化查询的默认数据
     async initSearchData() { },
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/index.vue
index fd8f57ee..73c68550 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/service/subjectbasic/index.vue
@@ -5,8 +5,8 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="服务商分类">
-              <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable :options="calssifyOptions"
-                :props="calssifyProps">
+              <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable
+                :options="calssifyOptions" :props="calssifyProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -33,9 +33,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -47,34 +49,25 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
           <el-table-column prop="name" label="服务商名称" align="center" sortable fixed="left">
           </el-table-column>
-          <el-table-column label="服务商分类" prop="calssify" align="center" sortable width="150" fixed="left">
+          <el-table-column label="服务商分类" prop="calssify" align="center" sortable width="150"
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.calssify == '' ? '其他服务商' : (scope.row.calssify == '1' ? '物流服务商' : '加工服务商')}}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="companyName"
-            label="所属公司"
-            align="center"
-            sortable
-            fixed="left"
-          >
+          <el-table-column prop="companyName" label="所属公司" align="center" sortable fixed="left">
           </el-table-column>
-          <el-table-column
-            prop="departmentName"
-            label="所属部门"
-            align="center"
-            sortable
-            fixed="left"
-          >
+          <el-table-column prop="departmentName" label="所属部门" align="center" sortable fixed="left">
           </el-table-column>
           <el-table-column prop="enterpriseNature" label="企业性质" align="center" width="150">
           </el-table-column>
@@ -99,8 +92,9 @@
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
-                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"
+                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@@ -110,720 +104,723 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
-
-
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <FlowBusinessConfigBox v-if="flowBusinessConfigVisible" ref="FlowBusinessConfigBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <FlowBusinessConfigBox v-if="flowBusinessConfigVisible" ref="FlowBusinessConfigBox"
+      @close="colseFlow" />
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getFormById
-  } from '@/api/workFlow/FormDesign'
-  import {
-    getFlowList
-  } from '@/api/workFlow/FlowEngine'
-  import FlowBox from '@/views/workFlow/components/FlowBox'
-  import FlowBusinessConfigBox from '@/views/workFlow/components/FlowBusinessConfigBox'
-  import ExportBox from '@/components/ExportBox'
-  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getConfigData
-  } from '@/api/onlineDev/visualDev'
-  import {
-    getDefaultCurrentValueUserIdAsync
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentIdAsync
-  } from '@/api/permission/organize'
-  import columnList from './columnList'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  import SuperQuery from '@/components/SuperQuery'
-  import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getFormById
+} from '@/api/workFlow/FormDesign'
+import {
+  getFlowList
+} from '@/api/workFlow/FlowEngine'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import FlowBusinessConfigBox from '@/views/workFlow/components/FlowBusinessConfigBox'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getConfigData
+} from '@/api/onlineDev/visualDev'
+import {
+  getDefaultCurrentValueUserIdAsync
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentIdAsync
+} from '@/api/permission/organize'
+import columnList from './columnList'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-  export default {
-    components: {
-      FlowBox,
-      FlowBusinessConfigBox,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    FlowBusinessConfigBox,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
 
-        keyword: '',
-        expandsTree: true,
-        refreshTree: true,
-        toFormDetailVisible: false,
-        expandObj: {},
-        columnOptions: [],
-        mergeList: [],
-        exportList: [],
-        columnList,
+      keyword: '',
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
 
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          calssify: undefined,
-          name: undefined,
-          customerStarRating: undefined,
-          subjectBasicType:'3',
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowBusinessConfigVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        calssifyOptions: [{
-          "fullName": "一级",
-          "id": "1"
-        }, {
-          "fullName": "二级",
-          "id": "2"
-        }],
-        calssifyProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        enterpriseNatureOptions: [],
-        enterpriseNatureProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        industryClassifyOptions: [],
-        industryClassifyProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        customerStarRatingOptions: [],
-        customerStarRatingProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        paymentMethodOptions: [{
-          "fullName": "无",
-          "id": "1"
-        }, {
-          "fullName": "现金",
-          "id": "2"
-        }, {
-          "fullName": "银行转账",
-          "id": "3"
-        }, {
-          "fullName": "承兑汇票",
-          "id": "4"
-        }, {
-          "fullName": "支付宝",
-          "id": "5"
-        }, {
-          "fullName": "微信",
-          "id": "6"
-        }],
-        paymentMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        depositBankOptions: [],
-        depositBankProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        collaborationMethodOptions: [{
-          "fullName": "买断",
-          "id": "1"
-        }, {
-          "fullName": "联营",
-          "id": "2"
-        }],
-        collaborationMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        settlementMethodOptions: [{
-          "fullName": "先货后款",
-          "id": "1"
-        }, {
-          "fullName": "先款后货",
-          "id": "2"
-        }],
-        settlementMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        underpaymentMethodOptions: [{
-          "fullName": "按金额",
-          "id": "1"
-        }, {
-          "fullName": "按比例",
-          "id": "2"
-        }],
-        underpaymentMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        marginMethodOptions: [{
-          "fullName": "按金额",
-          "id": "1"
-        }, {
-          "fullName": "按比例",
-          "id": "2"
-        }],
-        marginMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        overdueInterestRateOptions: [{
-          "fullName": "按年化",
-          "id": "1"
-        }, {
-          "fullName": "按月化",
-          "id": "2"
-        }],
-        overdueInterestRateProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        reservedFields1Options: [{
-          "fullName": "国内",
-          "id": "1"
-        }, {
-          "fullName": "国外",
-          "id": "2"
-        }],
-        reservedFields1Props: {
-          "label": "fullName",
-          "value": "id"
-        },
-        reservedFields2Options: [{
-          "fullName": "国内服务商",
-          "id": "1"
-        }, {
-          "fullName": "国外服务商",
-          "id": "2"
-        }],
-        reservedFields2Props: {
-          "label": "fullName",
-          "value": "id"
-        },
-        reservedFields3Options: [{
-          "fullName": "A级优质",
-          "id": "1"
-        }, {
-          "fullName": "B级普通",
-          "id": "2"
-        }, {
-          "fullName": "C级潜在",
-          "id": "3"
-        }, {
-          "fullName": "D级黑名单",
-          "id": "4"
-        }],
-        reservedFields3Props: {
-          "label": "fullName",
-          "value": "id"
-        },
-        autoCreditRatingOptions: [{
-          "fullName": "开启",
-          "id": "1"
-        }, {
-          "fullName": "关闭",
-          "id": "2"
-        }],
-        autoCreditRatingProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField119_representativeTypeOptions: [{
-          "fullName": "法定代表人",
-          "id": "1"
-        }, {
-          "fullName": "代办人",
-          "id": "2"
-        }, {
-          "fullName": "实控人",
-          "id": "3"
-        }, {
-          "fullName": "担保人",
-          "id": "4"
-        }],
-        tableField119_representativeTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField173_contactsTypeOptions: [{
-          "fullName": "默认",
-          "id": "1"
-        }, {
-          "fullName": "普通联系人",
-          "id": "2"
-        }],
-        tableField173_contactsTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {},
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("1754054458341748737").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          this.getcustomerStarRatingOptions();
-          this.queryData = JSON.parse(JSON.stringify(this.query))
-        }).catch((e) => {
-          this.$message({
-            type: 'error',
-            message: e.message
-          });
-          this.$router.push('/404');
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        calssify: undefined,
+        name: undefined,
+        customerStarRating: undefined,
+        subjectBasicType: '3',
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: false,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowBusinessConfigVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      calssifyOptions: [{
+        "fullName": "一级",
+        "id": "1"
+      }, {
+        "fullName": "二级",
+        "id": "2"
+      }],
+      calssifyProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      enterpriseNatureOptions: [],
+      enterpriseNatureProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      industryClassifyOptions: [],
+      industryClassifyProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      customerStarRatingOptions: [],
+      customerStarRatingProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      paymentMethodOptions: [{
+        "fullName": "无",
+        "id": "1"
+      }, {
+        "fullName": "现金",
+        "id": "2"
+      }, {
+        "fullName": "银行转账",
+        "id": "3"
+      }, {
+        "fullName": "承兑汇票",
+        "id": "4"
+      }, {
+        "fullName": "支付宝",
+        "id": "5"
+      }, {
+        "fullName": "微信",
+        "id": "6"
+      }],
+      paymentMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      depositBankOptions: [],
+      depositBankProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      collaborationMethodOptions: [{
+        "fullName": "买断",
+        "id": "1"
+      }, {
+        "fullName": "联营",
+        "id": "2"
+      }],
+      collaborationMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      settlementMethodOptions: [{
+        "fullName": "先货后款",
+        "id": "1"
+      }, {
+        "fullName": "先款后货",
+        "id": "2"
+      }],
+      settlementMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      underpaymentMethodOptions: [{
+        "fullName": "按金额",
+        "id": "1"
+      }, {
+        "fullName": "按比例",
+        "id": "2"
+      }],
+      underpaymentMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      marginMethodOptions: [{
+        "fullName": "按金额",
+        "id": "1"
+      }, {
+        "fullName": "按比例",
+        "id": "2"
+      }],
+      marginMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      overdueInterestRateOptions: [{
+        "fullName": "按年化",
+        "id": "1"
+      }, {
+        "fullName": "按月化",
+        "id": "2"
+      }],
+      overdueInterestRateProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      reservedFields1Options: [{
+        "fullName": "国内",
+        "id": "1"
+      }, {
+        "fullName": "国外",
+        "id": "2"
+      }],
+      reservedFields1Props: {
+        "label": "fullName",
+        "value": "id"
+      },
+      reservedFields2Options: [{
+        "fullName": "国内服务商",
+        "id": "1"
+      }, {
+        "fullName": "国外服务商",
+        "id": "2"
+      }],
+      reservedFields2Props: {
+        "label": "fullName",
+        "value": "id"
+      },
+      reservedFields3Options: [{
+        "fullName": "A级优质",
+        "id": "1"
+      }, {
+        "fullName": "B级普通",
+        "id": "2"
+      }, {
+        "fullName": "C级潜在",
+        "id": "3"
+      }, {
+        "fullName": "D级黑名单",
+        "id": "4"
+      }],
+      reservedFields3Props: {
+        "label": "fullName",
+        "value": "id"
+      },
+      autoCreditRatingOptions: [{
+        "fullName": "开启",
+        "id": "1"
+      }, {
+        "fullName": "关闭",
+        "id": "2"
+      }],
+      autoCreditRatingProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField119_representativeTypeOptions: [{
+        "fullName": "法定代表人",
+        "id": "1"
+      }, {
+        "fullName": "代办人",
+        "id": "2"
+      }, {
+        "fullName": "实控人",
+        "id": "3"
+      }, {
+        "fullName": "担保人",
+        "id": "4"
+      }],
+      tableField119_representativeTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField173_contactsTypeOptions: [{
+        "fullName": "默认",
+        "id": "1"
+      }, {
+        "fullName": "普通联系人",
+        "id": "2"
+      }],
+      tableField173_contactsTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {},
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("1754054458341748737").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.getcustomerStarRatingOptions();
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+      }).catch((e) => {
+        this.$message({
+          type: 'error',
+          message: e.message
+        });
+        this.$router.push('/404');
+      })
+    })
+  },
+  methods: {
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return
+        let formData = JSON.parse(res.data.formData)
+        formData.popupType = 'general'
+        this.toFormDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
         })
       })
     },
-    methods: {
-      toDetail(defaultValue, modelId) {
-        if (!defaultValue) return
-        getConfigData(modelId).then(res => {
-          if (!res.data || !res.data.formData) return
-          let formData = JSON.parse(res.data.formData)
-          formData.popupType = 'general'
-          this.toFormDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-          })
-        })
-      },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
         this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
+          this.$refs.treeBox.setCurrentKey(null)
         })
-      },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
-      },
-      loadNode(node, resolve) {
-        const nodeData = node.data
-        const config = {
-          treeInterfaceId: "",
-          treeTemplateJson: []
-        }
-        if (config.treeInterfaceId) {
-          //这里是为了拿到参数中关联的字段的值，后端自行拿
-          if (config.treeTemplateJson && config.treeTemplateJson.length) {
-            for (let i = 0; i < config.treeTemplateJson.length; i++) {
-              const element = config.treeTemplateJson[i];
-              element.defaultValue = nodeData[element.relationField] || ''
-            }
-          }
-          //参数
-          let query = {
-            paramList: config.treeTemplateJson || [],
-          }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
-        }
-      },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
-      },
-      transformColumnList(columnList) {
-        let list = []
-        for (let i = 0; i < columnList.length; i++) {
-          const e = columnList[i];
-          if (!e.prop.includes('-')) {
-            list.push(e)
-          } else {
-            let prop = e.prop.split('-')[0]
-            let label = e.label.split('-')[0]
-            let vModel = e.prop.split('-')[1]
-            let newItem = {
-              align: "center",
-              jnpfKey: "table",
-              prop,
-              label,
-              children: []
-            }
-            e.vModel = vModel
-            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-            if (!list.some(o => o.prop === prop)) list.push(newItem)
-            for (let i = 0; i < list.length; i++) {
-              if (list[i].prop === prop) {
-                list[i].children.push(e)
-                break
-              }
-            }
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      }
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || ''
           }
         }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
-      },
-      arraySpanMethod({
-        column
-      }) {
-        for (let i = 0; i < this.mergeList.length; i++) {
-          if (column.property == this.mergeList[i].prop) {
-            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-          }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
         }
-      },
-      getMergeList(list) {
-        let newList = JSON.parse(JSON.stringify(list))
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            let child = {
-              prop: item.prop + '-child-first'
-            }
-            item.children.unshift(child)
-          }
-        })
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            item.children.forEach((child, index) => {
-              if (index == 0) {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 1,
-                  colspan: item.children.length
-                })
-              } else {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 0,
-                  colspan: 0
-                })
-              }
-            })
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
           } else {
-            this.mergeList.push({
-              prop: item.prop,
-              rowspan: 1,
-              colspan: 1
-            })
+            resolve([]);
           }
         })
-      },
-      getExportList(list) {
-        let exportList = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].jnpfKey === 'table') {
-            for (let j = 0; j < list[i].children.length; j++) {
-              exportList.push(list[i].children[j])
+      }
+    },
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList)
+    },
+    transformColumnList(columnList) {
+      let list = []
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes('-')) {
+          list.push(e)
+        } else {
+          let prop = e.prop.split('-')[0]
+          let label = e.label.split('-')[0]
+          let vModel = e.prop.split('-')[1]
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: []
+          }
+          e.vModel = vModel
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+          if (!list.some(o => o.prop === prop)) list.push(newItem)
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e)
+              break
             }
-          } else {
-            exportList.push(list[i])
           }
         }
-        this.exportList = exportList
-      },
-      getcustomerStarRatingOptions() {
-        getDictionaryDataSelector('517682237588636677').then(res => {
-          this.customerStarRatingOptions = res.data.list
-        })
-      },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      async initSearchDataAndListData() {
-        await this.initSearchData()
-        this.initData()
-      },
-      //初始化查询的默认数据
-      async initSearchData() {},
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          keyword: this.keyword,
-          dataType: 0,
-          menuId: this.menuId,
-          moduleId: '1754054458341748737',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/Subjectbasic/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = res.data.list;
-          this.list = _list.map(o => ({
-            ...o,
-            ...this.expandObj,
-          }))
-          this.total = res.data.pagination.total
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/Subjectbasic/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
-          })
-        }).catch(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/Subjectbasic")
-        })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 1500,
-          })
-          return
+      }
+      this.getMergeList(list)
+      this.getExportList(list)
+      return list
+    },
+    arraySpanMethod({
+      column
+    }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+        }
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list))
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + '-child-first'
+          }
+          item.children.unshift(child)
         }
-        const ids = this.multipleSelection
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/Subjectbasic/batchRemove`,
-            data: ids,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      })
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length
+              })
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0
+              })
+            }
           })
-        }).catch(() => {})
-      },
-      openSuperQuery() {
-        this.superQueryVisible = true
-        this.$nextTick(() => {
-          this.$refs.SuperQuery.init()
-        })
-      },
-      superQuery(queryJson) {
-        this.listQuery.superQueryJson = queryJson
-        this.listQuery.currentPage = 1
-        this.initData()
-      },
-      addOrUpdateHandle(row, flowState) {
-        if (!row) {
-          this.addHandle();
         } else {
-          this.updateHandle(row, flowState)
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.exportList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
         }
+      }
+      this.exportList = exportList
+    },
+    getcustomerStarRatingOptions() {
+      getDictionaryDataSelector('517682237588636677').then(res => {
+        this.customerStarRatingOptions = res.data.list
+      })
+    },
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
+    },
+    sortChange({
+      column,
+      prop,
+      order
+    }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
+      this.initData()
+    },
+    async initSearchDataAndListData() {
+      await this.initSearchData()
+      // this.initData()
+    },
+    //初始化查询的默认数据
+    async initSearchData() { },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        keyword: this.keyword,
+        dataType: 0,
+        menuId: this.menuId,
+        moduleId: '1754054458341748737',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Subjectbasic/getList`,
+        method: 'post',
+        data: _query
+      }).then(res => {
+        var _list = res.data.list;
+        this.list = _list.map(o => ({
+          ...o,
+          ...this.expandObj,
+        }))
+        this.total = res.data.pagination.total
+        this.listLoading = false
+      })
+    },
+    handleDel(id) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/scm/Subjectbasic/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Subjectbasic/${id}`,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery.currentPage = 1
-        this.listQuery.pageSize = 20
-        this.listQuery.sort = "desc"
-        this.listQuery.sidx = ""
-        this.initData()
-      },
-      //流程改造后相关调用方法
-      updateHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
-        }
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
-        })
-      },
-      updateBusinessConfigHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
-        }
-        this.flowBusinessConfigVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBusinessConfigBox.init(data)
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
         })
-      },
-      toApprovalDetail(row) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId,
-          opType: 0,
-          status: row.currentState
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Subjectbasic")
+      })
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
         })
-      },
-      addHandle() {
-        if (!this.flowList.length) {
+        return
+      }
+      const ids = this.multipleSelection
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/api/scm/Subjectbasic/batchRemove`,
+          data: ids,
+          method: 'DELETE'
+        }).then(res => {
           this.$message({
-            type: 'error',
-            message: '流程不存在'
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
           });
-        } else if (this.flowList.length === 1) {
-          this.selectFlow(this.flowList[0])
-        } else {
-          this.flowListVisible = true
-        }
-      },
-      //选择流程发起
-      selectFlow(item) {
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: item.id,
-          opType: '-1'
-        }
-        this.flowListVisible = false
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
         })
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        this.query = JSON.parse(JSON.stringify(this.queryData))
-        this.search()
-      },
-      colseFlow(isrRefresh) {
-        this.flowVisible = false
-        this.flowBusinessConfigVisible = false
-        if (isrRefresh) this.reset()
-      },
-    }
+      }).catch(() => { })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      this.initData()
+    },
+    addOrUpdateHandle(row, flowState) {
+      if (!row) {
+        this.addHandle();
+      } else {
+        this.updateHandle(row, flowState)
+      }
+    },
+    exportData() {
+      this.exportBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.exportList)
+      })
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      }
+      request({
+        url: `/api/scm/Subjectbasic/Actions/Export`,
+        method: 'post',
+        data: query
+      }).then(res => {
+        if (!res.data.url) return
+        this.jnpf.downloadFile(res.data.url)
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    search() {
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.sort = "desc"
+      this.listQuery.sidx = ""
+      this.initData()
+    },
+    //流程改造后相关调用方法
+    updateHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    updateBusinessConfigHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowBusinessConfigVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBusinessConfigBox.init(data)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({
+          type: 'error',
+          message: '流程不存在'
+        });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData))
+      this.search()
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false
+      this.flowBusinessConfigVisible = false
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue
index 6703e563..4cb050d5 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/supplier/subjectbasic/index.vue
@@ -5,8 +5,8 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="供应商分类">
-              <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable :options="calssifyOptions"
-                :props="calssifyProps">
+              <JnpfSelect v-model="query.calssify" placeholder="请选择" clearable
+                :options="calssifyOptions" :props="calssifyProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -33,9 +33,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
             <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
@@ -47,34 +49,25 @@
                 @click="openSuperQuery()" />
             </el-tooltip>
             <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                @click="initData()" />
             </el-tooltip>
           </div>
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border custom-column>
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
           <el-table-column prop="name" label="供应商名称" align="center" sortable fixed="left">
           </el-table-column>
-          <el-table-column label="供应商分类" prop="calssify" align="center" sortable width="150" fixed="left">
+          <el-table-column label="供应商分类" prop="calssify" align="center" sortable width="150"
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.calssify == '' ? '三级' : scope.row.calssify}}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="companyName"
-            label="所属公司"
-            align="center"
-            sortable
-            fixed="left"
-          >
+          <el-table-column prop="companyName" label="所属公司" align="center" sortable fixed="left">
           </el-table-column>
-          <el-table-column
-            prop="departmentName"
-            label="所属部门"
-            align="center"
-            sortable
-            fixed="left"
-          >
+          <el-table-column prop="departmentName" label="所属部门" align="center" sortable fixed="left">
           </el-table-column>
           <el-table-column prop="enterpriseNature" label="企业性质" align="center" width="150">
           </el-table-column>
@@ -99,8 +92,9 @@
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
                 @click="updateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1"
-                v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn"
+                :disabled="[1,2,3,5].indexOf(scope.row.flowState)>-1" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
@@ -110,720 +104,723 @@
             </template>
           </el-table-column>
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-          @pagination="initData" />
+        <pagination :total="total" :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize" @pagination="initData" />
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
-
-
     <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
-    <FlowBusinessConfigBox v-if="flowBusinessConfigVisible" ref="FlowBusinessConfigBox" @close="colseFlow" />
-    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body :visible.sync="flowListVisible"
-      class="JNPF-dialog template-dialog JNPF-dialog_center" lock-scroll width="400px">
+    <FlowBusinessConfigBox v-if="flowBusinessConfigVisible" ref="FlowBusinessConfigBox"
+      @close="colseFlow" />
+    <el-dialog title="请选择流程" :close-on-click-modal="false" append-to-body
+      :visible.sync="flowListVisible" class="JNPF-dialog template-dialog JNPF-dialog_center"
+      lock-scroll width="400px">
       <el-scrollbar class="template-list">
-        <div class="template-item" v-for="item in flowList" :key="item.id" @click="selectFlow(item)">{{item.fullName}}
+        <div class="template-item" v-for="item in flowList" :key="item.id"
+          @click="selectFlow(item)">{{item.fullName}}
         </div>
       </el-scrollbar>
     </el-dialog>
 
     <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
     <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
-    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
-    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
+    <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
+      @close="toFormDetailVisible = false" />
+    <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
+      @superQuery="superQuery" />
   </div>
 </template>
 
 <script>
-  import request from '@/utils/request'
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    getDictionaryDataSelector
-  } from '@/api/systemData/dictionary'
-  import {
-    getFormById
-  } from '@/api/workFlow/FormDesign'
-  import {
-    getFlowList
-  } from '@/api/workFlow/FlowEngine'
-  import FlowBox from '@/views/workFlow/components/FlowBox'
-  import FlowBusinessConfigBox from '@/views/workFlow/components/FlowBusinessConfigBox'
-  import ExportBox from '@/components/ExportBox'
-  import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
-  import {
-    getDataInterfaceRes
-  } from '@/api/systemData/dataInterface'
-  import {
-    getConfigData
-  } from '@/api/onlineDev/visualDev'
-  import {
-    getDefaultCurrentValueUserIdAsync
-  } from '@/api/permission/user'
-  import {
-    getDefaultCurrentValueDepartmentIdAsync
-  } from '@/api/permission/organize'
-  import columnList from './columnList'
-  import {
-    thousandsFormat
-  } from "@/components/Generator/utils/index"
-  import SuperQuery from '@/components/SuperQuery'
-  import superQueryJson from './superQueryJson'
+import request from '@/utils/request'
+import {
+  mapGetters
+} from "vuex";
+import {
+  getDictionaryDataSelector
+} from '@/api/systemData/dictionary'
+import {
+  getFormById
+} from '@/api/workFlow/FormDesign'
+import {
+  getFlowList
+} from '@/api/workFlow/FlowEngine'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import FlowBusinessConfigBox from '@/views/workFlow/components/FlowBusinessConfigBox'
+import ExportBox from '@/components/ExportBox'
+import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
+import {
+  getDataInterfaceRes
+} from '@/api/systemData/dataInterface'
+import {
+  getConfigData
+} from '@/api/onlineDev/visualDev'
+import {
+  getDefaultCurrentValueUserIdAsync
+} from '@/api/permission/user'
+import {
+  getDefaultCurrentValueDepartmentIdAsync
+} from '@/api/permission/organize'
+import columnList from './columnList'
+import {
+  thousandsFormat
+} from "@/components/Generator/utils/index"
+import SuperQuery from '@/components/SuperQuery'
+import superQueryJson from './superQueryJson'
 
-  export default {
-    components: {
-      FlowBox,
-      FlowBusinessConfigBox,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    FlowBusinessConfigBox,
+    ExportBox,
+    ToFormDetail,
+    SuperQuery
+  },
+  data() {
+    return {
 
-        keyword: '',
-        expandsTree: true,
-        refreshTree: true,
-        toFormDetailVisible: false,
-        expandObj: {},
-        columnOptions: [],
-        mergeList: [],
-        exportList: [],
-        columnList,
+      keyword: '',
+      expandsTree: true,
+      refreshTree: true,
+      toFormDetailVisible: false,
+      expandObj: {},
+      columnOptions: [],
+      mergeList: [],
+      exportList: [],
+      columnList,
 
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          calssify: undefined,
-          name: undefined,
-          customerStarRating: undefined,
-          subjectBasicType:'2',
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        multipleSelection: [],
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowBusinessConfigVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        calssifyOptions: [{
-          "fullName": "一级",
-          "id": "1"
-        }, {
-          "fullName": "二级",
-          "id": "2"
-        }],
-        calssifyProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        enterpriseNatureOptions: [],
-        enterpriseNatureProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        industryClassifyOptions: [],
-        industryClassifyProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        customerStarRatingOptions: [],
-        customerStarRatingProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        paymentMethodOptions: [{
-          "fullName": "无",
-          "id": "1"
-        }, {
-          "fullName": "现金",
-          "id": "2"
-        }, {
-          "fullName": "银行转账",
-          "id": "3"
-        }, {
-          "fullName": "承兑汇票",
-          "id": "4"
-        }, {
-          "fullName": "支付宝",
-          "id": "5"
-        }, {
-          "fullName": "微信",
-          "id": "6"
-        }],
-        paymentMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        depositBankOptions: [],
-        depositBankProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        collaborationMethodOptions: [{
-          "fullName": "买断",
-          "id": "1"
-        }, {
-          "fullName": "联营",
-          "id": "2"
-        }],
-        collaborationMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        settlementMethodOptions: [{
-          "fullName": "先货后款",
-          "id": "1"
-        }, {
-          "fullName": "先款后货",
-          "id": "2"
-        }],
-        settlementMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        underpaymentMethodOptions: [{
-          "fullName": "按金额",
-          "id": "1"
-        }, {
-          "fullName": "按比例",
-          "id": "2"
-        }],
-        underpaymentMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        marginMethodOptions: [{
-          "fullName": "按金额",
-          "id": "1"
-        }, {
-          "fullName": "按比例",
-          "id": "2"
-        }],
-        marginMethodProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        overdueInterestRateOptions: [{
-          "fullName": "按年化",
-          "id": "1"
-        }, {
-          "fullName": "按月化",
-          "id": "2"
-        }],
-        overdueInterestRateProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        reservedFields1Options: [{
-          "fullName": "国内",
-          "id": "1"
-        }, {
-          "fullName": "国外",
-          "id": "2"
-        }],
-        reservedFields1Props: {
-          "label": "fullName",
-          "value": "id"
-        },
-        reservedFields2Options: [{
-          "fullName": "国内供应商",
-          "id": "1"
-        }, {
-          "fullName": "国外供应商",
-          "id": "2"
-        }],
-        reservedFields2Props: {
-          "label": "fullName",
-          "value": "id"
-        },
-        reservedFields3Options: [{
-          "fullName": "A级优质",
-          "id": "1"
-        }, {
-          "fullName": "B级普通",
-          "id": "2"
-        }, {
-          "fullName": "C级潜在",
-          "id": "3"
-        }, {
-          "fullName": "D级黑名单",
-          "id": "4"
-        }],
-        reservedFields3Props: {
-          "label": "fullName",
-          "value": "id"
-        },
-        autoCreditRatingOptions: [{
-          "fullName": "开启",
-          "id": "1"
-        }, {
-          "fullName": "关闭",
-          "id": "2"
-        }],
-        autoCreditRatingProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField119_representativeTypeOptions: [{
-          "fullName": "法定代表人",
-          "id": "1"
-        }, {
-          "fullName": "代办人",
-          "id": "2"
-        }, {
-          "fullName": "实控人",
-          "id": "3"
-        }, {
-          "fullName": "担保人",
-          "id": "4"
-        }],
-        tableField119_representativeTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField173_contactsTypeOptions: [{
-          "fullName": "默认",
-          "id": "1"
-        }, {
-          "fullName": "普通联系人",
-          "id": "2"
-        }],
-        tableField173_contactsTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {},
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("1754041598685376513").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          this.getcustomerStarRatingOptions();
-          this.queryData = JSON.parse(JSON.stringify(this.query))
-        }).catch((e) => {
-          this.$message({
-            type: 'error',
-            message: e.message
-          });
-          this.$router.push('/404');
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        calssify: undefined,
+        name: undefined,
+        customerStarRating: undefined,
+        subjectBasicType: '2',
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: false,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowBusinessConfigVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      calssifyOptions: [{
+        "fullName": "一级",
+        "id": "1"
+      }, {
+        "fullName": "二级",
+        "id": "2"
+      }],
+      calssifyProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      enterpriseNatureOptions: [],
+      enterpriseNatureProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      industryClassifyOptions: [],
+      industryClassifyProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      customerStarRatingOptions: [],
+      customerStarRatingProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      paymentMethodOptions: [{
+        "fullName": "无",
+        "id": "1"
+      }, {
+        "fullName": "现金",
+        "id": "2"
+      }, {
+        "fullName": "银行转账",
+        "id": "3"
+      }, {
+        "fullName": "承兑汇票",
+        "id": "4"
+      }, {
+        "fullName": "支付宝",
+        "id": "5"
+      }, {
+        "fullName": "微信",
+        "id": "6"
+      }],
+      paymentMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      depositBankOptions: [],
+      depositBankProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      collaborationMethodOptions: [{
+        "fullName": "买断",
+        "id": "1"
+      }, {
+        "fullName": "联营",
+        "id": "2"
+      }],
+      collaborationMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      settlementMethodOptions: [{
+        "fullName": "先货后款",
+        "id": "1"
+      }, {
+        "fullName": "先款后货",
+        "id": "2"
+      }],
+      settlementMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      underpaymentMethodOptions: [{
+        "fullName": "按金额",
+        "id": "1"
+      }, {
+        "fullName": "按比例",
+        "id": "2"
+      }],
+      underpaymentMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      marginMethodOptions: [{
+        "fullName": "按金额",
+        "id": "1"
+      }, {
+        "fullName": "按比例",
+        "id": "2"
+      }],
+      marginMethodProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      overdueInterestRateOptions: [{
+        "fullName": "按年化",
+        "id": "1"
+      }, {
+        "fullName": "按月化",
+        "id": "2"
+      }],
+      overdueInterestRateProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      reservedFields1Options: [{
+        "fullName": "国内",
+        "id": "1"
+      }, {
+        "fullName": "国外",
+        "id": "2"
+      }],
+      reservedFields1Props: {
+        "label": "fullName",
+        "value": "id"
+      },
+      reservedFields2Options: [{
+        "fullName": "国内供应商",
+        "id": "1"
+      }, {
+        "fullName": "国外供应商",
+        "id": "2"
+      }],
+      reservedFields2Props: {
+        "label": "fullName",
+        "value": "id"
+      },
+      reservedFields3Options: [{
+        "fullName": "A级优质",
+        "id": "1"
+      }, {
+        "fullName": "B级普通",
+        "id": "2"
+      }, {
+        "fullName": "C级潜在",
+        "id": "3"
+      }, {
+        "fullName": "D级黑名单",
+        "id": "4"
+      }],
+      reservedFields3Props: {
+        "label": "fullName",
+        "value": "id"
+      },
+      autoCreditRatingOptions: [{
+        "fullName": "开启",
+        "id": "1"
+      }, {
+        "fullName": "关闭",
+        "id": "2"
+      }],
+      autoCreditRatingProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField119_representativeTypeOptions: [{
+        "fullName": "法定代表人",
+        "id": "1"
+      }, {
+        "fullName": "代办人",
+        "id": "2"
+      }, {
+        "fullName": "实控人",
+        "id": "3"
+      }, {
+        "fullName": "担保人",
+        "id": "4"
+      }],
+      tableField119_representativeTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField173_contactsTypeOptions: [{
+        "fullName": "默认",
+        "id": "1"
+      }, {
+        "fullName": "普通联系人",
+        "id": "2"
+      }],
+      tableField173_contactsTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {},
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("1754041598685376513").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.getcustomerStarRatingOptions();
+        this.queryData = JSON.parse(JSON.stringify(this.query))
+      }).catch((e) => {
+        this.$message({
+          type: 'error',
+          message: e.message
+        });
+        this.$router.push('/404');
+      })
+    })
+  },
+  methods: {
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return
+        let formData = JSON.parse(res.data.formData)
+        formData.popupType = 'general'
+        this.toFormDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.toFormDetail.init(formData, modelId, defaultValue)
         })
       })
     },
-    methods: {
-      toDetail(defaultValue, modelId) {
-        if (!defaultValue) return
-        getConfigData(modelId).then(res => {
-          if (!res.data || !res.data.formData) return
-          let formData = JSON.parse(res.data.formData)
-          formData.popupType = 'general'
-          this.toFormDetailVisible = true
-          this.$nextTick(() => {
-            this.$refs.toFormDetail.init(formData, modelId, defaultValue)
-          })
-        })
-      },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
         this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
+          this.$refs.treeBox.setCurrentKey(null)
         })
-      },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
-      },
-      loadNode(node, resolve) {
-        const nodeData = node.data
-        const config = {
-          treeInterfaceId: "",
-          treeTemplateJson: []
-        }
-        if (config.treeInterfaceId) {
-          //这里是为了拿到参数中关联的字段的值，后端自行拿
-          if (config.treeTemplateJson && config.treeTemplateJson.length) {
-            for (let i = 0; i < config.treeTemplateJson.length; i++) {
-              const element = config.treeTemplateJson[i];
-              element.defaultValue = nodeData[element.relationField] || ''
-            }
-          }
-          //参数
-          let query = {
-            paramList: config.treeTemplateJson || [],
-          }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
-        }
-      },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
-      },
-      transformColumnList(columnList) {
-        let list = []
-        for (let i = 0; i < columnList.length; i++) {
-          const e = columnList[i];
-          if (!e.prop.includes('-')) {
-            list.push(e)
-          } else {
-            let prop = e.prop.split('-')[0]
-            let label = e.label.split('-')[0]
-            let vModel = e.prop.split('-')[1]
-            let newItem = {
-              align: "center",
-              jnpfKey: "table",
-              prop,
-              label,
-              children: []
-            }
-            e.vModel = vModel
-            if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
-            if (!list.some(o => o.prop === prop)) list.push(newItem)
-            for (let i = 0; i < list.length; i++) {
-              if (list[i].prop === prop) {
-                list[i].children.push(e)
-                break
-              }
-            }
+      })
+    },
+    filterNode(value, data) {
+      if (!value) return true;
+      return data[this.treeProps.label].indexOf(value) !== -1;
+    },
+    loadNode(node, resolve) {
+      const nodeData = node.data
+      const config = {
+        treeInterfaceId: "",
+        treeTemplateJson: []
+      }
+      if (config.treeInterfaceId) {
+        //这里是为了拿到参数中关联的字段的值，后端自行拿
+        if (config.treeTemplateJson && config.treeTemplateJson.length) {
+          for (let i = 0; i < config.treeTemplateJson.length; i++) {
+            const element = config.treeTemplateJson[i];
+            element.defaultValue = nodeData[element.relationField] || ''
           }
         }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
-      },
-      arraySpanMethod({
-        column
-      }) {
-        for (let i = 0; i < this.mergeList.length; i++) {
-          if (column.property == this.mergeList[i].prop) {
-            return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
-          }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
         }
-      },
-      getMergeList(list) {
-        let newList = JSON.parse(JSON.stringify(list))
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            let child = {
-              prop: item.prop + '-child-first'
-            }
-            item.children.unshift(child)
-          }
-        })
-        newList.forEach(item => {
-          if (item.children && item.children.length) {
-            item.children.forEach((child, index) => {
-              if (index == 0) {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 1,
-                  colspan: item.children.length
-                })
-              } else {
-                this.mergeList.push({
-                  prop: child.prop,
-                  rowspan: 0,
-                  colspan: 0
-                })
-              }
-            })
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
           } else {
-            this.mergeList.push({
-              prop: item.prop,
-              rowspan: 1,
-              colspan: 1
-            })
+            resolve([]);
           }
         })
-      },
-      getExportList(list) {
-        let exportList = []
-        for (let i = 0; i < list.length; i++) {
-          if (list[i].jnpfKey === 'table') {
-            for (let j = 0; j < list[i].children.length; j++) {
-              exportList.push(list[i].children[j])
+      }
+    },
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList)
+    },
+    transformColumnList(columnList) {
+      let list = []
+      for (let i = 0; i < columnList.length; i++) {
+        const e = columnList[i];
+        if (!e.prop.includes('-')) {
+          list.push(e)
+        } else {
+          let prop = e.prop.split('-')[0]
+          let label = e.label.split('-')[0]
+          let vModel = e.prop.split('-')[1]
+          let newItem = {
+            align: "center",
+            jnpfKey: "table",
+            prop,
+            label,
+            children: []
+          }
+          e.vModel = vModel
+          if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
+          if (!list.some(o => o.prop === prop)) list.push(newItem)
+          for (let i = 0; i < list.length; i++) {
+            if (list[i].prop === prop) {
+              list[i].children.push(e)
+              break
             }
-          } else {
-            exportList.push(list[i])
           }
         }
-        this.exportList = exportList
-      },
-      getcustomerStarRatingOptions() {
-        getDictionaryDataSelector('517682237588636677').then(res => {
-          this.customerStarRatingOptions = res.data.list
-        })
-      },
-      goDetail(id) {
-        this.detailVisible = true
-        this.$nextTick(() => {
-          this.$refs.Detail.init(id)
-        })
-      },
-      sortChange({
-        column,
-        prop,
-        order
-      }) {
-        this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
-        this.listQuery.sidx = !order ? '' : prop
-        this.initData()
-      },
-      async initSearchDataAndListData() {
-        await this.initSearchData()
-        this.initData()
-      },
-      //初始化查询的默认数据
-      async initSearchData() {},
-      initData() {
-        this.listLoading = true;
-        let _query = {
-          ...this.listQuery,
-          ...this.query,
-          keyword: this.keyword,
-          dataType: 0,
-          menuId: this.menuId,
-          moduleId: '1754041598685376513',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/Subjectbasic/getList`,
-          method: 'post',
-          data: _query
-        }).then(res => {
-          var _list = res.data.list;
-          this.list = _list.map(o => ({
-            ...o,
-            ...this.expandObj,
-          }))
-          this.total = res.data.pagination.total
-          this.listLoading = false
-        })
-      },
-      handleDel(id) {
-        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/Subjectbasic/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
-          })
-        }).catch(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/Subjectbasic")
-        })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 1500,
-          })
-          return
+      }
+      this.getMergeList(list)
+      this.getExportList(list)
+      return list
+    },
+    arraySpanMethod({
+      column
+    }) {
+      for (let i = 0; i < this.mergeList.length; i++) {
+        if (column.property == this.mergeList[i].prop) {
+          return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
+        }
+      }
+    },
+    getMergeList(list) {
+      let newList = JSON.parse(JSON.stringify(list))
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          let child = {
+            prop: item.prop + '-child-first'
+          }
+          item.children.unshift(child)
         }
-        const ids = this.multipleSelection
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/Subjectbasic/batchRemove`,
-            data: ids,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      })
+      newList.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach((child, index) => {
+            if (index == 0) {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 1,
+                colspan: item.children.length
+              })
+            } else {
+              this.mergeList.push({
+                prop: child.prop,
+                rowspan: 0,
+                colspan: 0
+              })
+            }
           })
-        }).catch(() => {})
-      },
-      openSuperQuery() {
-        this.superQueryVisible = true
-        this.$nextTick(() => {
-          this.$refs.SuperQuery.init()
-        })
-      },
-      superQuery(queryJson) {
-        this.listQuery.superQueryJson = queryJson
-        this.listQuery.currentPage = 1
-        this.initData()
-      },
-      addOrUpdateHandle(row, flowState) {
-        if (!row) {
-          this.addHandle();
         } else {
-          this.updateHandle(row, flowState)
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
         }
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.exportList)
-        })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
+      })
+    },
+    getExportList(list) {
+      let exportList = []
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].jnpfKey === 'table') {
+          for (let j = 0; j < list[i].children.length; j++) {
+            exportList.push(list[i].children[j])
+          }
+        } else {
+          exportList.push(list[i])
         }
+      }
+      this.exportList = exportList
+    },
+    getcustomerStarRatingOptions() {
+      getDictionaryDataSelector('517682237588636677').then(res => {
+        this.customerStarRatingOptions = res.data.list
+      })
+    },
+    goDetail(id) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id)
+      })
+    },
+    sortChange({
+      column,
+      prop,
+      order
+    }) {
+      this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
+      this.listQuery.sidx = !order ? '' : prop
+      this.initData()
+    },
+    async initSearchDataAndListData() {
+      await this.initSearchData()
+      // this.initData()
+    },
+    //初始化查询的默认数据
+    async initSearchData() { },
+    initData() {
+      this.listLoading = true;
+      let _query = {
+        ...this.listQuery,
+        ...this.query,
+        keyword: this.keyword,
+        dataType: 0,
+        menuId: this.menuId,
+        moduleId: '1754041598685376513',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Subjectbasic/getList`,
+        method: 'post',
+        data: _query
+      }).then(res => {
+        var _list = res.data.list;
+        this.list = _list.map(o => ({
+          ...o,
+          ...this.expandObj,
+        }))
+        this.total = res.data.pagination.total
+        this.listLoading = false
+      })
+    },
+    handleDel(id) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/scm/Subjectbasic/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Subjectbasic/${id}`,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
-        })
-      },
-      search() {
-        this.listQuery.currentPage = 1
-        this.listQuery.pageSize = 20
-        this.listQuery.sort = "desc"
-        this.listQuery.sidx = ""
-        this.initData()
-      },
-      //流程改造后相关调用方法
-      updateHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
-        }
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
-        })
-      },
-      updateBusinessConfigHandle(row, flowState) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId || this.flowList[0].id,
-          opType: flowState ? 0 : '-1',
-          status: flowState
-        }
-        this.flowBusinessConfigVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBusinessConfigBox.init(data)
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
         })
-      },
-      toApprovalDetail(row) {
-        let data = {
-          id: row.id,
-          flowId: row.flowId,
-          opType: 0,
-          status: row.currentState
-        }
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Subjectbasic")
+      })
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
         })
-      },
-      addHandle() {
-        if (!this.flowList.length) {
+        return
+      }
+      const ids = this.multipleSelection
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/api/scm/Subjectbasic/batchRemove`,
+          data: ids,
+          method: 'DELETE'
+        }).then(res => {
           this.$message({
-            type: 'error',
-            message: '流程不存在'
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
           });
-        } else if (this.flowList.length === 1) {
-          this.selectFlow(this.flowList[0])
-        } else {
-          this.flowListVisible = true
-        }
-      },
-      //选择流程发起
-      selectFlow(item) {
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: item.id,
-          opType: '-1'
-        }
-        this.flowListVisible = false
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
         })
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        this.query = JSON.parse(JSON.stringify(this.queryData))
-        this.search()
-      },
-      colseFlow(isrRefresh) {
-        this.flowVisible = false
-        this.flowBusinessConfigVisible = false
-        if (isrRefresh) this.reset()
-      },
-    }
+      }).catch(() => { })
+    },
+    openSuperQuery() {
+      this.superQueryVisible = true
+      this.$nextTick(() => {
+        this.$refs.SuperQuery.init()
+      })
+    },
+    superQuery(queryJson) {
+      this.listQuery.superQueryJson = queryJson
+      this.listQuery.currentPage = 1
+      this.initData()
+    },
+    addOrUpdateHandle(row, flowState) {
+      if (!row) {
+        this.addHandle();
+      } else {
+        this.updateHandle(row, flowState)
+      }
+    },
+    exportData() {
+      this.exportBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.ExportBox.init(this.exportList)
+      })
+    },
+    download(data) {
+      let query = {
+        ...data,
+        ...this.listQuery,
+        ...this.query,
+        menuId: this.menuId
+      }
+      request({
+        url: `/api/scm/Subjectbasic/Actions/Export`,
+        method: 'post',
+        data: query
+      }).then(res => {
+        if (!res.data.url) return
+        this.jnpf.downloadFile(res.data.url)
+        this.$refs.ExportBox.visible = false
+        this.exportBoxVisible = false
+      })
+    },
+    search() {
+      this.listQuery.currentPage = 1
+      this.listQuery.pageSize = 20
+      this.listQuery.sort = "desc"
+      this.listQuery.sidx = ""
+      this.initData()
+    },
+    //流程改造后相关调用方法
+    updateHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    updateBusinessConfigHandle(row, flowState) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId || this.flowList[0].id,
+        opType: flowState ? 0 : '-1',
+        status: flowState
+      }
+      this.flowBusinessConfigVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBusinessConfigBox.init(data)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({
+          type: 'error',
+          message: '流程不存在'
+        });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData))
+      this.search()
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false
+      this.flowBusinessConfigVisible = false
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
index 03dabe19..4c56e32a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/bom/index.vue
@@ -444,7 +444,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue
index 9e04789f..33737335 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractL/index.vue
@@ -250,7 +250,7 @@ export default {
         isLeaf: "isLeaf"
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [],
       total: 0,
       queryData: {},
@@ -551,7 +551,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData();
-      this.initData();
+      // this.initData();
     },
     //初始化查询的默认数据
     async initSearchData() { },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue
index 1562bb28..b1c74cf0 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/driver/index.vue
@@ -179,7 +179,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [], total: 0,
       queryData: {},
       listQuery: {
@@ -374,7 +374,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue
index cecb1195..c4f39d19 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productWarehouse/index.vue
@@ -219,7 +219,7 @@ export default {
         isLeaf: "isLeaf"
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       total: 0,
       queryData: {},
       listQuery: {
@@ -609,7 +609,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData();
-      this.initData();
+      // this.initData();
     },
     //初始化查询的默认数据
     async initSearchData() { },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue
index 9d511339..769221c9 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productprice/index.vue
@@ -180,7 +180,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [],
       total: 0,
       queryData: {},
@@ -397,7 +397,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() { },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
index 70d3666e..0a0ded08 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/vehicle/index.vue
@@ -174,7 +174,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [], total: 0,
       queryData: {},
       listQuery: {
@@ -371,7 +371,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue
index f9fd1c5f..f3d9613a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginspection/index.vue
@@ -443,7 +443,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue
index f18b3865..7d1d2bed 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/index.vue
@@ -497,7 +497,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
index 5d61aadd..b61f7c8f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue
@@ -222,7 +222,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [], total: 0,
       queryData: {},
       listQuery: {
@@ -435,7 +435,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue
index c1e73de5..930f80cc 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreceive/index.vue
@@ -473,7 +473,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue
index 3a8e0ec2..4ecf6e2d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreportloss/index.vue
@@ -483,7 +483,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
index 3c07f72b..7b0e51a8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingreturn/index.vue
@@ -499,7 +499,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
index 33a21933..57be59fb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue
@@ -250,7 +250,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [],
       total: 0,
       queryData: {},
@@ -507,7 +507,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() { },
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
index 490a1575..4f1e7886 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
@@ -215,7 +215,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelectionItem: [],
       multipleSelection: [], total: 0,
       queryData: {},
@@ -479,7 +479,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
index 4812ef17..4f1713e8 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
@@ -119,7 +119,6 @@
 
               <el-button size="mini" type="text" :disabled="!scope.row.flowState"
                 @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
-              </el-button>
 
               <el-button v-if="scope.row.warehousingStatus != 4" size="mini" type="text"
                 v-has="'btn-warehousing'" @click="addwarehousing(scope.row)">出库
@@ -219,7 +218,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelectionItem: [],
       multipleSelection: [], total: 0,
       queryData: {},
@@ -482,7 +481,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
index 1de4a513..0904b9fb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
@@ -448,7 +448,7 @@ export default {
     },
     async initSearchDataAndListData() {
       await this.initSearchData()
-      this.initData()
+      // this.initData()
     },
     //初始化查询的默认数据
     async initSearchData() {