diff --git a/jnpf-app/pages/scm/form/cwsettlement/index.vue b/jnpf-app/pages/scm/form/cwsettlement/index.vue
index a6fec678..903680bf 100644
--- a/jnpf-app/pages/scm/form/cwsettlement/index.vue
+++ b/jnpf-app/pages/scm/form/cwsettlement/index.vue
@@ -725,7 +725,7 @@
 					<view class="u-p-l-20 u-p-r-20 form-item-box">
 						<u-form-item v-if="judgeShow('cwsettlementcostList-wayType')"
 							:required="requiredList['cwsettlementcostList-wayType']"
-							label="付款方式（1：单独收款 2：账扣 3：单据付款 4：账扣）">
+							label="付款方式">
 							<jnpf-select v-model="dataForm.cwsettlementcostList[i].wayType"
 								:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-wayType')"
 								@change="changeData('cwsettlementcost-wayType',i)" clearable placeholder="请选择"
@@ -1248,6 +1248,9 @@
 				}, {
 					"fullName": "微信",
 					"id": "6"
+				},{
+					"fullName": "无",
+					"id": "7"
 				}],
 				paymentMethodProps: {
 					"label": "fullName",
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
index ded3b6cc..4d455fc2 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WorkOrderServiceImpl.java
@@ -263,6 +263,16 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
             }
 
+            if(ObjectUtil.isNotEmpty(workOrderPagination.getCreatorTime())){
+                workOrderNum++;
+                List PreparationTimeList =  JsonUtil.getJsonToList(workOrderPagination.getCreatorTime(),String.class);
+                Long fir = Long.valueOf(String.valueOf(PreparationTimeList.get(0)));
+                Long sec = Long.valueOf(String.valueOf(PreparationTimeList.get(1)));
+                workOrderQueryWrapper.ge("a.creator_time", new Date(fir))
+                        .le("a.creator_time", DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+            }
+
+
         }
             if(workOrderPrimaryNum>0){
             List<String> workOrderPrimaryIdList = workOrderPrimaryService.list(workOrderPrimaryQueryWrapper).stream().filter(t->StringUtil.isNotEmpty(t.getWorkId())).map(t->t.getWorkId()).collect(Collectors.toList());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java
index 15059997..ca236b6d 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderPagination.java
@@ -42,4 +42,8 @@ public class WorkOrderPagination extends Pagination {
 
     @JsonProperty("warehouseId")
     private Object warehouseId;
+
+    /** 制单时间 */
+    @JsonProperty("creatorTime")
+    private Object creatorTime;
 }
diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
index 46dfead3..1377ef6d 100644
--- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue
@@ -2422,21 +2422,21 @@
         }else if(row.underpayment_method == 1){
           this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按金额(' + row.apply_for_underpayment_ratio + '元)';
         }else if(row.underpayment_method == 2){
-          this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按比例(' + row.apply_for_underpayment_ratio + '%)';
+          this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按比例(' + row.apply_for_underpayment_ratio + ')';
         }
         if(row.margin_method == 0){
           this.dataForm.cwsettlementsubjectList[0].marginMethod = '无';
         }else if(row.margin_method == 1){
           this.dataForm.cwsettlementsubjectList[0].marginMethod = '按金额(' + row.apply_for_margin_ratio + '元)';
         }else if(row.margin_method == 2){
-          this.dataForm.cwsettlementsubjectList[0].marginMethod = '按比例(' + row.apply_for_margin_ratio + '%)';
+          this.dataForm.cwsettlementsubjectList[0].marginMethod = '按比例(' + row.apply_for_margin_ratio + ')';
         }
         if(row.overdue_interest_rate == 0){
           this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '无';
         }else if(row.overdue_interest_rate == 1){
-          this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按年化(' + row.apply_for_overdue_ratio + '%)';
+          this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按年化(' + row.apply_for_overdue_ratio + ')';
         }else if(row.overdue_interest_rate == 2){
-          this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按月化(' + row.apply_for_overdue_ratio + '%)';
+          this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按月化(' + row.apply_for_overdue_ratio + ')';
         }
       },
       typeChangeData(){
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 0e06d72a..c8f28482 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
@@ -233,7 +233,7 @@ export default {
         isLeaf: 'isLeaf'
       },
       list: [],
-      listLoading: true,
+      listLoading: false,
       multipleSelection: [], total: 0,
       queryData: {},
       listQuery: {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
index a356cea7..78402c12 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue
@@ -13,6 +13,15 @@
               <el-input v-model="query.businessCode" placeholder="请输入" clearable> </el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="制单时间">
+              <JnpfDateRangePicker v-model="query.creatorTime" format="yyyy-MM-dd"
+                startPlaceholder="开始日期" endPlaceholder="结束日期">
+              </JnpfDateRangePicker>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item label="单据类型">
               <JnpfSelect v-model="query.type" placeholder="请选择" clearable :options="typeOptions"
@@ -443,6 +452,9 @@ export default {
     },
     //初始化查询的默认数据
     async initSearchData() {
+      let date = new Date();
+      let dateWithoutTime = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+      this.query.creatorTime = [dateWithoutTime.getTime(), dateWithoutTime.getTime()]
     },
     initData() {
       this.listLoading = true;