diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ClassPlanMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ClassPlanMapper.xml
index 7931b089..a136b9ea 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ClassPlanMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ClassPlanMapper.xml
@@ -42,10 +42,7 @@
             AND t4.f_real_name LIKE concat('%',#{classPlanPagination.fRealName},'%')
         </if>
 
-<!--        <if test="classPlanPagination.startTime != null and classPlanPagination.endTime != null ">-->
-<!--&#45;&#45;             AND t1.start_time &gt; #{classPlanPagination.startTime[0]} AND t1.create_time &lt;= #{classPlanPagination.startTime[1]}-->
-<!--            AND t1.start_time between #{classPlanPagination.startTime} and #{classPlanPagination.endTime}-->
-<!--        </if>-->
+
 
 
     </select>
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingInspectionMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingInspectionMapper.xml
index 356e16f2..35daf1cb 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingInspectionMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingInspectionMapper.xml
@@ -23,6 +23,8 @@
         <result column="grossWeight" property="grossWeight"/>
         <result column="creatorUserName" property="creatorUserName"/>
         <result column="belongUserName" property="belongUserName"/>
+        <result column="inspectionType1" property="inspectionType1"/>
+        <result column="conclusionType1" property="conclusionType1"/>
     </resultMap>
 
     <select id="queryWarehousingInspectionList" resultMap="warehousingInspectionMap">
@@ -35,7 +37,7 @@
         WHEN 2 THEN
         '出库质检'
 
-        END AS inspectionType,
+        END AS inspectionType1,
 
         CASE
         a.conclusion_type
@@ -44,7 +46,7 @@
         WHEN 2 THEN
         '不合格'
 
-        END AS conclusionType,
+        END AS conclusionType1,
 
         c.NAME AS productName,
         c.spec AS spec,
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLServiceImpl.java
index 3417e13e..325a89ce 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/ContractLServiceImpl.java
@@ -603,6 +603,7 @@ public class ContractLServiceImpl extends ServiceImpl<ContractLMapper, ContractL
             entity.setId(mainId);
             entity.setFlowId(contractLForm.getFlowId());
             entity.setVersion(0);
+            entity.setCurrency("1"); //币种默认人民币
         }else{
             entity.setFlowId(contractLForm.getFlowId());
         }
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java
index cd9ffd86..5a9a07cb 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReceiveController.java
@@ -117,8 +117,6 @@ public class WarehousingReceiveController {
         for (WarehousingReceiveEntity entity : list) {
 
             entity.setReceiveNum(warehousingReceiveService.queryReceiveNumber(entity.getId()));
-//            QueryWrapper<WorkOrderEntity> workOrderEntityQueryWrapper =new QueryWrapper<>();
-//            workOrderEntityQueryWrapper.lambda().eq(WorkOrderEntity::getId,entity.getBusinessId());
             WorkOrderEntity workOrderEntity = workOrderService.getInfo(entity.getBusinessId());
             if (workOrderEntity != null) {
                 entity.setBusinessWorkOrder(workOrderEntity.getCode());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
index 96c17e73..6d8b9e25 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingReportlossController.java
@@ -457,7 +457,11 @@ public class WarehousingReportlossController {
                             InventoryEntity inventoryEntity = new InventoryEntity();
                             if(inventoryList != null && inventoryList.size() > 0){
                                 inventoryEntity = inventoryList.get(0);
-                                inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
+                                if(inventoryEntity.getInventoryNumber()!=null){
+                                    inventoryEntity.setInventoryNumber(inventoryEntity.getInventoryNumber().subtract(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber())));//库存数量
+                                }else {
+                                    inventoryEntity.setInventoryNumber(new BigDecimal(warehousingOutboundProductModel.getOutboundNumber()));//库存数量
+                                }
                             }else{
                                 inventoryEntity.setProductId(warehousingOutboundProductModel.getProductId());
                                 inventoryEntity.setCode(productWarehouseEntity.getCode());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java
index 2083d922..71d0d67b 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInspectionEntity.java
@@ -86,7 +86,10 @@ public class WarehousingInspectionEntity  {
     @TableField(exist = false)
     private String belongUserName;
 
-
+    @TableField(exist = false)
+    private String inspectionType1;
+    @TableField(exist = false)
+    private String conclusionType1;
 
 
 
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
index a073410b..47393bb3 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/index.vue
@@ -10,7 +10,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>
@@ -22,7 +23,8 @@
           <template v-if="showAll">
             <el-col :span="6">
               <el-form-item label="对账主体类型">
-                <el-input v-model="query.accountSubjectType" placeholder="请输入" clearable> </el-input>
+                <el-input v-model="query.accountSubjectType" placeholder="请输入" clearable>
+                </el-input>
               </el-form-item>
             </el-col>
           </template>
@@ -30,7 +32,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>
@@ -43,9 +46,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -54,31 +59,23 @@
                 @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' :span-method="arraySpanMethod"
-          show-summary :summary-method="getTableSummaries" border >
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod" show-summary :summary-method="getTableSummaries" border>
+
           <el-table-column prop="code" label="单据编号" align="center" width="200" fixed="left">
           </el-table-column>
-          <el-table-column prop="accountSubjectName" label="对账主体名称" align="center" width="200" fixed="left">
-          </el-table-column>
+
           <el-table-column label="单据类型" prop="type" align="center" width="150" fixed="left">
             <template slot-scope="scope">
               {{ scope.row.type}}
             </template>
           </el-table-column>
-          <el-table-column prop="flowState" label="状态" width="150" align="center" fixed="left">
-            <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 prop="accountState" label="结算状态" width="150" align="center" fixed="left">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.accountState==1">未结算</el-tag>
@@ -86,6 +83,9 @@
             </template>
           </el-table-column>
 
+          <el-table-column prop="accountSubjectName" label="对账主体名称" align="center" width="200">
+          </el-table-column>
+
           <el-table-column prop="contractCode" label="关联合同" align="center" width="200">
           </el-table-column>
           <el-table-column prop="docmentNum" label="关联单据数" align="center" width="150">
@@ -104,6 +104,18 @@
           </el-table-column>
           <el-table-column prop="lastModifyUserId" label="修改用户" align="center" width="150">
           </el-table-column>
+
+          <el-table-column prop="flowState" label="状态" width="150" align="center">
+            <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" align="center">
             <template slot-scope="scope">
               <el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@@ -117,596 +129,598 @@
             </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: {
-          code: undefined,
-          type: undefined,
-          accountSubjectName: undefined,
-          accountSubjectType: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowListVisible: false,
-        flowList: [],
-        exportBoxVisible: false,
-        typeOptions: [{
-          "fullName": "采购对账",
-          "id": "1"
-        }, {
-          "fullName": "销售对账",
-          "id": "2"
-        }, {
-          "fullName": "其他对账",
-          "id": "3"
-        }],
-        typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField107_subjectIdcolumnOptions: [{
-          "label": "名称",
-          "value": "name"
-        }, ],
-        tableField128_contractIdcolumnOptions: [{
-          "label": "合同名称",
-          "value": "contract_name"
-        }, ],
-        tableField150_documentNocolumnOptions: [{
-          "label": "单据号",
-          "value": "document_no"
-        }, ],
-        tableField150_warehousingStorageTypeOptions: [{
-          "fullName": "采购入库",
-          "id": "3"
-        }, {
-          "fullName": "退供出库",
-          "id": "5"
-        }],
-        tableField150_warehousingStorageTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField150_warehouseIdOptions: [],
-        tableField150_warehouseIdProps: {
-          "label": "name",
-          "value": "id"
-        },
-        tableField173_documentTypeOptions: [{
-          "fullName": "收货凭证",
-          "id": "1"
-        }, {
-          "fullName": "发货凭证",
-          "id": "2"
-        }],
-        tableField173_documentTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField173_voucherTypeOptions: [{
-          "fullName": "磅单",
-          "id": "1"
-        }, {
-          "fullName": "收据",
-          "id": "2"
-        }, {
-          "fullName": "其他",
-          "id": "3"
-        }],
-        tableField173_voucherTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField173_otherTypeOptions: [{
-          "fullName": "增加(+)",
-          "id": "1"
-        }, {
-          "fullName": "减少(-)",
-          "id": "2"
-        }],
-        tableField173_otherTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {
-          tableField107_subjectId: [],
-          tableField128_contractId: [],
-          tableField150_documentNo: [],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("542656081332025797").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');
+      showAll: false,
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        code: undefined,
+        type: undefined,
+        accountSubjectName: undefined,
+        accountSubjectType: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowListVisible: false,
+      flowList: [],
+      exportBoxVisible: false,
+      typeOptions: [{
+        "fullName": "采购对账",
+        "id": "1"
+      }, {
+        "fullName": "销售对账",
+        "id": "2"
+      }, {
+        "fullName": "其他对账",
+        "id": "3"
+      }],
+      typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField107_subjectIdcolumnOptions: [{
+        "label": "名称",
+        "value": "name"
+      },],
+      tableField128_contractIdcolumnOptions: [{
+        "label": "合同名称",
+        "value": "contract_name"
+      },],
+      tableField150_documentNocolumnOptions: [{
+        "label": "单据号",
+        "value": "document_no"
+      },],
+      tableField150_warehousingStorageTypeOptions: [{
+        "fullName": "采购入库",
+        "id": "3"
+      }, {
+        "fullName": "退供出库",
+        "id": "5"
+      }],
+      tableField150_warehousingStorageTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField150_warehouseIdOptions: [],
+      tableField150_warehouseIdProps: {
+        "label": "name",
+        "value": "id"
+      },
+      tableField173_documentTypeOptions: [{
+        "fullName": "收货凭证",
+        "id": "1"
+      }, {
+        "fullName": "发货凭证",
+        "id": "2"
+      }],
+      tableField173_documentTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField173_voucherTypeOptions: [{
+        "fullName": "磅单",
+        "id": "1"
+      }, {
+        "fullName": "收据",
+        "id": "2"
+      }, {
+        "fullName": "其他",
+        "id": "3"
+      }],
+      tableField173_voucherTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField173_otherTypeOptions: [{
+        "fullName": "增加(+)",
+        "id": "1"
+      }, {
+        "fullName": "减少(-)",
+        "id": "2"
+      }],
+      tableField173_otherTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {
+        tableField107_subjectId: [],
+        tableField128_contractId: [],
+        tableField150_documentNo: [],
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("542656081332025797").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 || [],
+      })
+    },
+    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] || ''
           }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
         }
-      },
-      getTableSummaries(param) {
-        const {
-          columns,
-          data
-        } = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          } else if (["accountAmount"].includes(column.property)) {
-            const values = data.map(item => {
-              if (column.property.includes('.')) {
-                const [attr1, attr2] = column.property.split('.')
-                return Number(item[attr1][attr2])
-              }
-              return Number(item[column.property])
-            });
-            if (!values.every(value => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr);
-                if (!isNaN(value)) {
-                  return prev + curr;
-                } else {
-                  return prev;
-                }
-              }, 0).toFixed(2);
-              if ([].includes(column.property)) {
-                sums[index] = thousandsFormat(sums[index]);
-              }
-            } else {
-              sums[index] = '';
-            }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
+          } else {
+            resolve([]);
           }
         })
