diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
index 967c58b0..fd4deee0 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
@@ -717,7 +717,12 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
         queryWrapper.isNull("a.f_delete_mark");
         queryWrapper.inSql("a.id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单
         queryWrapper.like("a.organize_json_id",organize);
-//        queryWrapper.orderByDesc("a.f_creator_time"); // 排序
+
+        queryWrapper.eq("a.delivery_type","1"); //取仓配的凭证
+        queryWrapper.eq("a.document_type",voucherPagination.getDocumentType());
+
+
+
         Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
         IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper);
         return voucherPagination.setData(voucherEntityIPage.getRecords(),voucherEntityIPage.getTotal());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java
index 8d80401e..2f77be2e 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessLine1Controller.java
@@ -125,7 +125,6 @@ public class BusinessLine1Controller {
                             List<BusinessContact1Entity> businessContact1List = businessLine1Service.getBusinessContact1List(entity.getId(),businessLine1Pagination);
                             businessLine1Map.put("tableField133",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(businessContact1List)));
                             realList.add(businessLine1Map);
-                        }else {
                         }
                     }
                 }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
index 1cb31277..80922963 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
@@ -699,8 +699,7 @@ public class WarehousingNotificationController {
             QueryWrapper<WarehousingProductEntity> warehousingProductEntityQueryWrapper=new QueryWrapper<>();
             warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id);
             warehousingProductEntityQueryWrapper.like("organize_json_id",organize);
-            warehousingProductEntityQueryWrapper.like("delivery_type","1"); //取仓配的凭证
-            warehousingProductEntityQueryWrapper.like("document_type",voucherPagination.getDocumentType());
+//
 
         List<WarehousingProductEntity> warehousingProductEntityList = warehousingProductService.list(warehousingProductEntityQueryWrapper);
             List<VoucherEntity> list=new ArrayList<>();
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/contacts/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/contacts/index.vue
index b5338335..45f0e538 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/contacts/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/contacts/index.vue
@@ -5,13 +5,8 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="联系人类型">
-              <JnpfSelect
-                v-model="query.contactsType"
-                placeholder="请选择"
-                clearable
-                :options="contactsTypeOptions"
-                :props="contactsTypeProps"
-              >
+              <JnpfSelect v-model="query.contactsType" placeholder="请选择" clearable
+                :options="contactsTypeOptions" :props="contactsTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -23,12 +18,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()"
-                >查询</el-button
-              >
-              <el-button icon="el-icon-refresh-right" @click="reset()"
-                >重置</el-button
-              >
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -36,188 +27,83 @@
       <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
+            <!-- <el-button
               type="text"
               icon="icon-ym icon-ym-btn-clearn"
               @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'"
               >批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          has-c
-          @selection-change="handleSelectionChange"
-          :span-method="arraySpanMethod"
-          border
-          custom-column
-        >
-          <el-table-column
-            label="联系人类型"
-            prop="contactsType"
-            width="110"
-            align="center"
-            sortable
-            fixed="left"
-          >
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
+          <el-table-column label="联系人类型" prop="contactsType" width="110" align="center" sortable
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.contactsType }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="name"
-            label="姓名"
-            width="120"
-            align="center"
-            sortable
-            fixed="left"
-          >
+          <el-table-column prop="name" label="姓名" width="120" align="center" sortable fixed="left">
           </el-table-column>
-          <el-table-column
-            prop="subjectBasicId"
-            label="所属供应商"
-            align="center"
-            width="280"
-          >
+          <el-table-column prop="subjectBasicId" label="所属供应商" align="center" width="280">
           </el-table-column>
-          <el-table-column
-            prop="position"
-            label="职务"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="position" label="职务" align="center" width="150">
           </el-table-column>
-          <el-table-column
-            prop="companyName"
-            label="公司"
-            align="center"
-            width="280"
-          >
+          <el-table-column prop="companyName" label="公司" align="center" width="280">
           </el-table-column>
-          <el-table-column
-            prop="mobile"
-            label="手机"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="mobile" label="手机" align="center" width="150">
           </el-table-column>
           <el-table-column prop="phone" label="电话" align="center" width="150">
           </el-table-column>
-          <el-table-column
-            prop="emaile"
-            label="邮箱"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="emaile" label="邮箱" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="address"
-            label="地址"
-            align="center"
-            width="400"
-          >
+          <el-table-column prop="address" label="地址" align="center" width="400">
           </el-table-column>
-          <el-table-column
-            prop="markColor"
-            label="是否星标"
-            align="center"
-            width="80"
-          >
+          <el-table-column prop="markColor" label="是否星标" align="center" width="80">
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            fixed="right"
-            width="120"
-          >
+          <el-table-column label="操作" align="center" fixed="right" width="120">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                @click="addOrUpdateHandle(scope.row)"
-                v-has="'btn_edit'"
-                >编辑
+              <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button
-                type="text"
-                class="JNPF-table-delBtn"
-                v-has="'btn_remove'"
-                @click="handleDel(scope.row.id)"
-                >删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
-              <el-button
-                type="text"
-                v-has="'btn_detail'"
-                @click="goDetail(scope.row.id)"
-                >详情
+              <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </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" />
 
     <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -484,7 +370,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -528,7 +414,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
@@ -568,7 +454,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     openSuperQuery() {
       this.superQueryVisible = true;
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectaccountperiodrulesno/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectaccountperiodrulesno/index.vue
index 917f2908..f6f3523d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectaccountperiodrulesno/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectaccountperiodrulesno/index.vue
@@ -19,13 +19,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -33,13 +35,15 @@
                 @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>
-          <el-table-column prop="businessNo" label="单据号"  sortable align="center">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
+          <el-table-column prop="businessNo" label="单据号" sortable align="center">
           </el-table-column>
           <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
           </el-table-column>
@@ -64,558 +68,561 @@
               <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>
             </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" />
-    <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-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 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 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,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    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: {
-          businessNo: undefined,
-          businessType:'1',
-        },
-        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,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        tableField102_creditRatingOptions: [{
-          "fullName": "一星",
-          "id": "1"
-        }, {
-          "fullName": "二星",
-          "id": "2"
-        }, {
-          "fullName": "三星",
-          "id": "3"
-        }, {
-          "fullName": "四星",
-          "id": "4"
-        }, {
-          "fullName": "五星",
-          "id": "5"
-        }],
-        tableField102_creditRatingProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField102_cooperateTypeOptions: [{
-          "fullName": "买断",
-          "id": "1"
-        }, {
-          "fullName": "联营",
-          "id": "2"
-        }],
-        tableField102_cooperateTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField102_settlementTypeOptions: [{
-          "fullName": "先货后款",
-          "id": "1"
-        }, {
-          "fullName": "先款后货",
-          "id": "2"
-        }],
-        tableField102_settlementTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {},
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("522376064903685637").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          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)
-          })
-        })
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        businessNo: undefined,
+        businessType: '1',
       },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
-        this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
-        })
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      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([]);
-            }
-          })
-        }
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      tableField102_creditRatingOptions: [{
+        "fullName": "一星",
+        "id": "1"
+      }, {
+        "fullName": "二星",
+        "id": "2"
+      }, {
+        "fullName": "三星",
+        "id": "3"
+      }, {
+        "fullName": "四星",
+        "id": "4"
+      }, {
+        "fullName": "五星",
+        "id": "5"
+      }],
+      tableField102_creditRatingProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
+      tableField102_cooperateTypeOptions: [{
+        "fullName": "买断",
+        "id": "1"
+      }, {
+        "fullName": "联营",
+        "id": "2"
+      }],
+      tableField102_cooperateTypeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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
-              }
-            }
-          }
-        }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
+      tableField102_settlementTypeOptions: [{
+        "fullName": "先货后款",
+        "id": "1"
+      }, {
+        "fullName": "先款后货",
+        "id": "2"
+      }],
+      tableField102_settlementTypeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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]
+      interfaceRes: {},
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("522376064903685637").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        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)
+        })
+      })
+    },
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
+        this.$nextTick(() => {
+          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] || ''
           }
         }
-      },
-      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
-                })
-              }
-            })
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        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
-      },
-      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: '522376064903685637',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/Subjectaccountperiodrulesno/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/Subjectaccountperiodrulesno/${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/Subjectaccountperiodrulesno")
-        })
-      },
-      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]
         }
-        const ids = this.multipleSelection
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/Subjectaccountperiodrulesno/batchRemove`,
-            data: ids,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      }
+    },
+    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
+              })
+            }
           })
-        }).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
+    },
+    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: '522376064903685637',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Subjectaccountperiodrulesno/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/Subjectaccountperiodrulesno/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Subjectaccountperiodrulesno/${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)
+          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/Subjectaccountperiodrulesno")
+      })
+    },
+    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/Subjectaccountperiodrulesno/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
-        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/Subjectaccountperiodrulesno/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)
+      })
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
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 18bf7ff4..64533b34 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
@@ -5,13 +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>
@@ -23,25 +18,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="客户星级">
-              <JnpfSelect
-                v-model="query.customerStarRating"
-                placeholder="请选择"
-                clearable
-                :options="customerStarRatingOptions"
-                :props="customerStarRatingProps"
-                multiple
-              >
+              <JnpfSelect v-model="query.customerStarRating" placeholder="请选择" clearable
+                :options="customerStarRatingOptions" :props="customerStarRatingProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()"
-                >查询</el-button
-              >
-              <el-button icon="el-icon-refresh-right" @click="reset()"
-                >重置</el-button
-              >
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -49,240 +34,108 @@
       <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
+            <!-- <el-button
               type="text"
               icon="icon-ym icon-ym-btn-clearn"
               @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'"
               >批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          @sort-change="sortChange"
-          has-c
-          @selection-change="handleSelectionChange"
-          :span-method="arraySpanMethod"
-          border
-          custom-column
-        >
-          <el-table-column
-            prop="name"
-            label="客户名称"
-            align="center"
-            sortable
-            fixed="left"
-          >
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" has-c
+          @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
-            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
-            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 }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="enterpriseNature"
-            label="企业性质"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="enterpriseNature" label="企业性质" align="center" width="150">
           </el-table-column>
-          <el-table-column
-            prop="industryClassify"
-            label="行业分类"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="industryClassify" label="行业分类" align="center" width="150">
           </el-table-column>
-          <el-table-column
-            prop="customerStarRating"
-            label="客户星级"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="customerStarRating" label="客户星级" align="center" width="150">
           </el-table-column>
-          <el-table-column
-            prop="belongPeople"
-            label="归属人员"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="belongPeople" label="归属人员" align="center" width="150">
           </el-table-column>
-          <el-table-column
-            prop="flowState"
-            label="状态"
-            align="center"
-            width="150"
-          >
+          <el-table-column prop="flowState" label="状态" align="center" width="150">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
-              <el-tag type="success" v-else-if="scope.row.flowState == 2"
-                >审核通过</el-tag
-              >
-              <el-tag type="danger" v-else-if="scope.row.flowState == 3"
-                >审核驳回</el-tag
-              >
-              <el-tag type="info" v-else-if="scope.row.flowState == 4"
-                >流程撤回</el-tag
-              >
-              <el-tag type="info" v-else-if="scope.row.flowState == 5"
-                >审核终止</el-tag
-              >
+              <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            fixed="right"
-            align="center"
-            width="200"
-          >
+          <el-table-column label="操作" fixed="right" align="center" width="200">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
-                @click="updateHandle(scope.row)"
-                v-has="'btn_edit'"
-                >编辑
+              <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
-              >
-              <el-button
-                type="text"
-                :disabled="scope.row.flowState != 2"
-                @click="updateBusinessConfigHandle(scope.row)"
-                v-has="'btn_edit'"
-                >业务配置
+              <el-button size="mini" type="text" :disabled="!scope.row.flowState"
+                @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
+              <el-button type="text" :disabled="scope.row.flowState != 2"
+                @click="updateBusinessConfigHandle(scope.row)" v-has="'btn_edit'">业务配置
               </el-button>
             </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)"
-        >
+        <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -791,7 +644,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -835,7 +688,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
@@ -875,7 +728,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     openSuperQuery() {
       this.superQueryVisible = true;
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectblacklist/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectblacklist/index.vue
index 7ada687f..bd6f510e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectblacklist/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectblacklist/index.vue
@@ -5,22 +5,22 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="黑名单类型">
-              <JnpfSelect v-model="query.blacklistType" placeholder="请选择" clearable :options="blacklistTypeOptions"
-                :props="blacklistTypeProps" multiple>
+              <JnpfSelect v-model="query.blacklistType" placeholder="请选择" clearable
+                :options="blacklistTypeOptions" :props="blacklistTypeProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生效开始时间">
-              <JnpfDateRangePicker v-model="query.startTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.startTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生效结束时间">
-              <JnpfDateRangePicker v-model="query.endTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.endTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -35,13 +35,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -49,12 +51,14 @@
                 @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="subjectBasicId" label="关联客户" sortable align="center">
           </el-table-column>
           <el-table-column label="黑名单类型" prop="blacklistType" align="center" width="150">
@@ -81,531 +85,534 @@
               <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>
             </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" />
-    <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-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 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 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,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    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: {
-          blacklistType: undefined,
-          startTime: undefined,
-          endTime: undefined,
-          businessType:'1',
-        },
-        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,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        blacklistTypeOptions: [{
-          "fullName": "违规",
-          "id": "1"
-        }, {
-          "fullName": "违法",
-          "id": "2"
-        }],
-        blacklistTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {
-          subjectBasicId: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("522393063729932101").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          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)
-          })
-        })
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        blacklistType: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        businessType: '1',
       },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
-        this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
-        })
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      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([]);
-            }
-          })
-        }
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      blacklistTypeOptions: [{
+        "fullName": "违规",
+        "id": "1"
+      }, {
+        "fullName": "违法",
+        "id": "2"
+      }],
+      blacklistTypeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
+      interfaceRes: {
+        subjectBasicId: [],
       },
-      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
-              }
-            }
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("522393063729932101").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        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)
+        })
+      })
+    },
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
+        this.$nextTick(() => {
+          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] || ''
           }
         }
-        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
-      },
-      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: '522393063729932101',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/SubjectBlacklist/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/SubjectBlacklist/${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/SubjectBlacklist")
-        })
-      },
-      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]
         }
-        const ids = this.multipleSelection
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/SubjectBlacklist/batchRemove`,
-            data: ids,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      }
+    },
+    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
+              })
+            }
           })