-        return sums;
-      },
-      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: []
+      }
+    },
+    getTableSummaries(param) {
+      const {
+        columns,
+        data
+      } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        } else if (["accountAmount"].includes(column.property)) {
+          const values = data.map(item => {
+            if (column.property.includes('.')) {
+              const [attr1, attr2] = column.property.split('.')
+              return Number(item[attr1][attr2])
             }
-            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
+            return Number(item[column.property])
+          });
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
               }
+            }, 0).toFixed(2);
+            if ([].includes(column.property)) {
+              sums[index] = thousandsFormat(sums[index]);
             }
+          } else {
+            sums[index] = '';
           }
         }
-        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]
+      })
+      return sums;
+    },
+    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: []
           }
-        }
-      },
-      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'
+          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
             }
-            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.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)
         }
-        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: '542656081332025797',
-        };
-        request({
-          url: `/api/scm/Cwaccount/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/Cwaccount/${id}`,
-            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(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/Cwaccount")
-        })
-      },
-      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: '542656081332025797',
+      };
+      request({
+        url: `/api/scm/Cwaccount/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/Cwaccount/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Cwaccount/${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)
-        })
-      },
-      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: '流程不存在'
+            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(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Cwaccount")
+      })
+    },
+    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/Cwaccount/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/cwsettlement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
index 2fa5a40e..783a30ad 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
@@ -10,13 +10,15 @@
           </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>
           <el-col :span="6">
             <el-form-item label="对账主体名称">
-              <el-input v-model="query.settlementSubjectName" placeholder="请输入" clearable> </el-input>
+              <el-input v-model="query.settlementSubjectName" placeholder="请输入" clearable>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -30,9 +32,11 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
+              @click="addOrUpdateHandle()">新增
             </el-button>
-            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()" v-has="'btn_download'">导出
+            <el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
+              v-has="'btn_download'">导出
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -41,12 +45,13 @@
                 @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' :span-method="arraySpanMethod"
-          show-summary :summary-method="getTableSummaries" border>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
+          :span-method="arraySpanMethod" show-summary :summary-method="getTableSummaries" border>
           <el-table-column prop="code" label="单据编号" align="center" width="200" fixed="left">
           </el-table-column>
           <el-table-column label="类型" prop="type" align="center" width="200" fixed="left">
@@ -54,8 +59,7 @@
               {{ scope.row.type}}
             </template>
           </el-table-column>
-          <el-table-column prop="settlementSubjectName" label="结算主体名称" align="center" width="250" fixed="left">
-          </el-table-column>
+
           <el-table-column prop="flowState" label="状态" width="100" align="center">
             <template slot-scope="scope" v-if="!scope.row.top">
               <el-tag v-if="scope.row.flowState==1">等待审核</el-tag>
@@ -74,6 +78,8 @@
               <el-tag type="warning" v-else>等待提交</el-tag>
             </template>
           </el-table-column>
+          <el-table-column prop="settlementSubjectName" label="结算主体名称" align="center" width="250">
+          </el-table-column>
           <el-table-column prop="docmentNum" label="单据数" align="center" width="150">
           </el-table-column>
           <el-table-column prop="settlementAmount" label="应收/应付合计（含税）" align="center" width="150">
@@ -110,674 +116,677 @@
               </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" v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2"
+              <el-button size="mini" type="text"
+                v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2"
                 @click="shoufukuanHandle(scope.row)">收付款</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" />
     <FlowBoxCWSettlement v-if="flowVisible2" ref="FlowBoxCWSettlement" @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 ExportBox from '@/components/ExportBox'
-  import FlowBox from '@/views/workFlow/components/FlowBox'
-  import FlowBoxCWSettlement from '@/views/workFlow/components/FlowBoxCWSettlement'
-  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 ExportBox from '@/components/ExportBox'
+import FlowBox from '@/views/workFlow/components/FlowBox'
+import FlowBoxCWSettlement from '@/views/workFlow/components/FlowBoxCWSettlement'
+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,
-      FlowBoxCWSettlement,
-      ExportBox,
-      ToFormDetail,
-      SuperQuery
-    },
-    data() {
-      return {
+export default {
+  components: {
+    FlowBox,
+    FlowBoxCWSettlement,
+    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: {
-          code: undefined,
-          type: undefined,
-          settlementSubjectName: undefined,
-        },
-        treeProps: {
-          children: 'children',
-          label: 'fullName',
-          value: 'id',
-          isLeaf: 'isLeaf'
-        },
-        list: [],
-        listLoading: true,
-        total: 0,
-        queryData: {},
-        listQuery: {
-          superQueryJson: '',
-          currentPage: 1,
-          pageSize: 20,
-          sort: "desc",
-          sidx: "",
-        },
-        formVisible: false,
-        flowVisible: false,
-        flowVisible2: false,
-        flowListVisible: false,
-        flowList: [],
-        cwpaymentreceiptFlowList: [],
-        exportBoxVisible: false,
-        typeOptions: [{
-          "fullName": "采购结算",
-          "id": "1"
-        }, {
-          "fullName": "销售结算",
-          "id": "2"
-        }, {
-          "fullName": "其他结算",
-          "id": "3"
-        }],
-        typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        settlementTypeOptions: [{
-          "fullName": "增加（+）",
-          "id": "1"
-        }, {
-          "fullName": "减少（-）",
-          "id": "2"
-        }],
-        settlementTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField107_subjectIdcolumnOptions: [{
-          "label": "名称",
-          "value": "name"
-        }, ],
-        tableField128_contractIdcolumnOptions: [{
-          "label": "合同名称",
-          "value": "contract_name"
-        }, ],
-        tableField267_typeOptions: [{
-          "fullName": "采购对账",
-          "id": "1"
-        }, {
-          "fullName": "销售对账",
-          "id": "2"
-        }, {
-          "fullName": "其他对账",
-          "id": "3"
-        }],
-        tableField267_typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField281_typeOptions: [{
-          "fullName": "收款",
-          "id": "1"
-        }, {
-          "fullName": "付款",
-          "id": "2"
-        }],
-        tableField281_typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField281_wayTypeOptions: [{
-          "fullName": "单独收款",
-          "id": "1"
-        }, {
-          "fullName": "账扣",
-          "id": "2"
-        }, {
-          "fullName": "单据付款",
-          "id": "3"
-        }, {
-          "fullName": "账扣",
-          "id": "4"
-        }],
-        tableField281_wayTypeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField281_wayStatusOptions: [{
-          "fullName": "未收款",
-          "id": "1"
-        }, {
-          "fullName": "已付款",
-          "id": "2"
-        }, {
-          "fullName": "未付款",
-          "id": "3"
-        }, {
-          "fullName": "已付款",
-          "id": "4"
-        }],
-        tableField281_wayStatusProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        tableField292_typeOptions: [{
-          "fullName": "付款方",
-          "id": "1"
+      superQueryVisible: false,
+      superQueryJson,
+      uploadBoxVisible: false,
+      detailVisible: false,
+      query: {
+        code: undefined,
+        type: undefined,
+        settlementSubjectName: undefined,
+      },
+      treeProps: {
+        children: 'children',
+        label: 'fullName',
+        value: 'id',
+        isLeaf: 'isLeaf'
+      },
+      list: [],
+      listLoading: true,
+      total: 0,
+      queryData: {},
+      listQuery: {
+        superQueryJson: '',
+        currentPage: 1,
+        pageSize: 20,
+        sort: "desc",
+        sidx: "",
+      },
+      formVisible: false,
+      flowVisible: false,
+      flowVisible2: false,
+      flowListVisible: false,
+      flowList: [],
+      cwpaymentreceiptFlowList: [],
+      exportBoxVisible: false,
+      typeOptions: [{
+        "fullName": "采购结算",
+        "id": "1"
+      }, {
+        "fullName": "销售结算",
+        "id": "2"
+      }, {
+        "fullName": "其他结算",
+        "id": "3"
+      }],
+      typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      settlementTypeOptions: [{
+        "fullName": "增加（+）",
+        "id": "1"
+      }, {
+        "fullName": "减少（-）",
+        "id": "2"
+      }],
+      settlementTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField107_subjectIdcolumnOptions: [{
+        "label": "名称",
+        "value": "name"
+      },],
+      tableField128_contractIdcolumnOptions: [{
+        "label": "合同名称",
+        "value": "contract_name"
+      },],
+      tableField267_typeOptions: [{
+        "fullName": "采购对账",
+        "id": "1"
+      }, {
+        "fullName": "销售对账",
+        "id": "2"
+      }, {
+        "fullName": "其他对账",
+        "id": "3"
+      }],
+      tableField267_typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField281_typeOptions: [{
+        "fullName": "收款",
+        "id": "1"
+      }, {
+        "fullName": "付款",
+        "id": "2"
+      }],
+      tableField281_typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField281_wayTypeOptions: [{
+        "fullName": "单独收款",
+        "id": "1"
+      }, {
+        "fullName": "账扣",
+        "id": "2"
+      }, {
+        "fullName": "单据付款",
+        "id": "3"
+      }, {
+        "fullName": "账扣",
+        "id": "4"
+      }],
+      tableField281_wayTypeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField281_wayStatusOptions: [{
+        "fullName": "未收款",
+        "id": "1"
+      }, {
+        "fullName": "已付款",
+        "id": "2"
+      }, {
+        "fullName": "未付款",
+        "id": "3"
+      }, {
+        "fullName": "已付款",
+        "id": "4"
+      }],
+      tableField281_wayStatusProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      tableField292_typeOptions: [{
+        "fullName": "付款方",
+        "id": "1"
+      }, {
+        "fullName": "收款方",
+        "id": "2"
+      }],
+      tableField292_typeProps: {
+        "label": "fullName",
+        "value": "id"
+      },
+      interfaceRes: {
+        tableField107_subjectId: [],
+        tableField128_contractId: [{
+          "fieldName": "",
+          "field": "subjectId",
+          "defaultValue": "",
+          "jnpfKey": "billRule",
+          "dataType": "varchar",
+          "id": "HmoSU22",
+          "relationField": "code",
+          "required": "1"
         }, {
-          "fullName": "收款方",
-          "id": "2"
+          "fieldName": "",
+          "field": "contractType",
+          "defaultValue": "",
+          "jnpfKey": "createTime",
+          "dataType": "varchar",
+          "id": "QnvSU22",
+          "relationField": "creatorTime",
+          "required": "1"
         }],
-        tableField292_typeProps: {
-          "label": "fullName",
-          "value": "id"
-        },
-        interfaceRes: {
-          tableField107_subjectId: [],
-          tableField128_contractId: [{
-            "fieldName": "",
-            "field": "subjectId",
-            "defaultValue": "",
-            "jnpfKey": "billRule",
-            "dataType": "varchar",
-            "id": "HmoSU22",
-            "relationField": "code",
-            "required": "1"
-          }, {
-            "fieldName": "",
-            "field": "contractType",
-            "defaultValue": "",
-            "jnpfKey": "createTime",
-            "dataType": "varchar",
-            "id": "QnvSU22",
-            "relationField": "creatorTime",
-            "required": "1"
-          }],
-        },
-      }
-    },
-    computed: {
-      ...mapGetters(['userInfo']),
-      menuId() {
-        return this.$route.meta.modelId || ''
-      }
-    },
-    created() {
-      getFormById("547042073971299845").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');
-        })
+      },
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    menuId() {
+      return this.$route.meta.modelId || ''
+    }
+  },
+  created() {
+    getFormById("547042073971299845").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');
       })
+    })
 
-      getFormById("547733293450172677").then(res1 => {
-        let cwpaymentreceiptFlowId = res1.data && res1.data.id
-        getFlowList(cwpaymentreceiptFlowId, '1').then(res2 => {
-          this.cwpaymentreceiptFlowList = res2.data
-        }).catch((e) => {
-          this.$message({ type: 'error', message: e.message });
-          this.$router.push('/404');
+    getFormById("547733293450172677").then(res1 => {
+      let cwpaymentreceiptFlowId = res1.data && res1.data.id
+      getFlowList(cwpaymentreceiptFlowId, '1').then(res2 => {
+        this.cwpaymentreceiptFlowList = res2.data
+      }).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 || [],
+      })
+    },
+    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] || ''
           }
-          //接口
-          getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
-            let data = res.data
-            if (Array.isArray(data)) {
-              resolve(data);
-            } else {
-              resolve([]);
-            }
-          })
         }
-      },
-      getTableSummaries(param) {
-        const {
-          columns,
-          data
-        } = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计';
-            return;
-          } else if (["docmentNum", "settledAmount", "settlementAmount", "settlementExpenses", "paymentAmount",
-              "prepaidDeductionAmount", "returnAmount", "marginAmount", "underpaymentAmount", "overdueAmount",
-              "payableAmount", "currentMarginAmount", "currentUnderpaymentAmount", "settlableAmount", "applyAmount"
-            ].includes(column.property)) {
-            const values = data.map(item => {
-              if (column.property.includes('.')) {
-                const [attr1, attr2] = column.property.split('.')
-                return Number(item[attr1][attr2])
-              }
-              return Number(item[column.property])
-            });
-            if (!values.every(value => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr);
-                if (!isNaN(value)) {
-                  return prev + curr;
-                } else {
-                  return prev;
-                }
-              }, 0).toFixed(2);
-              if ([].includes(column.property)) {
-                sums[index] = thousandsFormat(sums[index]);
-              }
-            } else {
-              sums[index] = '';
-            }
+        //参数
+        let query = {
+          paramList: config.treeTemplateJson || [],
+        }
+        //接口
+        getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
+          let data = res.data
+          if (Array.isArray(data)) {
+            resolve(data);
+          } else {
+            resolve([]);
           }
         })
-        return sums;
-      },
-      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: []
+      }
+    },
+    getTableSummaries(param) {
+      const {
+        columns,
+        data
+      } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计';
+          return;
+        } else if (["docmentNum", "settledAmount", "settlementAmount", "settlementExpenses", "paymentAmount",
+          "prepaidDeductionAmount", "returnAmount", "marginAmount", "underpaymentAmount", "overdueAmount",
+          "payableAmount", "currentMarginAmount", "currentUnderpaymentAmount", "settlableAmount", "applyAmount"
+        ].includes(column.property)) {
+          const values = data.map(item => {
+            if (column.property.includes('.')) {
+              const [attr1, attr2] = column.property.split('.')
+              return Number(item[attr1][attr2])
             }
-            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
+            return Number(item[column.property])
+          });
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
               }
+            }, 0).toFixed(2);
+            if ([].includes(column.property)) {
+              sums[index] = thousandsFormat(sums[index]);
             }
+          } else {
+            sums[index] = '';
           }
         }
-        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]
+      })
+      return sums;
+    },
+    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: []
           }
-        }
-      },
-      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'
+          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
             }
-            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.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)
         }
-        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: '547042073971299845'
-        };
-        request({
-          url: `/api/scm/Cwsettlement/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/Cwsettlement/${id}`,
-            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(() => {});
-      },
-      handelUpload() {
-        this.uploadBoxVisible = true
-        this.$nextTick(() => {
-          this.$refs.UploadBox.init("", "scm/Cwsettlement")
-        })
-      },
-      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: '547042073971299845'
+      };
+      request({
+        url: `/api/scm/Cwsettlement/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/Cwsettlement/Actions/Export`,
-          method: 'post',
-          data: query
+          url: `/api/scm/Cwsettlement/${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)
-        })
-      },
-      shoufukuanHandle(row){
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: this.cwpaymentreceiptFlowList[0].id,
-          opType: '-1',
-          selectData: row
-        }
-        this.flowListVisible = false
-        this.flowVisible2 = true
-        this.$nextTick(() => {
-          this.$refs.FlowBoxCWSettlement.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: '流程不存在'
+            type: 'success',
+            message: res.msg,
+            onClose: () => {
+              this.initData()
+            }
           });
-        } else if (this.flowList.length === 1) {
-          this.selectFlow(this.flowList[0])
-        } else {
-          this.flowListVisible = true
-        }
-      },
-      //选择流程发起
-      selectFlow(item) {
-        let data = {
-          id: '',
-          formType: 1,
-          flowId: item.id,
-          opType: '-1'
-        }
-        this.flowListVisible = false
-        this.flowVisible = true
-        this.$nextTick(() => {
-          this.$refs.FlowBox.init(data)
         })
-      },
-      refresh(isrRefresh) {
-        this.formVisible = false
-        if (isrRefresh) this.reset()
-      },
-      reset() {
-        this.query = JSON.parse(JSON.stringify(this.queryData))
-        this.search()
-      },
-      colseFlow(isrRefresh) {
-        this.flowVisible = false
-        this.flowVisible2 = false
-        if (isrRefresh) this.reset()
-      },
-    }
+      }).catch(() => { });
+    },
+    handelUpload() {
+      this.uploadBoxVisible = true
+      this.$nextTick(() => {
+        this.$refs.UploadBox.init("", "scm/Cwsettlement")
+      })
+    },
+    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/Cwsettlement/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)
+      })
+    },
+    shoufukuanHandle(row) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: this.cwpaymentreceiptFlowList[0].id,
+        opType: '-1',
+        selectData: row
+      }
+      this.flowListVisible = false
+      this.flowVisible2 = true
+      this.$nextTick(() => {
+        this.$refs.FlowBoxCWSettlement.init(data)
+      })
+    },
+    toApprovalDetail(row) {
+      let data = {
+        id: row.id,
+        flowId: row.flowId,
+        opType: 0,
+        status: row.currentState
+      }
+      this.formVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    addHandle() {
+      if (!this.flowList.length) {
+        this.$message({
+          type: 'error',
+          message: '流程不存在'
+        });
+      } else if (this.flowList.length === 1) {
+        this.selectFlow(this.flowList[0])
+      } else {
+        this.flowListVisible = true
+      }
+    },
+    //选择流程发起
+    selectFlow(item) {
+      let data = {
+        id: '',
+        formType: 1,
+        flowId: item.id,
+        opType: '-1'
+      }
+      this.flowListVisible = false
+      this.flowVisible = true
+      this.$nextTick(() => {
+        this.$refs.FlowBox.init(data)
+      })
+    },
+    refresh(isrRefresh) {
+      this.formVisible = false
+      if (isrRefresh) this.reset()
+    },
+    reset() {
+      this.query = JSON.parse(JSON.stringify(this.queryData))
+      this.search()
+    },
+    colseFlow(isrRefresh) {
+      this.flowVisible = false
+      this.flowVisible2 = false
+      if (isrRefresh) this.reset()
+    },
   }