-        }).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
+    },
+    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: '522393063729932101',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/SubjectBlacklist/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/SubjectBlacklist/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/SubjectBlacklist/${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)
+          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/SubjectBlacklist")
+      })
+    },
+    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/SubjectBlacklist/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
-        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/SubjectBlacklist/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)
+      })
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditratingno/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditratingno/index.vue
index 18f8e08b..4b37d74f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditratingno/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditratingno/index.vue
@@ -24,13 +24,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -38,12 +40,14 @@
                 @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="businessNo" label="单据号" sortable align="center">
           </el-table-column>
           <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
@@ -69,521 +73,524 @@
               <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>
             </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" />
-    <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-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 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 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,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    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: {
-          businessNo: undefined,
-          businessType: 1,
-        },
-        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,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        tableField102_creditRatingOptions: [],
-        tableField102_creditRatingProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {},
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("522005775749488005").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          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: {
+        businessNo: undefined,
+        businessType: 1,
+      },
+      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,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      tableField102_creditRatingOptions: [],
+      tableField102_creditRatingProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {},
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("522005775749488005").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        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
-      },
-      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: '522005775749488005',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/Subjectcreditratingno/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/Subjectcreditratingno/${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/Subjectcreditratingno")
-        })
-      },
-      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/Subjectcreditratingno/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
+    },
+    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: '522005775749488005',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Subjectcreditratingno/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/Subjectcreditratingno/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Subjectcreditratingno/${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)
+          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/Subjectcreditratingno")
+      })
+    },
+    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/Subjectcreditratingno/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
-        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/Subjectcreditratingno/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)
+      })
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditrules/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditrules/index.vue
index 811acd1e..345f477e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditrules/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectcreditrules/index.vue
@@ -15,15 +15,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="类目">
-              <JnpfSelect v-model="query.categoryName" placeholder="请选择" clearable :options="categoryNameOptions"
-                :props="categoryNameProps" multiple>
+              <JnpfSelect v-model="query.categoryName" placeholder="请选择" clearable
+                :options="categoryNameOptions" :props="categoryNameProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="项目">
-              <JnpfSelect v-model="query.projectName" placeholder="请选择" clearable :options="projectNameOptions"
-                :props="projectNameProps" multiple>
+              <JnpfSelect v-model="query.projectName" placeholder="请选择" clearable
+                :options="projectNameOptions" :props="projectNameProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -34,7 +34,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -47,13 +48,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -61,12 +64,14 @@
                 @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="businessNo" label="单据号" sortable align="center">
           </el-table-column>
           <el-table-column prop="categoryName" label="类目" align="center" width="150">
@@ -90,541 +95,544 @@
               <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>
             </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" />
-    <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-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 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 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,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    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,
 
-        showAll: false,
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          businessType: 1,
-          businessNo: undefined,
-          categoryName: undefined,
-          projectName: undefined,
-        },
-        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,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        categoryNameOptions: [],
-        categoryNameProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        projectNameOptions: [],
-        projectNameProps: {
-          "label": "fullName",
-          "value": "enCode"
-        },
-        interfaceRes: {},
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("522736258103914309").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          this.getcategoryNameOptions();
-          this.getprojectNameOptions();
-          this.queryData = JSON.parse(JSON.stringify(this.query))
-        }).catch((e) => {
-          this.$message({
-            type: 'error',
-            message: e.message
-          });
-          this.$router.push('/404');
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        businessType: 1,
+        businessNo: undefined,
+        categoryName: undefined,
+        projectName: undefined,
+      },
+      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,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      categoryNameOptions: [],
+      categoryNameProps: {
+        "label": "fullName",
+        "value": "enCode"
+      },
+      projectNameOptions: [],
+      projectNameProps: {
+        "label": "fullName",
+        "value": "enCode"
+      },
+      interfaceRes: {},
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("522736258103914309").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        this.getcategoryNameOptions();
+        this.getprojectNameOptions();
+        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
-      },
-      getcategoryNameOptions() {
-        getDictionaryDataSelector('522733511912730437').then(res => {
-          this.categoryNameOptions = res.data.list
-        })
-      },
-      getprojectNameOptions() {
-        getDictionaryDataSelector('522733676014874437').then(res => {
-          this.projectNameOptions = 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: '522736258103914309',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/Subjectcreditrules/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/Subjectcreditrules/${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/Subjectcreditrules")
-        })
-      },
-      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/Subjectcreditrules/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
+    },
+    getcategoryNameOptions() {
+      getDictionaryDataSelector('522733511912730437').then(res => {
+        this.categoryNameOptions = res.data.list
+      })
+    },
+    getprojectNameOptions() {
+      getDictionaryDataSelector('522733676014874437').then(res => {
+        this.projectNameOptions = 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: '522736258103914309',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/Subjectcreditrules/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/Subjectcreditrules/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Subjectcreditrules/${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)
+          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/Subjectcreditrules")
+      })
+    },
+    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/Subjectcreditrules/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
-        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/Subjectcreditrules/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)
+      })
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectfollowmanagement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectfollowmanagement/index.vue
index 652ec2af..34382c0e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectfollowmanagement/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/customer/subjectfollowmanagement/index.vue
@@ -51,13 +51,13 @@
               v-has="'btn_download'"
               >导出
             </el-button>
-            <el-button
+            <!-- <el-button
               type="text"
               icon="icon-ym icon-ym-btn-clearn"
               @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'"
               >批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 8a4e4d16..03dabe19 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
@@ -59,9 +59,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/businessLine/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/businessLine/index.vue
index 3e04639d..dbb309d4 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/businessLine/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/businessLine/index.vue
@@ -63,9 +63,9 @@
             <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
               v-has="'btn_upload'">导入
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/index.vue
index 3bd5cfbd..90c96893 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/index.vue
@@ -48,9 +48,9 @@
             <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
               v-has="'btn_upload'">导入
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -69,19 +69,21 @@
           :span-method="arraySpanMethod">
           <!-- <el-table-column prop="code" label="业务线编号" align="left">
           </el-table-column> -->
-          <el-table-column prop="name" label="车间名称" align="center" fixed="left" sortable>
+          <el-table-column prop="name" label="车间名称" align="center" fixed="left" sortable
+            width="200px">
           </el-table-column>
-          <el-table-column prop="workFactory" label="所属工厂/基地" align="center" fixed="left" sortable>
+          <el-table-column prop="workFactory" label="所属工厂/基地" align="center" fixed="left" sortable
+            width="200px">
           </el-table-column>
-          <el-table-column prop="description" label="描述" align="center">
+          <el-table-column prop="description" label="描述" align="center" width="150px">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="添加时间" align="center">
+          <el-table-column prop="creatorTime" label="添加时间" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
             </template>
           </el-table-column>
 
-          <el-table-column prop="creatorUserId" label="添加人" align="center">
+          <el-table-column prop="creatorUserId" label="添加人" align="center" width="150px">
           </el-table-column>
           <!-- <el-table-column prop="lastModifyTime" label="更新时间" align="center">
           </el-table-column> -->
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/indexcopy.vue b/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/indexcopy.vue
deleted file mode 100644
index c49f988a..00000000
--- a/jnpf-java-boot/jnpf-web/src/views/scm/businessline2/indexcopy.vue
+++ /dev/null
@@ -1,627 +0,0 @@
-
-
-
-
-
-
-
-<template>
-  <div class="JNPF-common-layout">
-    <div class="JNPF-common-layout-center">
-      <el-row class="JNPF-common-search-box" :gutter="16">
-        <el-form @submit.native.prevent>
-          <el-col :span="6">
-            <el-form-item label="业务线编号">
-              <el-input v-model="query.code" placeholder="请输入" clearable> </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="业务线名称">
-              <el-input v-model="query.name" placeholder="请输入" clearable> </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="类型">
-              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
-                :props="typeProps" multiple>
-              </JnpfSelect>
-            </el-form-item>
-          </el-col>
-          <template v-if="showAll">
-            <el-col :span="6">
-              <el-form-item label="所属分类">
-                <JnpfSelect v-model="query.industry" placeholder="请选择" clearable
-                  :options="industryOptions" :props="industryProps" multiple>
-                </JnpfSelect>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="成立时间">
-                <JnpfDateRangePicker v-model="query.establishDate" format="yyyy-MM-dd"
-                  startPlaceholder="开始日期" endPlaceholder="结束日期">
-                </JnpfDateRangePicker>
-              </el-form-item>
-            </el-col>
-          </template>
-          <el-col :span="6">
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
-                v-if="!showAll">
-                展开
-              </el-button>
-              <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
-                收起
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <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>
-            <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-upload" @click="handelUpload()"
-              v-has="'btn_upload'">导入
-            </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
-              v-has="'btn_batchRemove'">批量删除
-            </el-button>
-          </div>
-          <div class="JNPF-common-head-right">
-            <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                @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-tooltip>
-          </div>
-        </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-          <el-table-column prop="code" label="业务线编号" align="left">
-          </el-table-column>
-          <el-table-column prop="name" label="业务线名称" align="left">
-          </el-table-column>
-          <el-table-column prop="simpleName" label="业务线简称" align="left">
-          </el-table-column>
-          <el-table-column prop="type" label="类型" align="left">
-          </el-table-column>
-          <el-table-column prop="industry" label="所属分类" align="left">
-          </el-table-column>
-          <el-table-column prop="city" label="所在城市" align="left">
-          </el-table-column>
-          <el-table-column prop="establishDate" label="成立时间" align="left">
-          </el-table-column>
-          <el-table-column prop="description" label="描述" align="left">
-          </el-table-column>
-          <el-table-column prop="flowState" label="状态" width="100">
-            <template slot-scope="scope" v-if="!scope.row.top">
-              <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
-              <el-tag type="success" v-else-if="scope.row.flowState==2">审核通过</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.flowState==3">审核驳回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==4">流程撤回</el-tag>
-              <el-tag type="info" v-else-if="scope.row.flowState==5">审核终止</el-tag>
-              <el-tag type="warning" v-else>等待提交</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" fixed="right" width="150">
-            <template slot-scope="scope">
-              <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>
-              <el-button size="mini" type="text" :disabled="!scope.row.flowState"
-                @click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
-            </template>
-          </el-table-column>
-        </JNPF-table>
-        <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" />
-    <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>
-      </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" />
-  </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 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,
-    ExportBox, ToFormDetail, SuperQuery
-  },
-  data() {
-    return {
-
-      keyword: '',
-      expandsTree: true,
-      refreshTree: true,
-      toFormDetailVisible: false,
-      expandObj: {},
-      columnOptions: [],
-      mergeList: [],
-      exportList: [],
-      columnList,
-
-      showAll: false,
-      superQueryVisible: false,
-      superQueryJson,
-      uploadBoxVisible: false,
-      detailVisible: false,
-      query: {
-        code: undefined,
-        name: undefined,
-        type: undefined,
-        industry: undefined,
-        establishDate: undefined,
-      },
-      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,
-      flowListVisible: false,
-      flowList: [],
-      exportBoxVisible: false,
-      typeOptions: [],
-      typeProps: { "label": "fullName", "value": "id" },
-      parentIdOptions: [],
-      parentIdProps: { "label": "name", "value": "id" },
-      statusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
-      statusProps: { "label": "fullName", "value": "id" },
-      tableField133_contactTypeOptions: [],
-      tableField133_contactTypeProps: { "label": "fullName", "value": "id" },
-      interfaceRes: {
-      },
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    menuId() {
-      return this.$route.meta.modelId || ''
-    }
-  },
-  created() {
-    getFormById("521634040684484613").then(res1 => {
-      let flowId = res1.data && res1.data.id
-      getFlowList(flowId, '1').then(res2 => {
-        this.flowList = res2.data
-        this.getColumnList(),
-          this.initSearchDataAndListData()
-        this.gettypeOptions();
-        this.getindustryOptions();
-        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)
-        })
-      })
-    },
-    toggleTreeExpand(expands) {
-      this.refreshTree = false
-      this.expandsTree = expands
-      this.$nextTick(() => {
-        this.refreshTree = true
-        this.$nextTick(() => {
-          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
-            }
-          }
-        }
-      }
-      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)
-        }
-      })
-      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
-              })
-            }
-          })
-        } else {
-          this.mergeList.push({
-            prop: item.prop,
-            rowspan: 1,
-            colspan: 1
-          })
-        }
-      })
-    },
-    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
-    },
-    gettypeOptions() {
-      getDictionaryDataSelector('517662753159119813').then(res => {
-        this.typeOptions = res.data.list
-      })
-    },
-    getindustryOptions() {
-      getDictionaryDataSelector('517664069117805509').then(res => {
-        this.industryOptions = 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: '521634040684484613',
-        type: 1,
-      };
-      request({
-        url: `/api/scm/BusinessLine1/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/BusinessLine1/${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/BusinessLine1")
-      })
-    },
-    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
-      }
-      const ids = this.multipleSelection
-      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-        type: 'warning'
-      }).then(() => {
-        request({
-          url: `/api/scm/BusinessLine1/batchRemove`,
-          data: ids,
-          method: 'DELETE'
-        }).then(res => {
-          this.$message({
-            type: 'success',
-            message: res.msg,
-            onClose: () => {
-              this.initData()
-            }
-          });
-        })
-      }).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/BusinessLine1/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)
-      })
-    },
-    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
-      if (isrRefresh) this.reset()
-    },
-  }
-}
-</script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/businessline3/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/businessline3/index.vue
index dace160c..a0cf3395 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/businessline3/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/businessline3/index.vue
@@ -36,9 +36,9 @@
             <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
               v-has="'btn_upload'">导入
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -54,9 +54,10 @@
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
           custom-column border @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod">
-          <el-table-column prop="code" label="生产线编号" align="center" sortable fixed="lfet">
+          <el-table-column prop="code" label="生产线编号" align="center" sortable fixed="lfet"
+            width="200px">
           </el-table-column>
-          <el-table-column prop="name" label="生产线名称" align="center" sortable>
+          <el-table-column prop="name" label="生产线名称" align="center" sortable width="200px">
           </el-table-column>
           <el-table-column prop="simpleName" label=" 简称/英文名" align="center">
           </el-table-column>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/classplan/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/classplan/index.vue
index 651974b4..bf811beb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/classplan/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/classplan/index.vue
@@ -10,15 +10,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="排班计划状态">
-              <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable :options="timeStatusOptions"
-                :props="timeStatusProps">
+              <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable
+                :options="timeStatusOptions" :props="timeStatusProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="倒班方式">
-              <JnpfSelect v-model="query.shiftMethod" placeholder="请选择" clearable :options="shiftMethodOptions"
-                :props="shiftMethodProps" multiple>
+              <JnpfSelect v-model="query.shiftMethod" placeholder="请选择" clearable
+                :options="shiftMethodOptions" :props="shiftMethodProps" multiple>
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -33,13 +33,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -47,12 +49,14 @@
                 @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 custom-column border
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
           <el-table-column prop="timeName" label="排班计划名称" align="center" fixed="left" sortable>
           </el-table-column>
           <el-table-column prop="timeCode" label="排班计划编号" align="center" fixed="left" sortable>
@@ -78,15 +82,16 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </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" />
@@ -94,8 +99,10 @@
 
     <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>
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/classteam/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/classteam/index.vue
index 906506cf..3e484fcd 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/classteam/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/classteam/index.vue
@@ -72,9 +72,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/classtime/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/classtime/index.vue
index be693241..719b2e6d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/classtime/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/classtime/index.vue
@@ -15,8 +15,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="状态">
-              <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable :options="timeStatusOptions"
-                :props="timeStatusProps">
+              <JnpfSelect v-model="query.timeStatus" placeholder="请选择" clearable
+                :options="timeStatusOptions" :props="timeStatusProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -31,13 +31,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -45,12 +47,14 @@
                 @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 custom-column border
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
           <el-table-column prop="timeCode" label="班次编号" align="center" sortable fixed="left">
           </el-table-column>
           <el-table-column prop="timeName" label="班次名称" align="center" sortable fixed="left">
@@ -81,15 +85,16 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </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" />
@@ -97,8 +102,10 @@
 
     <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>
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/contractClause/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/contractClause/index.vue
index 3e667ad9..9b0cef9a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/contractClause/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/contractClause/index.vue
@@ -1,114 +1,113 @@
 <template>
-    <div class="JNPF-common-layout">
-        <div class="JNPF-common-layout-center">
-            <el-row class="JNPF-common-search-box" :gutter="16">
-                <el-form @submit.native.prevent>
-                    <el-col :span="6">
-                        <el-form-item label="条款标题">
-                            <el-input v-model="query.title" placeholder="请输入" clearable> </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="条款合同类型">
-                            <JnpfSelect v-model="query.contractType" placeholder="请选择" clearable
-                                :options="contractTypeOptions" :props="contractTypeProps">
-                            </JnpfSelect>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="条款类型">
-                            <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
-                                :props="typeProps">
-                            </JnpfSelect>
-                        </el-form-item>
-                    </el-col>
-                    <template v-if="showAll">
-                        <el-col :span="6">
-                            <el-form-item label="条款状态">
-                                <JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
-                                    :props="statusProps">
-                                </JnpfSelect>
-                            </el-form-item>
-                        </el-col>
-                    </template>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
-                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-                            <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
-                                展开
-                            </el-button>
-                            <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
-                                收起
-                            </el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <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>
-                        <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()"
+  <div class="JNPF-common-layout">
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="条款标题">
+              <el-input v-model="query.title" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="条款合同类型">
+              <JnpfSelect v-model="query.contractType" placeholder="请选择" clearable
+                :options="contractTypeOptions" :props="contractTypeProps">
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="条款类型">
+              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
+                :props="typeProps">
+              </JnpfSelect>
+            </el-form-item>
+          </el-col>
+          <template v-if="showAll">
+            <el-col :span="6">
+              <el-form-item label="条款状态">
+                <JnpfSelect v-model="query.status" placeholder="请选择" clearable
+                  :options="statusOptions" :props="statusProps">
+                </JnpfSelect>
+              </el-form-item>
+            </el-col>
+          </template>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
+                展开
+              </el-button>
+              <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
+                收起
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <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>
+            <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'">批量删除
-                        </el-button>
-                    </div>
-                    <div class="JNPF-common-head-right">
-                        <el-tooltip content="高级查询" placement="top" v-if="true">
-                            <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
-                                @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-tooltip>
-                    </div>
-                </div>
-                <JNPF-table v-loading="listLoading" :data="list" :border="true" @sort-change='sortChange' has-c
-                    @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
-                    <el-table-column prop="title" label="条款标题" align="center">
-                    </el-table-column>
-                    <el-table-column prop="contractType" label="条款合同类型" align="center">
-                    </el-table-column>
-                    <el-table-column prop="type" label="条款类型" align="center">
-                    </el-table-column>
-                    <el-table-column prop="remark" label="备注" align="center">
-                    </el-table-column>
-                    <el-table-column prop="status" label="状态" align="center">
-                    </el-table-column>
-                    <el-table-column label="操作" fixed="right" width="150">
-                        <template slot-scope="scope">
-                            <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
-                            </el-button>
-                            <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
-                                @click="handleDel(scope.row.id)">删除
-                            </el-button>
-                            <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </JNPF-table>
-                <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-                    @pagination="initData" />
-            </div>
+                        </el-button> -->
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip content="高级查询" placement="top" v-if="true">
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-tooltip>
+          </div>
         </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
-
-
-
-
-        <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" />
+        <JNPF-table v-loading="listLoading" :data="list" :border="true" @sort-change='sortChange'
+          has-c @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          <el-table-column prop="title" label="条款标题" align="center">
+          </el-table-column>
+          <el-table-column prop="contractType" label="条款合同类型" align="center">
+          </el-table-column>
+          <el-table-column prop="type" label="条款类型" align="center">
+          </el-table-column>
+          <el-table-column prop="remark" label="备注" align="center">
+          </el-table-column>
+          <el-table-column prop="status" label="状态" align="center">
+          </el-table-column>
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
+              </el-button>
+              <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <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" />
+
+    <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" />
+  </div>
 </template>
 
 <script>
@@ -130,400 +129,400 @@ import SuperQuery from '@/components/SuperQuery'
 import superQueryJson from './superQueryJson'
 
 export default {
-    components: {
-        JNPFForm,
-        Detail,
-        ExportBox, ToFormDetail, SuperQuery
-    },
-    data() {
-        return {
+  components: {
+    JNPFForm,
+    Detail,
+    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,
 
-            showAll: false,
-            superQueryVisible: false,
-            superQueryJson,
-            uploadBoxVisible: false,
-            detailVisible: false,
-            query: {
-                title: undefined,
-                contractType: undefined,
-                type: undefined,
-                status: undefined,
-            },
-            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,
-            flowListVisible: false,
-            flowList: [],
-            exportBoxVisible: false,
-            contractTypeOptions: [],
-            contractTypeProps: { "label": "fullName", "value": "enCode" },
-            typeOptions: [],
-            typeProps: { "label": "fullName", "value": "enCode" },
-            statusOptions: [],
-            statusProps: { "label": "fullName", "value": "enCode" },
-            interfaceRes: {
-            },
-        }
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        title: undefined,
+        contractType: undefined,
+        type: undefined,
+        status: undefined,
+      },
+      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,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      contractTypeOptions: [],
+      contractTypeProps: { "label": "fullName", "value": "enCode" },
+      typeOptions: [],
+      typeProps: { "label": "fullName", "value": "enCode" },
+      statusOptions: [],
+      statusProps: { "label": "fullName", "value": "enCode" },
+      interfaceRes: {
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.getColumnList(),
+      this.initSearchDataAndListData()
+    this.getcontractTypeOptions();
+    this.gettypeOptions();
+    this.getstatusOptions();
+    this.queryData = JSON.parse(JSON.stringify(this.query))
+  },
+  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)
+        })
+      })
     },
-    computed: {
-        ...mapGetters(['userInfo']),
-        menuId() {
-            return this.$route.meta.modelId || ''
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
+        this.$nextTick(() => {
+          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([]);
+          }
+        })
+      }
     },
-    created() {
-        this.getColumnList(),
-            this.initSearchDataAndListData()
-        this.getcontractTypeOptions();
-        this.gettypeOptions();
-        this.getstatusOptions();
-        this.queryData = JSON.parse(JSON.stringify(this.query))
+    getColumnList() {
+      // 没有开启权限
+      this.columnOptions = this.transformColumnList(this.columnList)
     },
-    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
-            this.$nextTick(() => {
-                this.refreshTree = true
-                this.$nextTick(() => {
-                    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: []
+    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
             }
-            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
-                        }
-                    }
-                }
-            }
-            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]
-                }
+          }
+        }
+      }
+      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)
+        }
+      })
+      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
+              })
             }
-        },
-        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
-                            })
-                        }
-                    })
-                } else {
-                    this.mergeList.push({
-                        prop: item.prop,
-                        rowspan: 1,
-                        colspan: 1
-                    })
-                }
-            })
-        },
-        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])
-                }
+          })
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
+          })
+        }
+      })
+    },
+    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
+    },
+    getcontractTypeOptions() {
+      getDictionaryDataSelector('519483543638772229').then(res => {
+        this.contractTypeOptions = res.data.list
+      })
+    },
+    gettypeOptions() {
+      getDictionaryDataSelector('520239598056505413').then(res => {
+        this.typeOptions = res.data.list
+      })
+    },
+    getstatusOptions() {
+      getDictionaryDataSelector('519495883595713029').then(res => {
+        this.statusOptions = 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: '519502523443183621',
+      };
+      request({
+        url: `/api/scm/ContractClause/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/ContractClause/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
             }
-            this.exportList = exportList
-        },
-        getcontractTypeOptions() {
-            getDictionaryDataSelector('519483543638772229').then(res => {
-                this.contractTypeOptions = res.data.list
-            })
-        },
-        gettypeOptions() {
-            getDictionaryDataSelector('520239598056505413').then(res => {
-                this.typeOptions = res.data.list
-            })
-        },
-        getstatusOptions() {
-            getDictionaryDataSelector('519495883595713029').then(res => {
-                this.statusOptions = 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: '519502523443183621',
-            };
-            request({
-                url: `/api/scm/ContractClause/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/ContractClause/${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/ContractClause")
-            })
-        },
-        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
+          });
+        })
+      }).catch(() => {
+      });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/ContractClause")
+      })
+    },
+    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
+      }
+      const ids = this.multipleSelection
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: `/api/scm/ContractClause/batchRemove`,
+          data: ids,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
             }
-            const ids = this.multipleSelection
-            this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-                type: 'warning'
-            }).then(() => {
-                request({
-                    url: `/api/scm/ContractClause/batchRemove`,
-                    data: ids,
-                    method: 'DELETE'
-                }).then(res => {
-                    this.$message({
-                        type: 'success',
-                        message: res.msg,
-                        onClose: () => {
-                            this.initData()
-                        }
-                    });
-                })
-            }).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, isDetail) {
-            let id = row ? row.id : ""
-            this.formVisible = true
-            this.$nextTick(() => {
-                this.$refs.JNPFForm.init(id, isDetail, this.list)
-            })
-        },
-        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/ContractClause/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()
-        },
-        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
-            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, isDetail) {
+      let id = row ? row.id : ""
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail, this.list)
+      })
+    },
+    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/ContractClause/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()
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
+  }
 }
 </script>
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 086b22ea..9e04789f 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
@@ -5,44 +5,27 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="合同类型">
-              <JnpfSelect
-                v-model="query.contractType"
-                placeholder="请选择"
-                clearable
-                :options="contractTypeOptions"
-                :props="contractTypeProps"
-              >
+              <JnpfSelect v-model="query.contractType" placeholder="请选择" clearable
+                :options="contractTypeOptions" :props="contractTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="合同编号">
-              <el-input
-                v-model="query.contractNumber"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.contractNumber" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="合同名称">
-              <el-input
-                v-model="query.contractName"
-                placeholder="请输入"
-                clearable
-              >
+              <el-input v-model="query.contractName" placeholder="请输入" clearable>
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()"
-                >查询</el-button
-              >
-              <el-button icon="el-icon-refresh-right" @click="reset()"
-                >重置</el-button
-              >
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
             </el-form-item>
           </el-col>
         </el-form>
@@ -50,250 +33,104 @@
       <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
+            <!-- <el-button
               type="text"
               icon="icon-ym icon-ym-btn-clearn"
               @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'"
               >批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
-              <el-link
-                icon="icon-ym icon-ym-filter JNPF-common-head-icon"
-                :underline="false"
-                @click="openSuperQuery()"
-              />
+              <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
+                @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-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-tooltip>
           </div>
         </div>
-        <JNPF-table
-          v-loading="listLoading"
-          :data="list"
-          :border="true"
-          @sort-change="sortChange"
-          has-c
-          @selection-change="handleSelectionChange"
-          :span-method="arraySpanMethod"
-        >
-          <el-table-column
-            prop="contractType"
-            label="合同类型"
-            align="center"
-            fixed="left"
-            width="90"
-          >
+        <JNPF-table v-loading="listLoading" :data="list" :border="true" @sort-change="sortChange"
+          has-c @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+          <el-table-column prop="contractType" label="合同类型" align="center" fixed="left" width="90">
           </el-table-column>
-          <el-table-column
-            prop="contractTemplateId"
-            label="合同模板"
-            align="center"
-            fixed="left"
-            width="140"
-          >
+          <el-table-column prop="contractTemplateId" label="合同模板" align="center" fixed="left"
+            width="140">
           </el-table-column>
-          <el-table-column
-            prop="contractNumber"
-            label="合同编号"
-            align="center"
-            fixed="left"
-            width="180"
-          >
+          <el-table-column prop="contractNumber" label="合同编号" align="center" fixed="left"
+            width="180">
           </el-table-column>
-          <el-table-column
-            prop="contractName"
-            label="合同名称"
-            align="center"
-            fixed="left"
-            width="180"
-          >
+          <el-table-column prop="contractName" label="合同名称" align="center" fixed="left" width="180">
           </el-table-column>
-          <el-table-column
-            prop="contractNo"
-            label="对方合同编号"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="contractNo" label="对方合同编号" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="contractSignedTime"
-            label="签订日期"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="contractSignedTime" label="签订日期" align="center" width="180">
             <template slot-scope="scope">
               {{ fnTimeStr(scope.row.contractSignedTime) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="businessId"
-            label="关联业务线"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="businessId" label="关联业务线" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="contractPeriodTime"
-            label="有效期开始 "
-            align="center"
-            width="180"
-            ><template slot-scope="scope">
+          <el-table-column prop="contractPeriodTime" label="有效期开始 " align="center"
+            width="180"><template slot-scope="scope">
               {{ fnTimeStr(scope.row.contractPeriodTime) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="contractPeriodTimeEnd"
-            label="有效期结束 "
-            align="center"
-            width="180"
-            ><template slot-scope="scope">
+          <el-table-column prop="contractPeriodTimeEnd" label="有效期结束 " align="center"
+            width="180"><template slot-scope="scope">
               {{ fnTimeStr(scope.row.contractPeriodTimeEnd) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="deliveryTime"
-            label="交货时间开始"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="deliveryTime" label="交货时间开始" align="center" width="180">
             <template slot-scope="scope">
               {{ fnTimeStr(scope.row.deliveryTime) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="deliveryTimeEnd"
-            label="交货时间结束"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="deliveryTimeEnd" label="交货时间结束" align="center" width="180">
             <template slot-scope="scope">
               {{ fnTimeStr(scope.row.deliveryTimeEnd) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="deptId"
-            label="签约主体"
-            align="center"
-            width="230"
-          >
+          <el-table-column prop="deptId" label="签约主体" align="center" width="230">
             <template slot-scope="scope">
               {{ fnDeptName(scope.row.deptId) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="subject"
-            label="乙方主体"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="subject" label="乙方主体" align="center" width="180">
           </el-table-column>
-          <el-table-column label="结算方式" align="center" width="180"
-            ><template slot-scope="scope">
+          <el-table-column label="结算方式" align="center" width="180"><template slot-scope="scope">
               {{ fnSubjectSettlementMethodName(scope.row.subject) }}
             </template>
           </el-table-column>
-          <el-table-column
-            prop="procurementModel"
-            label="采购模式"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="procurementModel" label="采购模式" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="relatedContractName"
-            label="关联销售合同"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="relatedContractName" label="关联销售合同" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="subject2"
-            label="乙方主体二级"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="subject2" label="乙方主体二级" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="subject3"
-            label="乙方主体三级"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="subject3" label="乙方主体三级" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="deliveryModel"
-            label="交货方式"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="deliveryModel" label="交货方式" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="deliveryLocation"
-            label="交货地点 "
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="deliveryLocation" label="交货地点 " align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="modeTransport"
-            label="运输方式"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="modeTransport" label="运输方式" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="costBearingMian"
-            label="费用承担主体"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="costBearingMian" label="费用承担主体" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="pricingModel"
-            label="定价模式 "
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="pricingModel" label="定价模式 " align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="contractRequirement"
-            label="合同要求"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="contractRequirement" label="合同要求" align="center" width="180">
           </el-table-column>
-          <el-table-column
-            prop="remark"
-            label="备注"
-            align="center"
-            width="180"
-          >
+          <el-table-column prop="remark" label="备注" align="center" width="180">
           </el-table-column>
           <!-- <el-table-column
             prop="contractLabel"
@@ -305,60 +142,31 @@
           <el-table-column prop="flowState" label="状态" width="100">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
-              <el-tag type="success" v-else-if="scope.row.flowState == 2"
-                >审核通过</el-tag
-              >
-              <el-tag type="danger" v-else-if="scope.row.flowState == 3"
-                >审核驳回</el-tag
-              >
-              <el-tag type="info" v-else-if="scope.row.flowState == 4"
-                >流程撤回</el-tag
-              >
-              <el-tag type="info" v-else-if="scope.row.flowState == 5"
-                >审核终止</el-tag
-              >
+              <el-tag type="success" v-else-if="scope.row.flowState == 2">审核通过</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.flowState == 3">审核驳回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 4">流程撤回</el-tag>
+              <el-tag type="info" v-else-if="scope.row.flowState == 5">审核终止</el-tag>
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right" width="180">
             <template slot-scope="scope">
-              <el-button
-                type="text"
-                :disabled="[1, 2, 4, 5].indexOf(scope.row.flowState) > -1"
-                @click="updateHandle(scope.row)"
-                v-has="'btn_edit'"
-                >编辑
+              <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"
-                @click="addOrUpdateSetHandle(scope.row)"
-                v-has="'btn_edit'"
-                >设置
+              <el-button type="text" @click="addOrUpdateSetHandle(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
-              >
+              <el-button size="mini" type="text" :disabled="!scope.row.flowState"
+                @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
             </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" />
@@ -366,44 +174,23 @@
     <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
 
     <FlowBox v-if="flowVisible" ref="FlowBox" @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-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)"
-        >
+        <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"
-    />
+    <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" />
   </div>
 </template>
 
@@ -767,7 +554,7 @@ export default {
       this.initData();
     },
     //初始化查询的默认数据
-    async initSearchData() {},
+    async initSearchData() { },
     initData() {
       this.listLoading = true;
       let _query = {
@@ -811,7 +598,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     handelUpload() {
       this.uploadBoxVisible = true;
@@ -851,7 +638,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     openSuperQuery() {
       this.superQueryVisible = true;
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 b18c9c3b..73f8cf21 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
@@ -21,14 +21,15 @@
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="出生日期">
-                <JnpfDateRangePicker v-model="query.brithdayTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                  endPlaceholder="结束日期">
+                <JnpfDateRangePicker v-model="query.brithdayTime" format="yyyy-MM-dd"
+                  startPlaceholder="开始日期" endPlaceholder="结束日期">
                 </JnpfDateRangePicker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="性别">
-                <JnpfSelect v-model="query.sex" placeholder="请选择" clearable :options="sexOptions" :props="sexProps">
+                <JnpfSelect v-model="query.sex" placeholder="请选择" clearable :options="sexOptions"
+                  :props="sexProps">
                 </JnpfSelect>
               </el-form-item>
             </el-col>
@@ -37,7 +38,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -50,13 +52,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -64,12 +68,14 @@
                 @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 custom-column border
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
           <el-table-column prop="name" label="司机" align="center" fixed="left" sortable>
           </el-table-column>
           <el-table-column prop="mobile" label="手机号码" align="center" sortable>
@@ -113,26 +119,30 @@
             </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" />
-    <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-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>
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue
index 46001f7b..84855890 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/finance/cwcost/index.vue
@@ -68,9 +68,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/inventory/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/inventory/form.vue
index 89db02ad..3a841ccf 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/inventory/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/inventory/form.vue
@@ -2,562 +2,566 @@
 
 
     <template>
-            <transition name="el-zoom-in-center">
-            <div class="JNPF-preview-main">
-                <div class="JNPF-common-page-header">
-                    <el-page-header @back="goBack"
-                                    :content="!dataForm.id ? '新建':'编辑'"/>
-                    <div class="options">
-                            <el-dropdown class="dropdown" placement="bottom">
-                                <el-button style="width:70px">
-                                    更 多<i class="el-icon-arrow-down el-icon--right"></i>
-                                </el-button>
-                                <el-dropdown-menu slot="dropdown">
-                                        <template v-if="dataForm.id">
-                                            <el-dropdown-item @click.native="prev" :disabled='prevDis'>
-                                                {{'上一条'}}
-                                            </el-dropdown-item>
-                                            <el-dropdown-item @click.native="next" :disabled='nextDis'>
-                                                {{'下一条'}}
-                                            </el-dropdown-item>
-                                        </template>
-                                    <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
-                                                      :loading="continueBtnLoading" :disabled='btnLoading'>
-                                        {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
-                                </el-dropdown-menu>
-                            </el-dropdown>
-                        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保 存</el-button>
-                        <el-button @click="goBack"> 取 消</el-button>
-                    </div>
-                </div>
-            <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-    <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-        <!-- 具体表单 -->
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品编码"   prop="code" >
-        <JnpfInput   v-model="dataForm.code" @change="changeData('code',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品名称"   prop="name" >
-        <JnpfInput   v-model="dataForm.name" @change="changeData('name',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品规格"   prop="spec" >
-        <JnpfInput   v-model="dataForm.spec" @change="changeData('spec',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品图片"   prop="photo" >
-        <JnpfUploadImg   v-model="dataForm.photo" @change="changeData('photo',-1)" 
- :fileSize="10" sizeUnit="MB"  :limit="9"  pathType="defaultPath"  :isAccount="0" >
-    </JnpfUploadImg>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品类型"   prop="productTypeId" >
-        <JnpfRadio   v-model="dataForm.productTypeId" @change="changeData('productTypeId',-1)" 
- optionType="default"  direction="horizontal"  size="small"  :options="productTypeIdOptions" :props="productTypeIdProps" >
-    </JnpfRadio>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="商品品牌"   prop="brandId" >
-        <JnpfPopupSelect   v-model="dataForm.brandId" @change="changeData('brandId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.brandId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='brand_name'  field='brandId'  interfaceId="518049412669244677"  :pageSize="20"  :columnOptions="brandIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="库存单位"   prop="inventoryUnitId" >
-        <JnpfSelect   v-model="dataForm.inventoryUnitId" @change="changeData('inventoryUnitId',-1)" 
- placeholder="请选择"  clearable  :style='{"width":"100%"}' :options="inventoryUnitIdOptions" :props="inventoryUnitIdProps" >
-    </JnpfSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="批次号"   prop="batchNumber" >
-        <JnpfInput   v-model="dataForm.batchNumber" @change="changeData('batchNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="库存数量"   prop="inventoryNumber" >
-        <JnpfInput   v-model="dataForm.inventoryNumber" @change="changeData('inventoryNumber',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="平均采购单价"   prop="purchasePrice" >
-        <JnpfInput   v-model="dataForm.purchasePrice" @change="changeData('purchasePrice',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="总成本"   prop="totalCost" >
-        <JnpfInput   v-model="dataForm.totalCost" @change="changeData('totalCost',-1)" 
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
-    </JnpfInput>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="仓库"   prop="warehouseId" >
-        <JnpfPopupSelect   v-model="dataForm.warehouseId" @change="changeData('warehouseId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.warehouseId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='name'  field='warehouseId'  interfaceId="529617754022498181"  :pageSize="20"  :columnOptions="warehouseIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <el-col :span="24" >
-        <jnpf-form-tip-item
- label="货区"   prop="storageAreaId" >
-        <JnpfPopupSelect   v-model="dataForm.storageAreaId" @change="changeData('storageAreaId',-1)" 
- :rowIndex="null"  :formData="dataForm"  :templateJson="interfaceRes.storageAreaId"  placeholder="请选择"  propsValue="id"  popupWidth="800px"  popupTitle="选择数据"  popupType="dialog"  relationField='fullName'  field='storageAreaId'  interfaceId="529624294691458949"  :pageSize="20"  :columnOptions="storageAreaIdcolumnOptions"  clearable  :style='{"width":"100%"}'>
-    </JnpfPopupSelect>
-    </jnpf-form-tip-item>
-        </el-col>
-        <!-- 表单结束 -->
-    </template>
-    </el-form>
-    <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
-                  ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
-    </el-row>
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
+      <div class="JNPF-common-page-header">
+        <el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
+        <div class="options">
+          <el-dropdown class="dropdown" placement="bottom">
+            <el-button style="width:70px">
+              更 多<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <template v-if="dataForm.id">
+                <el-dropdown-item @click.native="prev" :disabled='prevDis'>
+                  {{'上一条'}}
+                </el-dropdown-item>
+                <el-dropdown-item @click.native="next" :disabled='nextDis'>
+                  {{'下一条'}}
+                </el-dropdown-item>
+              </template>
+              <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
+                :loading="continueBtnLoading" :disabled='btnLoading'>
+                {{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
+            :disabled='continueBtnLoading'> 保 存</el-button>
+          <el-button @click="goBack"> 取 消</el-button>
+        </div>
+      </div>
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+          label-position="right">
+          <template v-if="!loading">
+            <!-- 具体表单 -->
+            <el-col :span="24">
+              <jnpf-form-tip-item label="商品编码" prop="code">
+                <JnpfInput v-model="dataForm.code" @change="changeData('code',-1)" placeholder="请输入"
+                  clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="商品名称" prop="name">
+                <JnpfInput v-model="dataForm.name" @change="changeData('name',-1)" placeholder="请输入"
+                  clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="商品规格" prop="spec">
+                <JnpfInput v-model="dataForm.spec" @change="changeData('spec',-1)" placeholder="请输入"
+                  clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="商品图片" prop="photo">
+                <JnpfUploadImg v-model="dataForm.photo" @change="changeData('photo',-1)"
+                  :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
+                </JnpfUploadImg>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="商品类型" prop="productTypeId">
+                <JnpfRadio v-model="dataForm.productTypeId" @change="changeData('productTypeId',-1)"
+                  optionType="default" direction="horizontal" size="small"
+                  :options="productTypeIdOptions" :props="productTypeIdProps">
+                </JnpfRadio>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="商品品牌" prop="brandId">
+                <JnpfPopupSelect v-model="dataForm.brandId" @change="changeData('brandId',-1)"
+                  :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.brandId"
+                  placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                  popupType="dialog" relationField='brand_name' field='brandId'
+                  interfaceId="518049412669244677" :pageSize="20"
+                  :columnOptions="brandIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="库存单位" prop="inventoryUnitId">
+                <JnpfSelect v-model="dataForm.inventoryUnitId"
+                  @change="changeData('inventoryUnitId',-1)" placeholder="请选择" clearable
+                  :style='{"width":"100%"}' :options="inventoryUnitIdOptions"
+                  :props="inventoryUnitIdProps">
+                </JnpfSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="批次号" prop="batchNumber">
+                <JnpfInput v-model="dataForm.batchNumber" @change="changeData('batchNumber',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="库存数量" prop="inventoryNumber">
+                <JnpfInput v-model="dataForm.inventoryNumber"
+                  @change="changeData('inventoryNumber',-1)" placeholder="请输入" clearable
+                  :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="平均采购单价" prop="purchasePrice">
+                <JnpfInput v-model="dataForm.purchasePrice" @change="changeData('purchasePrice',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="总成本" prop="totalCost">
+                <JnpfInput v-model="dataForm.totalCost" @change="changeData('totalCost',-1)"
+                  placeholder="请输入" clearable :style='{"width":"100%"}'>
+                </JnpfInput>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="仓库" prop="warehouseId">
+                <JnpfPopupSelect v-model="dataForm.warehouseId"
+                  @change="changeData('warehouseId',-1)" :rowIndex="null" :formData="dataForm"
+                  :templateJson="interfaceRes.warehouseId" placeholder="请选择" propsValue="id"
+                  popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
+                  field='warehouseId' interfaceId="529617754022498181" :pageSize="20"
+                  :columnOptions="warehouseIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <el-col :span="24">
+              <jnpf-form-tip-item label="货区" prop="storageAreaId">
+                <JnpfPopupSelect v-model="dataForm.storageAreaId"
+                  @change="changeData('storageAreaId',-1)" :rowIndex="null" :formData="dataForm"
+                  :templateJson="interfaceRes.storageAreaId" placeholder="请选择" propsValue="id"
+                  popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='fullName'
+                  field='storageAreaId' interfaceId="529624294691458949" :pageSize="20"
+                  :columnOptions="storageAreaIdcolumnOptions" clearable :style='{"width":"100%"}'>
+                </JnpfPopupSelect>
+              </jnpf-form-tip-item>
+            </el-col>
+            <!-- 表单结束 -->
+          </template>
+        </el-form>
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
+      </el-row>
     </div>
-    </transition>
-    </template>
+  </transition>
+</template>
 
 
 <script>
-    import request from '@/utils/request'
-    import {mapGetters} from "vuex";
-    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-    import { getDefaultCurrentValueUserId } from '@/api/permission/user'
-    import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
-    import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { },
-        props: [],
-        data() {
-        return {
-            dataFormSubmitType: 0,
-            continueBtnLoading: false,
-            index: 0,
-            prevDis: false,
-            nextDis: false,
-            allList: [],
-            visible: false,
-            loading: false,
-            btnLoading: false,
-            formRef: 'formRef',
-            setting:{},
-            eventType: '',
-            userBoxVisible:false,
-            selectDialogVisible: false,
-            currTableConf:{},
-            dataValueAll:{},
-            addTableConf:{
-            },
-            //可选范围默认值
-            ableAll:{
-            },
-        tableRows:{
-        },
-            Vmodel:"",
-            currVmodel:"",
-            dataForm: {
-                                code : undefined,
-                                name : undefined,
-                                spec : undefined,
-                                    photo : [],
-                                    productTypeId : undefined,
-                                    brandId : undefined,
-                                    inventoryUnitId : undefined,
-                                batchNumber : undefined,
-                                inventoryNumber : undefined,
-                                purchasePrice : undefined,
-                                totalCost : undefined,
-                                    warehouseId : undefined,
-                                    storageAreaId : undefined,
-                    version: 0,
-            },
-            tableRequiredData: {},
-            dataRule:
-            {
-            },
-                    productTypeIdOptions:[],
-                            productTypeIdProps:{"label":"fullName","value":"enCode"  },
-                    brandIdcolumnOptions:[ {"label":"品牌","value":"brand_name"},],
-                    inventoryUnitIdOptions:[],
-                            inventoryUnitIdProps:{"label":"unit_name","value":"id"  },
-                    warehouseIdcolumnOptions:[ {"label":"仓库编号","value":"code"}, {"label":"仓库名称","value":"name"}, {"label":"仓库简称","value":"simple_name"},],
-                    storageAreaIdcolumnOptions:[ {"label":"货区编码","value":"code"}, {"label":"货区名称","value":"name"},],
-            childIndex:-1,
-                    isEdit:false,
-                    interfaceRes: {
-                        code:[] ,
-                        name:[] ,
-                        spec:[] ,
-                        photo:[] ,
-                        productTypeId:[] ,
-                        brandId:[] ,
-                        inventoryUnitId:[] ,
-                        batchNumber:[] ,
-                        inventoryNumber:[] ,
-                        purchasePrice:[] ,
-                        totalCost:[] ,
-                        warehouseId:[] ,
-                        storageAreaId:[{"dataType":"varchar","defaultValue":"","field":"warehouseId","fieldName":"","id":"Y4nIRy1","jnpfKey":"popupSelect","relationField":"warehouseId","required":"0"}] ,
-            },
+import request from '@/utils/request'
+import { mapGetters } from "vuex";
+import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+import { getDefaultCurrentValueUserId } from '@/api/permission/user'
+import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
+import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
+import { thousandsFormat } from "@/components/Generator/utils/index"
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      dataFormSubmitType: 0,
+      continueBtnLoading: false,
+      index: 0,
+      prevDis: false,
+      nextDis: false,
+      allList: [],
+      visible: false,
+      loading: false,
+      btnLoading: false,
+      formRef: 'formRef',
+      setting: {},
+      eventType: '',
+      userBoxVisible: false,
+      selectDialogVisible: false,
+      currTableConf: {},
+      dataValueAll: {},
+      addTableConf: {
+      },
+      //可选范围默认值
+      ableAll: {
+      },
+      tableRows: {
+      },
+      Vmodel: "",
+      currVmodel: "",
+      dataForm: {
+        code: undefined,
+        name: undefined,
+        spec: undefined,
+        photo: [],
+        productTypeId: undefined,
+        brandId: undefined,
+        inventoryUnitId: undefined,
+        batchNumber: undefined,
+        inventoryNumber: undefined,
+        purchasePrice: undefined,
+        totalCost: undefined,
+        warehouseId: undefined,
+        storageAreaId: undefined,
+        version: 0,
+      },
+      tableRequiredData: {},
+      dataRule:
+      {
+      },
+      productTypeIdOptions: [],
+      productTypeIdProps: { "label": "fullName", "value": "enCode" },
+      brandIdcolumnOptions: [{ "label": "品牌", "value": "brand_name" },],
+      inventoryUnitIdOptions: [],
+      inventoryUnitIdProps: { "label": "unit_name", "value": "id" },
+      warehouseIdcolumnOptions: [{ "label": "仓库编号", "value": "code" }, { "label": "仓库名称", "value": "name" }, { "label": "仓库简称", "value": "simple_name" },],
+      storageAreaIdcolumnOptions: [{ "label": "货区编码", "value": "code" }, { "label": "货区名称", "value": "name" },],
+      childIndex: -1,
+      isEdit: false,
+      interfaceRes: {
+        code: [],
+        name: [],
+        spec: [],
+        photo: [],
+        productTypeId: [],
+        brandId: [],
+        inventoryUnitId: [],
+        batchNumber: [],
+        inventoryNumber: [],
+        purchasePrice: [],
+        totalCost: [],
+        warehouseId: [],
+        storageAreaId: [{ "dataType": "varchar", "defaultValue": "", "field": "warehouseId", "fieldName": "", "id": "Y4nIRy1", "jnpfKey": "popupSelect", "relationField": "warehouseId", "required": "0" }],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  watch: {},
+  created() {
+    this.dataAll()
+    this.initDefaultData()
+    this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
+  },
+  mounted() { },
+  methods: {
+    prev() {
+      this.index--
+      if (this.index === 0) {
+        this.prevDis = true
+      }
+      this.nextDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
         }
-        },
-        computed: {
-            ...mapGetters(['userInfo'])
-        },
-        watch: {},
-        created() {
-            this.dataAll()
-            this.initDefaultData()
-            this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
-        },
-        mounted() {},
-        methods: {
-            prev() {
-                this.index--
-                if (this.index === 0) {
-                    this.prevDis = true
-                }
-                this.nextDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            next() {
-                this.index++
-                if (this.index === this.allList.length - 1) {
-                    this.nextDis = true
-                }
-                this.prevDis = false
-                for (let index = 0; index < this.allList.length; index++) {
-                    const element = this.allList[index];
-                    if (this.index == index) {
-                        this.getInfo(element.id)
-                    }
-                }
-            },
-            getInfo(id) {
-                request({
-                    url: '/api/scm/Inventory/'+ id,
-                    method: 'get'
-                }).then(res => {
-                    this.dataInfo(res.data)
-                });
-            },
-            goBack() {
-                this.visible = false
-                this.$emit('refreshDataList', true)
-            },
-            changeData(model, index) {
-                this.isEdit = false
-                this.childIndex = index
-                let modelAll = model.split("-");
-                let faceMode = "";
-                for (let i = 0; i < modelAll.length; i++) {
-                    faceMode += modelAll[i];
-                }
-                for (let key in this.interfaceRes) {
-                    if (key != faceMode) {
-                        let faceReList = this.interfaceRes[key]
-                        for (let i = 0; i < faceReList.length; i++) {
-                            if (faceReList[i].relationField == model) {
-                                let options = 'get' + key + 'Options';
-                                if(this[options]){
-                                    this[options]()
-                                }
-                                this.changeData(key, index)
-                            }
-                        }
-                    }
-                }
-            },
-            changeDataFormData(type, data, model,index,defaultValue) {
-                if(!this.isEdit) {
-                    if (type == 2) {
-                        for (let i = 0; i < this.dataForm[data].length; i++) {
-                            if (index == -1) {
-                                this.dataForm[data][i][model] = defaultValue
-                            } else if (index == i) {
-                                this.dataForm[data][i][model] = defaultValue
-                            }
-                        }
-                    } else {
-                        this.dataForm[data] = defaultValue
-                    }
-                }
-            },
-            dataAll(){
-                        this.getproductTypeIdOptions();
-                        this.getinventoryUnitIdOptions();
-            },
-                    getproductTypeIdOptions() {
-                    getDictionaryDataSelector('521699870097015173').then(res => {
-                        this.productTypeIdOptions = res.data.list
-                    })
-                },
-                    getinventoryUnitIdOptions() {
-                    const index = this.childIndex
-                    let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.inventoryUnitId))
-                    for (let i = 0; i < templateJsonList.length; i++) {
-                        let json = templateJsonList[i];
-                        if(json.relationField){
-                            let relationFieldAll = json.relationField.split("-");
-                            let val = json.defaultValue;
-                            if(relationFieldAll.length>1 && index>-1){
-                                val = this.dataForm[relationFieldAll[0]+'List']&&this.dataForm[relationFieldAll[0]+'List'].length?this.dataForm[relationFieldAll[0]+'List'][index][relationFieldAll[1]]:''
-                            }else {
-                                val = this.dataForm[relationFieldAll]
-                            }
-                            json.defaultValue = val
-                        }
-                    }
-                    let template ={
-                        paramList:templateJsonList
-                    }
-                    getDataInterfaceRes('529938341609623877',template).then(res => {
-                        let data = res.data
-                        this.inventoryUnitIdOptions = data
-                        this.changeDataFormData(1,'inventoryUnitId','inventoryUnitId',index,'')
-                    })
-                },
-                goBack() {
-                this.$emit('refresh')
-            },
-            clearData(){
-                this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
-            },
-            init(id,isDetail,allList) {
-                this.prevDis = false
-                this.nextDis = false
-                this.allList = allList || []
-                if (allList.length) {
-                    this.index = this.allList.findIndex(item => item.id === id)
-                    if (this.index == 0) {
-                        this.prevDis = true
-                    }
-                    if (this.index == this.allList.length - 1) {
-                        this.nextDis = true
-                    }
-                } else {
-                    this.prevDis = true
-                    this.nextDis = true
-                }
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/scm/Inventory/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        });
-                    }else{
-                        this.clearData()
-                        this.initDefaultData()
-                    }
-                });
-                this.$store.commit('generator/UPDATE_RELATION_DATA', {})
-            },
-            //初始化默认数据
-            initDefaultData() {
+      }
+    },
+    next() {
+      this.index++
+      if (this.index === this.allList.length - 1) {
+        this.nextDis = true
+      }
+      this.prevDis = false
+      for (let index = 0; index < this.allList.length; index++) {
+        const element = this.allList[index];
+        if (this.index == index) {
+          this.getInfo(element.id)
+        }
+      }
+    },
+    getInfo(id) {
+      request({
+        url: '/api/scm/Inventory/' + id,
+        method: 'get'
+      }).then(res => {
+        this.dataInfo(res.data)
+      });
+    },
+    goBack() {
+      this.visible = false
+      this.$emit('refreshDataList', true)
+    },
+    changeData(model, index) {
+      this.isEdit = false
+      this.childIndex = index
+      let modelAll = model.split("-");
+      let faceMode = "";
+      for (let i = 0; i < modelAll.length; i++) {
+        faceMode += modelAll[i];
+      }
+      for (let key in this.interfaceRes) {
+        if (key != faceMode) {
+          let faceReList = this.interfaceRes[key]
+          for (let i = 0; i < faceReList.length; i++) {
+            if (faceReList[i].relationField == model) {
+              let options = 'get' + key + 'Options';
+              if (this[options]) {
+                this[options]()
+              }
+              this.changeData(key, index)
+            }
+          }
+        }
+      }
+    },
+    changeDataFormData(type, data, model, index, defaultValue) {
+      if (!this.isEdit) {
+        if (type == 2) {
+          for (let i = 0; i < this.dataForm[data].length; i++) {
+            if (index == -1) {
+              this.dataForm[data][i][model] = defaultValue
+            } else if (index == i) {
+              this.dataForm[data][i][model] = defaultValue
+            }
+          }
+        } else {
+          this.dataForm[data] = defaultValue
+        }
+      }
+    },
+    dataAll() {
+      this.getproductTypeIdOptions();
+      this.getinventoryUnitIdOptions();
+    },
+    getproductTypeIdOptions() {
+      getDictionaryDataSelector('521699870097015173').then(res => {
+        this.productTypeIdOptions = res.data.list
+      })
+    },
+    getinventoryUnitIdOptions() {
+      const index = this.childIndex
+      let templateJsonList = JSON.parse(JSON.stringify(this.interfaceRes.inventoryUnitId))
+      for (let i = 0; i < templateJsonList.length; i++) {
+        let json = templateJsonList[i];
+        if (json.relationField) {
+          let relationFieldAll = json.relationField.split("-");
+          let val = json.defaultValue;
+          if (relationFieldAll.length > 1 && index > -1) {
+            val = this.dataForm[relationFieldAll[0] + 'List'] && this.dataForm[relationFieldAll[0] + 'List'].length ? this.dataForm[relationFieldAll[0] + 'List'][index][relationFieldAll[1]] : ''
+          } else {
+            val = this.dataForm[relationFieldAll]
+          }
+          json.defaultValue = val
+        }
+      }
+      let template = {
+        paramList: templateJsonList
+      }
+      getDataInterfaceRes('529938341609623877', template).then(res => {
+        let data = res.data
+        this.inventoryUnitIdOptions = data
+        this.changeDataFormData(1, 'inventoryUnitId', 'inventoryUnitId', index, '')
+      })
+    },
+    goBack() {
+      this.$emit('refresh')
+    },
+    clearData() {
+      this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
+    },
+    init(id, isDetail, allList) {
+      this.prevDis = false
+      this.nextDis = false
+      this.allList = allList || []
+      if (allList.length) {
+        this.index = this.allList.findIndex(item => item.id === id)
+        if (this.index == 0) {
+          this.prevDis = true
+        }
+        if (this.index == this.allList.length - 1) {
+          this.nextDis = true
+        }
+      } else {
+        this.prevDis = true
+        this.nextDis = true
+      }
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true
+          request({
+            url: '/api/scm/Inventory/' + this.dataForm.id,
+            method: 'get'
+          }).then(res => {
+            this.dataInfo(res.data)
+            this.loading = false
+          });
+        } else {
+          this.clearData()
+          this.initDefaultData()
+        }
+      });
+      this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+    },
+    //初始化默认数据
+    initDefaultData() {
 
-            },
-            // 表单提交
-            dataFormSubmit(type) {
-                this.dataFormSubmitType = type ? type : 0
-                this.$refs['formRef'].validate((valid) => {
-                    if (valid) {
-                        this.request()
-                    }
-                })
-            },
-            request() {
-                let _data =this.dataList()
-                if (this.dataFormSubmitType == 2) {
-                    this.continueBtnLoading = true
-                } else {
-                    this.btnLoading = true
-                }
-                if (!this.dataForm.id) {
-                    request({
-                        url: '/api/scm/Inventory',
-                        method: 'post',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) {
-                                    this.$nextTick(() => {
-                                        this.clearData()
-                                        this.initDefaultData()
-                                    })
-                                    this.continueBtnLoading = false
-                                    return
-                                }
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }else{
-                    request({
-                        url: '/api/scm/Inventory/'+this.dataForm.id,
-                        method: 'PUT',
-                        data: _data
-                    }).then((res) => {
-                        this.$message({
-                            message: res.msg,
-                            type: 'success',
-                            duration: 1000,
-                            onClose: () => {
-                                if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
-                                this.visible = false
-                                this.btnLoading = false
-                                this.$emit('refresh', true)
-                            }
-                        })
-                    }).catch(()=>{
-                        this.btnLoading = false
-                        this.continueBtnLoading = false
-                    })
-                }
-            },
-            openSelectDialog(key) {
-                this.currTableConf=this.addTableConf[key]
-                this.currVmodel=key
-                this.selectDialogVisible = true
+    },
+    // 表单提交
+    dataFormSubmit(type) {
+      this.dataFormSubmitType = type ? type : 0
+      this.$refs['formRef'].validate((valid) => {
+        if (valid) {
+          this.request()
+        }
+      })
+    },
+    request() {
+      let _data = this.dataList()
+      if (this.dataFormSubmitType == 2) {
+        this.continueBtnLoading = true
+      } else {
+        this.btnLoading = true
+      }
+      if (!this.dataForm.id) {
+        request({
+          url: '/api/scm/Inventory',
+          method: 'post',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) {
                 this.$nextTick(() => {
-                    this.$refs.selectDialog.init()
+                  this.clearData()
+                  this.initDefaultData()
                 })
-            },
-            addForSelect(data) {
-                for (let i = 0; i < data.length; i++) {
-                    let t = data[i]
-                    if(this['get'+this.currVmodel]){
-                        this['get'+this.currVmodel](t)
-                    }
-                }
-            },
-            dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
-                let timeDataValue = null;
-                let timeValue = Number(timeValueData)
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = new Date().getTime()
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getBeforeData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
-                        }
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        if (timeTarget == 1 || timeTarget == 2) {
-                            previousDate = getDateDay(timeTarget, timeType, timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else if (timeTarget == 3) {
-                            previousDate = getLaterData(timeValue)
-                            timeDataValue = new Date(previousDate).getTime()
-                        } else {
-                            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
-                        }
-                    }
-                }
-                return timeDataValue;
-            },
-            time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
-                let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
-                let timeDataValue = null
-                if (timeRule) {
-                    if (timeType == 1) {
-                        timeDataValue = timeValue || '00:00:00'
-                        if (timeDataValue.split(':').length == 3) {
-                            timeDataValue = timeDataValue
-                        } else {
-                            timeDataValue = timeDataValue + ':00'
-                        }
-                    } else if (timeType == 2) {
-                        timeDataValue = dataValue
-                    } else if (timeType == 3) {
-                        timeDataValue = this.jnpf.toDate(new Date(), format)
-                    } else if (timeType == 4) {
-                        let previousDate = '';
-                        previousDate = getBeforeTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    } else if (timeType == 5) {
-                        let previousDate = '';
-                        previousDate = getLaterTime(timeTarget, timeValue)
-                        timeDataValue = this.jnpf.toDate(previousDate, format)
-                    }
-                }
-                return timeDataValue;
-            },
-            dataList(){
-                var _data = this.dataForm;
-                return _data;
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-                this.isEdit = true
-                this.dataAll()
-                this.childIndex=-1
-            },
-        },
-    }
+                this.continueBtnLoading = false
+                return
+              }
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      } else {
+        request({
+          url: '/api/scm/Inventory/' + this.dataForm.id,
+          method: 'PUT',
+          data: _data
+        }).then((res) => {
+          this.$message({
+            message: res.msg,
+            type: 'success',
+            duration: 1000,
+            onClose: () => {
+              if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
+              this.visible = false
+              this.btnLoading = false
+              this.$emit('refresh', true)
+            }
+          })
+        }).catch(() => {
+          this.btnLoading = false
+          this.continueBtnLoading = false
+        })
+      }
+    },
+    openSelectDialog(key) {
+      this.currTableConf = this.addTableConf[key]
+      this.currVmodel = key
+      this.selectDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.selectDialog.init()
+      })
+    },
+    addForSelect(data) {
+      for (let i = 0; i < data.length; i++) {
+        let t = data[i]
+        if (this['get' + this.currVmodel]) {
+          this['get' + this.currVmodel](t)
+        }
+      }
+    },
+    dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
+      let timeDataValue = null;
+      let timeValue = Number(timeValueData)
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = new Date().getTime()
+        } else if (timeType == 4) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getBeforeData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
+          }
+        } else if (timeType == 5) {
+          let previousDate = '';
+          if (timeTarget == 1 || timeTarget == 2) {
+            previousDate = getDateDay(timeTarget, timeType, timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else if (timeTarget == 3) {
+            previousDate = getLaterData(timeValue)
+            timeDataValue = new Date(previousDate).getTime()
+          } else {
+            timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
+          }
+        }
+      }
+      return timeDataValue;
+    },
+    time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
+      let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
+      let timeDataValue = null
+      if (timeRule) {
+        if (timeType == 1) {
+          timeDataValue = timeValue || '00:00:00'
+          if (timeDataValue.split(':').length == 3) {
+            timeDataValue = timeDataValue
+          } else {
+            timeDataValue = timeDataValue + ':00'
+          }
+        } else if (timeType == 2) {
+          timeDataValue = dataValue
+        } else if (timeType == 3) {
+          timeDataValue = this.jnpf.toDate(new Date(), format)
+        } else if (timeType == 4) {
+          let previousDate = '';
+          previousDate = getBeforeTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        } else if (timeType == 5) {
+          let previousDate = '';
+          previousDate = getLaterTime(timeTarget, timeValue)
+          timeDataValue = this.jnpf.toDate(previousDate, format)
+        }
+      }
+      return timeDataValue;
+    },
+    dataList() {
+      var _data = this.dataForm;
+      return _data;
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll
+      this.dataForm = _dataAll
+      this.isEdit = true
+      this.dataAll()
+      this.childIndex = -1
+    },
+  },
+}
 
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/processclassification/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/processclassification/index.vue
index 8c9870f0..1ba856fb 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/processclassification/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/processclassification/index.vue
@@ -24,13 +24,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -38,12 +40,14 @@
                 @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 custom-column border
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
           <el-table-column prop="categoryCode" label="工序分类编码" align="center">
           </el-table-column>
           <el-table-column prop="categoryName" label="工序分类名称" align="center">
@@ -52,15 +56,16 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </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" />
@@ -68,8 +73,10 @@
 
     <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>
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/index.vue
index 52504836..cb638288 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/productionprocesses/index.vue
@@ -16,7 +16,8 @@
       </div>
       <el-tree :data="treeData" class="JNPF-common-el-tree" highlight-current ref="treeBox"
         :expand-on-click-node="false" @node-click="handleNodeClick" node-key="id" :props="treeProps"
-        :default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false" v-if="refreshTree">
+        :default-expand-all="expandsTree" :filter-node-method="filterNode" :lazy="false"
+        v-if="refreshTree">
         <span class="custom-tree-node" slot-scope="{ node, data }">
           <i :class="data.icon"></i>
           <span class="text">{{ node.label }}</span>
@@ -33,7 +34,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="工序类型">
-              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions" :props="typeProps">
+              <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
+                :props="typeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
@@ -54,13 +56,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -68,12 +72,14 @@
                 @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 custom-column border
-          @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
+          custom-column border @selection-change="handleSelectionChange"
+          :span-method="arraySpanMethod">
           <el-table-column prop="productionName" label="工序名称" align="center" fixed="left" sortable>
           </el-table-column>
           <el-table-column prop="productionCode" label="工序编号" align="center" fixed="left" sortable>
@@ -104,15 +110,16 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </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" />
@@ -120,8 +127,10 @@
 
     <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>
 
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 c6733cd3..9d511339 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
@@ -5,22 +5,22 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="价格类型">
-              <JnpfSelect v-model="query.priceType" placeholder="请选择" clearable :options="priceTypeOptions"
-                :props="priceTypeProps">
+              <JnpfSelect v-model="query.priceType" placeholder="请选择" clearable
+                :options="priceTypeOptions" :props="priceTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="有效时间开始">
-              <JnpfDateRangePicker v-model="query.startTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.startTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="有效时间结束">
-              <JnpfDateRangePicker v-model="query.endTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.endTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -35,13 +35,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -49,17 +51,22 @@
                 @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>
-          <el-table-column prop="priceNo" label="价格编号" align="center" width="250" sortable fixed="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
+          <el-table-column prop="priceNo" label="价格编号" align="center" width="250" sortable
+            fixed="left">
           </el-table-column>
-          <el-table-column label="价格类型" prop="priceTypeName" align="center" width="150" sortable fixed="left">
+          <el-table-column label="价格类型" prop="priceTypeName" align="center" width="150" sortable
+            fixed="left">
           </el-table-column>
-          <el-table-column prop="productName" label="商品" align="center" width="200" sortable fixed="left">
+          <el-table-column prop="productName" label="商品" align="center" width="200" sortable
+            fixed="left">
           </el-table-column>
           <el-table-column prop="makerName" label="报价方" align="center" width="250">
           </el-table-column>
@@ -81,461 +88,461 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">编辑
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">删除
+              <el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
+                @click="handleDel(scope.row.id)">删除
               </el-button>
               <el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
               </el-button>
             </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" />
 
-
-
-
     <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 JNPFForm from './form'
-  import Detail from './Detail'
-  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 JNPFForm from './form'
+import Detail from './Detail'
+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: {
-      JNPFForm,
-      Detail,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    JNPFForm,
+    Detail,
+    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: {
-          priceType: undefined,
-          startTime: undefined,
-          endTime: undefined,
-        },
-        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,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        priceTypeOptions: [{
-          "fullName": "采购价格",
-          "id": "1"
-        }, {
-          "fullName": "销售价格",
-          "id": "2"
-        }],
-        priceTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        pricingUnitIdOptions: [],
-        pricingUnitIdProps: {
-          "label": "unit_name",
-          "value": "id"
-        },
-        interfaceRes: {
-          makerId: [],
-          makerName: [],
-          productId: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      this.getColumnList(),
-        this.initSearchDataAndListData()
-      this.queryData = JSON.parse(JSON.stringify(this.query))
-    },
-    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)
-          })
-        })
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        priceType: undefined,
+        startTime: undefined,
+        endTime: undefined,
       },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
-        this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
-        })
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      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([]);
-            }
-          })
-        }
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      priceTypeOptions: [{
+        "fullName": "采购价格",
+        "id": "1"
+      }, {
+        "fullName": "销售价格",
+        "id": "2"
+      }],
+      priceTypeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
+      pricingUnitIdOptions: [],
+      pricingUnitIdProps: {
+        "label": "unit_name",
+        "value": "id"
       },
-      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
-              }
-            }
-          }
-        }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
+      interfaceRes: {
+        makerId: [],
+        makerName: [],
+        productId: [],
       },
-      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]
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    this.getColumnList(),
+      this.initSearchDataAndListData()
+    this.queryData = JSON.parse(JSON.stringify(this.query))
+  },
+  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
+      this.$nextTick(() => {
+        this.refreshTree = true
+        this.$nextTick(() => {
+          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] || ''
           }
         }
-      },
-      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
-                })
-              }
-            })
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        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
-      },
-      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: '529565976849564293',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/ProductPrice/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/ProductPrice/${id}`,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      }
+      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)
+        }
+      })
+      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(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/ProductPrice")
-        })
-      },
-      handleSelectionChange(val) {
-        const res = val.map(item => item.id)
-        this.multipleSelection = res
-      },
-      handleBatchRemoveDel() {
-        if (!this.multipleSelection.length) {
-          this.$message({
-            type: 'error',
-            message: '请选择一条数据',
-            duration: 1500,
+        } else {
+          this.mergeList.push({
+            prop: item.prop,
+            rowspan: 1,
+            colspan: 1
           })
-          return
         }
-        const ids = this.multipleSelection
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/ProductPrice/batchRemove`,
-            data: ids,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
-          })
-        }).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, isDetail) {
-        let id = row ? row.id : ""
-        this.formVisible = true
-        this.$nextTick(() => {
-          this.$refs.JNPFForm.init(id, isDetail, this.list)
+      })
+    },
+    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
+    },
+    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: '529565976849564293',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/ProductPrice/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/ProductPrice/${id}`,
+          method: 'DELETE'
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
         })
-      },
-      exportData() {
-        this.exportBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.ExportBox.init(this.exportList)
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/ProductPrice")
+      })
+    },
+    handleSelectionChange(val) {
+      const res = val.map(item => item.id)
+      this.multipleSelection = res
+    },
+    handleBatchRemoveDel() {
+      if (!this.multipleSelection.length) {
+        this.$message({
+          type: 'error',
+          message: '请选择一条数据',
+          duration: 1500,
         })
-      },
-      download(data) {
-        let query = {
-          ...data,
-          ...this.listQuery,
-          ...this.query,
-          menuId: this.menuId
-        }
+        return
+      }
+      const ids = this.multipleSelection
+      this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
+        type: 'warning'
+      }).then(() => {
         request({
-          url: `/api/scm/ProductPrice/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/ProductPrice/batchRemove`,
+          data: ids,
+          method: 'DELETE'
         }).then(res => {
-          if (!res.data.url) return
-          this.jnpf.downloadFile(res.data.url)
-          this.$refs.ExportBox.visible = false
-          this.exportBoxVisible = false
+          this.$message({
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
+          });
         })
-      },
-      search() {
-        this.listQuery.currentPage = 1
-        this.listQuery.pageSize = 20
-        this.listQuery.sort = "desc"
-        this.listQuery.sidx = ""
-        this.initData()
-      },
-      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
-        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, isDetail) {
+      let id = row ? row.id : ""
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.JNPFForm.init(id, isDetail, this.list)
+      })
+    },
+    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/ProductPrice/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()
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
index e0e936a8..cc2e8c89 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryOrder/index.vue
@@ -38,9 +38,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
index 0aeb9eb5..22f25b5c 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue
@@ -53,12 +53,9 @@
             <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-upload" @click="handelUpload()"