+}
 </script>
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 bf811beb..7864f1cc 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
@@ -57,13 +57,15 @@
         <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 prop="timeName" label="排班计划名称" align="center" fixed="left" sortable
+            width="200px">
           </el-table-column>
-          <el-table-column prop="timeCode" label="排班计划编号" align="center" fixed="left" sortable>
+          <el-table-column prop="timeCode" label="排班计划编号" align="center" fixed="left" sortable
+            width="200px">
           </el-table-column>
-          <el-table-column prop="startTime" label="有效时间(开始)" align="center">
+          <el-table-column prop="startTime" label="有效时间(开始)" align="center" width="150px">
           </el-table-column>
-          <el-table-column prop="endTime" label="结束时间(结束)" align="center">
+          <el-table-column prop="endTime" label="结束时间(结束)" align="center" width="150px">
           </el-table-column>
           <el-table-column label="单据状态" prop="timeStatus" align="center">
             <template slot-scope="scope">
@@ -71,11 +73,11 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="添加时间" align="center">
+          <el-table-column prop="creatorTime" label="添加时间" align="center" width="180px">
           </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 prop="lastModifyTime" label="更新时间" align="center" width="180px">
           </el-table-column>
 
           <el-table-column label="操作" fixed="right" width="150" align="center">
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 3e484fcd..987dee0c 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
@@ -90,9 +90,11 @@
         <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="teamCode" label="班组编号" align="center" fixed="left" sortable>
+          <el-table-column prop="teamCode" label="班组编号" align="center" fixed="left" sortable
+            width="200px">
           </el-table-column>
-          <el-table-column prop="teamName" label="班组名称" align="center" fixed="left" sortable>
+          <el-table-column prop="teamName" label="班组名称" align="center" fixed="left" sortable
+            width="180px">
           </el-table-column>
           <el-table-column prop="type" label="类型" align="center">
             <template slot-scope="scope">
@@ -109,11 +111,11 @@
           <el-table-column prop="classTeamUseNum" label="班组成员" align="center">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="添加时间" align="center">
+          <el-table-column prop="creatorTime" label="添加时间" align="center" width="180px">
           </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 prop="lastModifyTime" label="更新时间" align="center" width="180px">
           </el-table-column>
 
           <el-table-column label="操作" fixed="right" width="150" align="center">
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 719b2e6d..f85eebdf 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
@@ -55,17 +55,19 @@
         <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 prop="timeCode" label="班次编号" align="center" sortable fixed="left"
+            width="200px">
           </el-table-column>
-          <el-table-column prop="timeName" label="班次名称" align="center" sortable fixed="left">
+          <el-table-column prop="timeName" label="班次名称" align="center" sortable fixed="left"
+            width="180px">
           </el-table-column>
 