-              v-has="'btn_upload'">导入
-            </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createReturnCargoOrder()">生成退货订单
             </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
index f16be878..caa4d719 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue
@@ -68,9 +68,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="addSaleHandle()">生成销售订单
             </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
index e4f20fe5..ec4b1f50 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/index.vue
@@ -38,9 +38,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createDeliveryOrder()">生成发货单
             </el-button> -->
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
index 1ed3948f..57307252 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/index.vue
@@ -66,9 +66,9 @@
             <el-button type="text" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()"
               v-has="'btn_upload'">导入
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createPurchaseOrder()">生成采购单
             </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
index efaa38cb..a7128a77 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/index.vue
@@ -38,9 +38,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
index 45d7d810..fc4f5890 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/index.vue
@@ -38,9 +38,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
index 85dcd119..39bdee94 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
@@ -53,9 +53,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createSaleOrder()">生成销售单
             </el-button>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
index 52df973c..56c07923 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptOrder/index.vue
@@ -10,15 +10,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="业务类型">
-              <JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable :options="receiptTypeOptions"
-                :props="receiptTypeProps">
+              <JnpfSelect v-model="query.receiptType" placeholder="请选择" clearable
+                :options="receiptTypeOptions" :props="receiptTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期" />
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -32,13 +32,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -46,12 +48,14 @@
                 @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" custom-column border>
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
+          border>
           <el-table-column prop="receiptCode" label="订单编号" sortable align="center" width="160">
           </el-table-column>
           <el-table-column prop="subjectName" label="客户名称" sortable align="center" width="200">