-          <el-table-column prop="timeNm" label="班次简称" align="center" sortable>
+          <el-table-column prop="timeNm" label="班次简称" align="center">
           </el-table-column>
 
-          <el-table-column prop="startTime" label="开始时间" align="center" sortable>
+          <el-table-column prop="startTime" label="开始时间" align="center">
           </el-table-column>
-          <el-table-column prop="endTime" label="结束时间" align="center" sortable>
+          <el-table-column prop="endTime" label="结束时间" align="center">
           </el-table-column>
 
           <el-table-column label="状态" prop="timeStatus" align="center">
@@ -74,11 +76,11 @@
             </template>
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="添加时间" align="center">
+          <el-table-column prop="creatorTime" label="添加时间" align="center" width="180px">
           </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 prop="lastModifyTime" label="更新时间" align="center" width="180px">
           </el-table-column>
 
           <el-table-column label="操作" fixed="right" width="150" align="center">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue
index 44ddefe4..5471003d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/driver/form.vue
@@ -1,8 +1,8 @@
 <template>
   <div :style="{ margin: '0 auto', width: '100%' }">
     <el-row :gutter="15" class="">
-      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px" label-position="right"
-        :disabled="setting.readonly">
+      <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="120px"
+        label-position="right" :disabled="setting.readonly">
         <template v-if="!loading && formOperates">
           <!-- 具体表单 -->
           <el-col :span="24">
@@ -12,7 +12,7 @@
             </div>
           </el-col>
           <el-col :span="8" v-if="judgeShow('name')">
-            <jnpf-form-tip-item label="登录账号" v-if="judgeShow('name')" prop="name">
+            <jnpf-form-tip-item label="登录账号(司机名称)" v-if="judgeShow('name')" prop="name">
               <JnpfInput v-model="dataForm.name" @change="changeData('name', -1)" placeholder="请输入"
                 :disabled="judgeWrite('name')" clearable :style='{ "width": "100%" }'>
               </JnpfInput>
@@ -20,32 +20,36 @@
           </el-col>
           <el-col :span="8" v-if="judgeShow('mobile')">
             <jnpf-form-tip-item label="手机号码" v-if="judgeShow('mobile')" prop="mobile">
-              <JnpfInput v-model="dataForm.mobile" @change="changeData('mobile', -1)" placeholder="请输入"
-                :disabled="judgeWrite('mobile')" clearable :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.mobile" @change="changeData('mobile', -1)"
+                placeholder="请输入" :disabled="judgeWrite('mobile')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="8" v-if="judgeShow('wechat')">
             <jnpf-form-tip-item label="微信账号" v-if="judgeShow('wechat')" prop="wechat">
-              <JnpfInput v-model="dataForm.wechat" @change="changeData('wechat', -1)" placeholder="请输入"
-                :disabled="judgeWrite('wechat')" clearable :style='{ "width": "100%" }'>
+              <JnpfInput v-model="dataForm.wechat" @change="changeData('wechat', -1)"
+                placeholder="请输入" :disabled="judgeWrite('wechat')" clearable
+                :style='{ "width": "100%" }'>
               </JnpfInput>
             </jnpf-form-tip-item>
           </el-col>
 
           <el-col :span="8" v-if="judgeShow('brithdayTime')">
             <jnpf-form-tip-item label="出生日期" v-if="judgeShow('brithdayTime')" prop="brithdayTime">