@@ -115,26 +119,30 @@
             </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" />
-    <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-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>
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue
index 56b482da..bd6df866 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/index.vue
@@ -17,8 +17,8 @@
           </el-col> -->
           <el-col :span="6">
             <el-form-item label="制单时间">
-              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.preparationTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -33,7 +33,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
@@ -46,13 +47,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createReturnCargoOrder()">生成退货单
             </el-button>
@@ -66,15 +69,19 @@
                 @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" custom-column border>
-          <el-table-column prop="voucherCode" label="凭证编号" fixed="left" sortable align="center" width="160">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
+          border>
+          <el-table-column prop="voucherCode" label="凭证编号" fixed="left" sortable align="center"
+            width="160">
           </el-table-column>
-          <el-table-column label="单据类型" prop="documentType1" fixed="left" align="center" width="100">
+          <el-table-column label="单据类型" prop="documentType1" fixed="left" align="center"
+            width="100">
             <template slot-scope="scope">
               {{ scope.row.documentType1 }}
             </template>
@@ -173,26 +180,30 @@
             </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" />
-    <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-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>
 
@@ -342,11 +353,11 @@ export default {
       const selectData = this.multipleSelectionItem
       let stateFlag = true;
       selectData.forEach(function (item) {
-        if(item.flowState != 2){
+        if (item.flowState != 2) {
           stateFlag = false;
         }
       });
-      if(!stateFlag){
+      if (!stateFlag) {
         this.$message({
           type: 'error',
           message: '请选择审核通过的数据',
@@ -398,11 +409,11 @@ export default {
       const selectData = this.multipleSelectionItem
       let stateFlag = true;
       selectData.forEach(function (item) {
-        if(item.flowState != 2){
+        if (item.flowState != 2) {
           stateFlag = false;
         }
       });
-      if(!stateFlag){
+      if (!stateFlag) {
         this.$message({
           type: 'error',
           message: '请选择审核通过的数据',
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
index f5186ff9..cd0256d3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
@@ -32,9 +32,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue
index de5df6bc..1f9f3676 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/returnCargoOrder/index.vue
@@ -38,9 +38,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
index e89e734c..27b2cc52 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue
@@ -68,9 +68,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
             <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
               @click="createPurchaseOrder()">生成采购订单
             </el-button>
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 c1c33568..74b684c6 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
@@ -53,9 +53,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 3207b4cc..5956e94c 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
@@ -60,9 +60,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 cb7b248b..e884f9fe 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
@@ -5,15 +5,15 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="业务类型">
-              <JnpfSelect v-model="query.inventoryType" placeholder="请选择" clearable :options="inventoryTypeOptions"
-                :props="inventoryTypeProps">
+              <JnpfSelect v-model="query.inventoryType" placeholder="请选择" clearable
+                :options="inventoryTypeOptions" :props="inventoryTypeProps">
               </JnpfSelect>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="盘点开始时间">
-              <JnpfDateRangePicker v-model="query.inventoryTimeStart" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                endPlaceholder="结束日期">
+              <JnpfDateRangePicker v-model="query.inventoryTimeStart" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
               </JnpfDateRangePicker>
             </el-form-item>
           </el-col>
@@ -30,8 +30,8 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="创建时间">
-                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd" startPlaceholder="开始日期"
-                  endPlaceholder="结束日期" />
+                <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
+                  startPlaceholder="开始日期" endPlaceholder="结束日期" />
               </el-form-item>
             </el-col>
           </template>
@@ -39,7 +39,8 @@
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
-              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+              <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true"
+                v-if="!showAll">
                 展开
               </el-button>
               <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
@@ -52,13 +53,15 @@
       <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -66,18 +69,22 @@
                 @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>
-          <el-table-column label="业务类型" prop="inventoryType" align="center" sortable width="200" fixed="left">
+          @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border
+          custom-column>
+          <el-table-column label="业务类型" prop="inventoryType" align="center" sortable width="200"
+            fixed="left">
             <template slot-scope="scope">
               {{ scope.row.inventoryType}}
             </template>
           </el-table-column>
-          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150" sortable fixed="left">
+          <el-table-column prop="warehouseId" label="仓库名称" align="center" width="150" sortable
+            fixed="left">
           </el-table-column>
           <el-table-column prop="inventoryTimeStart" label="盘点开始时间" align="center" width="150">
           </el-table-column>
@@ -113,575 +120,580 @@
               <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>
             </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" />
-    <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-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 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 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,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    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,
 
-        showAll: false,
-        superQueryVisible: false,
-        superQueryJson,
-        uploadBoxVisible: false,
-        detailVisible: false,
-        query: {
-          inventoryType: undefined,
-          inventoryTimeStart: undefined,
-          documentNo: undefined,
-          creatorUserId: undefined,
-          creatorTime: undefined,
-        },
-        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,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        inventoryTypeOptions: [{
-          "fullName": "日常盘点单",
-          "id": "1"
-        }, {
-          "fullName": "业务盘点单",
-          "id": "2"
-        }],
-        inventoryTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        stocktakingModeOptions: [{
-          "fullName": "静态盘点",
-          "id": "1"
-        }, {
-          "fullName": "动态盘点",
-          "id": "2"
-        }],
-        stocktakingModeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        missingDiskRuleOptions: [{
-          "fullName": "漏盘商品不做盈亏调整",
-          "id": "1"
-        }, {
-          "fullName": "漏盘商品账面库存自动清零",
-          "id": "2"
-        }],
-        missingDiskRuleProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        duplicateInventoryRuleOptions: [{
-          "fullName": "累加汇总",
-          "id": "1"
-        }, {
-          "fullName": "覆盖更新",
-          "id": "2"
-        }],
-        duplicateInventoryRuleProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField112_productIdcolumnOptions: [{
-          "label": "商品名称",
-          "value": "name"
-        }, {
-          "label": "商品编码",
-          "value": "code"
-        }, {
-          "label": "批次号",
-          "value": "batch_number"
-        }, ],
-        interfaceRes: {
-          warehouseId: [],
-          tableField112_productId: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("529993401664295493").then(res1 => {
-        let flowId = res1.data && res1.data.id
-        getFlowList(flowId, '1').then(res2 => {
-          this.flowList = res2.data
-          this.getColumnList(),
-            this.initSearchDataAndListData()
-          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)
-          })
-        })
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        inventoryType: undefined,
+        inventoryTimeStart: undefined,
+        documentNo: undefined,
+        creatorUserId: undefined,
+        creatorTime: undefined,
       },
-      toggleTreeExpand(expands) {
-        this.refreshTree = false
-        this.expandsTree = expands
-        this.$nextTick(() => {
-          this.refreshTree = true
-          this.$nextTick(() => {
-            this.$refs.treeBox.setCurrentKey(null)
-          })
-        })
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data[this.treeProps.label].indexOf(value) !== -1;
+      list: [],
+      listLoading: true,
+      multipleSelection: [],
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
       },
-      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([]);
-            }
-          })
-        }
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      inventoryTypeOptions: [{
+        "fullName": "日常盘点单",
+        "id": "1"
+      }, {
+        "fullName": "业务盘点单",
+        "id": "2"
+      }],
+      inventoryTypeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      getColumnList() {
-        // 没有开启权限
-        this.columnOptions = this.transformColumnList(this.columnList)
+      stocktakingModeOptions: [{
+        "fullName": "静态盘点",
+        "id": "1"
+      }, {
+        "fullName": "动态盘点",
+        "id": "2"
+      }],
+      stocktakingModeProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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
-              }
-            }
-          }
-        }
-        this.getMergeList(list)
-        this.getExportList(list)
-        return list
+      missingDiskRuleOptions: [{
+        "fullName": "漏盘商品不做盈亏调整",
+        "id": "1"
+      }, {
+        "fullName": "漏盘商品账面库存自动清零",
+        "id": "2"
+      }],
+      missingDiskRuleProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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]
-          }
-        }
+      duplicateInventoryRuleOptions: [{
+        "fullName": "累加汇总",
+        "id": "1"
+      }, {
+        "fullName": "覆盖更新",
+        "id": "2"
+      }],
+      duplicateInventoryRuleProps: {
+        "label": "fullName",
+        "value": "id"
       },
-      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)
-          }
+      tableField112_productIdcolumnOptions: [{
+        "label": "商品名称",
+        "value": "name"
+      }, {
+        "label": "商品编码",
+        "value": "code"
+      }, {
+        "label": "批次号",
+        "value": "batch_number"
+      },],
+      interfaceRes: {
+        warehouseId: [],
+        tableField112_productId: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("529993401664295493").then(res1 => {
+      let flowId = res1.data && res1.data.id
+      getFlowList(flowId, '1').then(res2 => {
+        this.flowList = res2.data
+        this.getColumnList(),
+          this.initSearchDataAndListData()
+        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)
+        })
+      })
+    },
+    toggleTreeExpand(expands) {
+      this.refreshTree = false
+      this.expandsTree = expands
+      this.$nextTick(() => {
+        this.refreshTree = true
+        this.$nextTick(() => {
+          this.$refs.treeBox.setCurrentKey(null)
         })
-        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
-                })
-              }
-            })
+      })
+    },
+    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 {
-            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
-      },
-      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: '529993401664295493',
-          type: 1,
-        };
-        request({
-          url: `/api/scm/WarehousingInventory/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/WarehousingInventory/${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/WarehousingInventory")
-        })
-      },
-      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]
         }
-        const ids = this.multipleSelection
-        this.$confirm('您确定要删除这些数据吗, 是否继续？', '提示', {
-          type: 'warning'
-        }).then(() => {
-          request({
-            url: `/api/scm/WarehousingInventory/batchRemove`,
-            data: ids,
-            method: 'DELETE'
-          }).then(res => {
-            this.$message({
-              type: 'success',
-              message: res.msg,
-              onClose: () => {
-                this.initData()
-              }
-            });
+      }
+    },
+    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
+              })
+            }
           })
-        }).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
+    },
+    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: '529993401664295493',
+        type: 1,
+      };
+      request({
+        url: `/api/scm/WarehousingInventory/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/WarehousingInventory/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/WarehousingInventory/${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)
+          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/WarehousingInventory")
+      })
+    },
+    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/WarehousingInventory/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
-        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/WarehousingInventory/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)
+      })
+    },
+    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
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
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 1aaddbb9..5ca25405 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
@@ -55,9 +55,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 6c2083ac..1690af0f 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
@@ -60,9 +60,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 cd0fee4e..357d36d4 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
@@ -40,9 +40,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 c7921048..e8e61525 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
@@ -59,9 +59,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 e7644f8a..28533dec 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
@@ -61,9 +61,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
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 e3169a1d..a356cea7 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
@@ -37,9 +37,9 @@
             <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()"
+            <!-- <el-button type="text" icon="icon-ym icon-ym-btn-clearn" @click="handleBatchRemoveDel()"
               v-has="'btn_batchRemove'">批量删除
-            </el-button>
+            </el-button> -->
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip content="高级查询" placement="top" v-if="true">
@@ -55,9 +55,7 @@
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
           custom-column border @selection-change="handleSelectionChange"
           :span-method="arraySpanMethod">
-          <!-- <el-table-column prop="businessfactoryId" label="工厂名称" align="center" sortable
-            fixed="left">
-          </el-table-column> -->
+
           <el-table-column prop="businessfactory" label="工厂名称" align="center" sortable fixed="left"
             width="200px">
           </el-table-column>
@@ -75,7 +73,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="businessCode" label="外部单据编号" align="center">
+          <el-table-column prop="businessCode" label="外部单据编号" align="center" width="180">
           </el-table-column>
           <!-- <el-table-column prop="creatorTime" label="制单时间" align="center">
           </el-table-column> -->