-              <JnpfDatePicker v-model="dataForm.brithdayTime" @change="changeData('brithdayTime', -1)"
-                :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
-                :disabled="judgeWrite('brithdayTime')" clearable :style='{ "width": "100%" }' type="date"
-                format="yyyy-MM-dd">
+              <JnpfDatePicker v-model="dataForm.brithdayTime"
+                @change="changeData('brithdayTime', -1)" :startTime="dateTime(false, 1, 1, '', '')"
+                :endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择"
+                :disabled="judgeWrite('brithdayTime')" clearable :style='{ "width": "100%" }'
+                type="date" format="yyyy-MM-dd">
               </JnpfDatePicker>
             </jnpf-form-tip-item>
           </el-col>
           <el-col :span="24" v-if="judgeShow('sex')">
             <jnpf-form-tip-item label="性别" v-if="judgeShow('sex')" prop="sex">
-              <JnpfRadio v-model="dataForm.sex" @change="changeData('sex', -1)" :disabled="judgeWrite('sex')"
-                optionType="default" direction="horizontal" size="small" :options="sexOptions" :props="sexProps">
+              <JnpfRadio v-model="dataForm.sex" @change="changeData('sex', -1)"
+                :disabled="judgeWrite('sex')" optionType="default" direction="horizontal"
+                size="small" :options="sexOptions" :props="sexProps">
               </JnpfRadio>
             </jnpf-form-tip-item>
           </el-col>
@@ -62,19 +66,22 @@
               </div>
               <el-table :data="dataForm.driverVehicleList" size='mini'>
                 <el-table-column type="index" width="50" label="序号" align="center" />
-                <el-table-column label="车牌号" v-if="judgeShow('drivervehicle-vehicleId')" prop="vehicleId">
+                <el-table-column label="车牌号" v-if="judgeShow('drivervehicle-vehicleId')"
+                  prop="vehicleId">
                   <template slot="header">
                     <span class="required-sign"></span>车牌号
                   </template>
                   <template slot-scope="scope">
                     <JnpfPopupSelect v-model="scope.row.vehicleId"
-                      @change="changeData('drivervehicle-vehicleId', scope.$index)" :rowIndex="scope.$index"
-                      :formData="dataForm" :templateJson="interfaceRes.drivervehiclevehicleId" placeholder="请选择"
-                      :disabled="judgeWrite('drivervehicleList') || judgeWrite('drivervehicleList-vehicleId')" hasPage
-                      propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
-                      relationField='vehicle_number' :field="'vehicleId' + scope.$index"
-                      interfaceId="531489245886438725" :pageSize="20"
-                      :columnOptions="drivervehiclevehicleIdcolumnOptions" clearable :style='{ "width": "100%" }'>
+                      @change="changeData('drivervehicle-vehicleId', scope.$index)"
+                      :rowIndex="scope.$index" :formData="dataForm"
+                      :templateJson="interfaceRes.drivervehiclevehicleId" placeholder="请选择"
+                      :disabled="judgeWrite('drivervehicleList') || judgeWrite('drivervehicleList-vehicleId')"
+                      hasPage propsValue="id" popupWidth="800px" popupTitle="选择数据"
+                      popupType="dialog" relationField='vehicle_number'
+                      :field="'vehicleId' + scope.$index" interfaceId="531489245886438725"
+                      :pageSize="20" :columnOptions="drivervehiclevehicleIdcolumnOptions" clearable
+                      :style='{ "width": "100%" }'>
                     </JnpfPopupSelect>
                   </template>
                 </el-table-column>
@@ -92,13 +99,14 @@
           </el-col>
           <!-- 表单结束 -->
         </template>
-        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
-          @select="addForSelect" @close="selectDialogVisible = false" />
+        <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
+          ref="selectDialog" @select="addForSelect" @close="selectDialogVisible = false" />
       </el-form>
     </el-row>
     <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
 
-    <VehicleGoodsBox v-if="VehicleGoodsBoxVisible" ref="VehicleGoodsBox" @refreshDataList="initList" />
+    <VehicleGoodsBox v-if="VehicleGoodsBoxVisible" ref="VehicleGoodsBox"
+      @refreshDataList="initList" />
 
   </div>
 </template>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/energyconsumption/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/energyconsumption/index.vue
index 6216f3ae..f5389a43 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/energyconsumption/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/energyconsumption/index.vue
@@ -65,11 +65,14 @@
             </el-tooltip>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
-          :span-method="arraySpanMethod" has-c custom-column border>
-          <el-table-column prop="code" label="编号" align="center" sortable fixed="left">
+        <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="code" label="编号" align="center" sortable fixed="left"
+            width="200px">
           </el-table-column>
-          <el-table-column prop="name" label="名称" align="center" sortable fixed="left">
+          <el-table-column prop="name" label="名称" align="center" sortable fixed="left"
+            width="180px">
           </el-table-column>
           <el-table-column prop="monthTime" label="隶属月份" align="center">
           </el-table-column>
@@ -80,13 +83,13 @@
           </el-table-column>
           <el-table-column prop="cost" label="费用信息" align="center">
           </el-table-column>
-          <el-table-column prop="creatorTime" label="创建时间" align="center">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="180px">
           </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 prop="lastModifyTime" label="更新时间" align="center" width="180px">
           </el-table-column>
-          <el-table-column prop="lastModifyUserId" label="更新人" align="center">
+          <el-table-column prop="lastModifyUserId" label="更新人" align="center" width="150px">
           </el-table-column>
 
           <el-table-column prop="flowState" label="状态" width="100" align="center">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
index c26472c4..3ad12066 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/form.vue
@@ -871,7 +871,7 @@ export default {
       documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
       documentTypeProps: { "label": "fullName", "value": "id" },
       voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
-      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
+      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "mobile" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
       firstSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@@ -983,7 +983,7 @@ export default {
       this.dataForm.voucherVehicleList = []
       let item = {
         vehicleId: val2.id,
-        driverName: val2.name,
+        driverName: val2.driverName,
         telephone: val2.mobile,
         carrier: val2.carrier
       }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
index ed21d2b4..eea67e7f 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptVoucher/form.vue
@@ -884,7 +884,7 @@ export default {
       documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
       documentTypeProps: { "label": "fullName", "value": "id" },
       voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
-      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
+      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "mobile" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
       firstSubjectBasicIdcolumnOptions: [{ "label": "供应商名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@@ -1018,7 +1018,7 @@ export default {
       this.dataForm.voucherVehicleList = []
       let item = {
         vehicleId: val2.id,
-        driverName: val2.name,
+        driverName: val2.driverName,
         telephone: val2.mobile,
         carrier: val2.carrier
       }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
index 366c6b89..49d5cb0a 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/form.vue
@@ -831,7 +831,7 @@ export default {
       documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
       documentTypeProps: { "label": "fullName", "value": "id" },
       voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
-      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
+      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "driverName" }, { "label": "电话", "value": "mobile" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
       firstSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@@ -911,7 +911,7 @@ export default {
       this.dataForm.voucherVehicleList = []
       let item = {
         vehicleId: val2.id,
-        driverName: val2.name,
+        driverName: val2.driverName,
         telephone: val2.mobile,
         carrier: val2.carrier
       }
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
index 586a0929..04cedc03 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/receiptVoucher/form.vue
@@ -824,7 +824,7 @@ export default {
       documentTypeOptions: [{ "fullName": "收货凭证", "id": "1" }, { "fullName": "发货凭证", "id": "2" }],
       documentTypeProps: { "label": "fullName", "value": "id" },
       voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "商品简称", "value": "short_name" }, { "label": "规格", "value": "spec" }, { "label": "商品条码", "value": "bar_code" }, { "label": "存货类型", "value": "inventoryType" }],
-      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "value": "name" }, { "label": "电话", "value": "mobile" },],
+      vouchervehiclevehicleIdcolumnOptions: [{ "label": "车牌号", "value": "vehicle_number" }, { "label": "驾驶员", "driverName": "name" }, { "label": "电话", "value": "mobile" },],
       enterpriseIdcolumnOptions: [{ "label": "机构编码", "value": "f_en_code" }, { "label": "机构名称", "value": "f_full_name" },],
       firstSubjectBasicIdcolumnOptions: [{ "label": "客户名称", "value": "name" }, { "label": "国家", "value": "country" }, { "label": "地址", "value": "address" }, { "label": "电话", "value": "phone" }],
       deliveryproductrelationdeliveryUnitOptions: [{ fullName: "吨", id: "1" }, { fullName: "千克", id: "2" }],
@@ -902,7 +902,7 @@ export default {
       this.dataForm.voucherVehicleList = []
       let item = {
         vehicleId: val2.id,
-        driverName: val2.name,
+        driverName: val2.driverName,
         telephone: val2.mobile,
         carrier: val2.carrier
       }
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 5956e94c..0e06d72a 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
@@ -81,15 +81,18 @@
           <el-table-column prop="inspectionCode" label="质检单编号" align="center" sortable width="200px"
             fixed="left">
           </el-table-column>
-          <el-table-column label="质检类型" prop="inspectionType" align="center" sortable width="100px"
+          <!-- <el-table-column label="质检类型" prop="inspectionType" align="center" sortable width="100px"
             fixed="left">
             <template slot-scope="scope">
               {{ scope.row.inspectionType }}
             </template>
+          </el-table-column> -->
+          <el-table-column prop="inspectionType1" label="质检类型" align="center" fixed="left">
           </el-table-column>
 
-          <el-table-column prop="conclusionType" label="质检结论" align="center" fixed="left">
+          <el-table-column prop="conclusionType1" label="质检结论" align="center" fixed="left">
           </el-table-column>
+
           <el-table-column prop="businessVoucher" label="关联单据" align="center" width="200px">
           </el-table-column>
           <!-- <el-table-column prop="inspectionType" label="质检类型" align="left">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
index 98126fe7..490a1575 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationpurchase/index.vue
@@ -86,12 +86,20 @@
           <el-table-column prop="carrier" label="承运商" align="center" width="150">
           </el-table-column>
 
-          <el-table-column prop="creatorTime" label="创建时间" align="center" width="150">
+          <el-table-column prop="creatorTime" label="创建时间" align="center" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.creatorTime | toDate("yyyy-MM-dd") }}
+            </template>
           </el-table-column>
           <el-table-column prop="creatorUserName" label="创建用户" align="center" width="150">
           </el-table-column>
-          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="150">
+
+          <el-table-column prop="lastModifyTime" label="修改时间" align="center" width="100">
+            <template slot-scope="scope">
+              {{ scope.row.lastModifyTime | toDate("yyyy-MM-dd") }}
+            </template>
           </el-table-column>
+
           <el-table-column prop="lastUserName" label="修改用户" align="center" width="150">
           </el-table-column>
 
@@ -116,8 +124,8 @@
               </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" v-has="'btn-warehousing'"
-                @click="addwarehousing(scope.row)">入库</el-button>
+              <el-button v-if="scope.row.warehousingStatus != 4" size="mini" type="text"
+                v-has="'btn-warehousing'" @click="addwarehousing(scope.row)">入库</el-button>
             </template>
           </el-table-column>
         </JNPF-table>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
index 274ca2c7..4812ef17 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousingnotification/warehousingnotificationsale/index.vue
@@ -121,8 +121,8 @@
                 @click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
               </el-button>
 
-              <el-button size="mini" type="text" v-has="'btn-warehousing'"
-                @click="addwarehousing(scope.row)">出库
+              <el-button v-if="scope.row.warehousingStatus != 4" size="mini" type="text"
+                v-has="'btn-warehousing'" @click="addwarehousing(scope.row)">出库
               </el-button>
               <!-- <el-button type="text" icon="icon-ym icon-ym-btn-add" v-has="'btn-warehousingsale'"
                 @click="addOrUpdateHandle()">出库