From 364d29dbaa80967d0269b9d02fdf1c58832e3cfe Mon Sep 17 00:00:00 2001
From: ZhangAo <hi_itao@163.com>
Date: Mon, 11 May 2026 17:32:43 +0800
Subject: [PATCH] 20260511173242

---
 .../g3soft/controller/DataSaveController.java |    3 +
 .../cn/g3soft/controller/FileController.java  |   19 +-
 .../cn/g3soft/controller/OcrController.java   |    1 -
 .../main/java/cn/g3soft/utils/HttpUtils.java  |   18 +-
 .../src/main/resources/application-dev.yml    |    2 +-
 .../src/main/resources/application.yml        |    5 +-
 .../main/resources/dbconfigs/g3hd.properties  |   14 +-
 .../ocr-uniapp/src/pages-sub/upload/index.vue |   32 +-
 .../ocr-uniapp/src/request/index.ts           |   52 +-
 code/container-ocr/ocr-vue/.env               |    7 +-
 code/container-ocr/ocr-vue/.env.development   |    1 +
 code/container-ocr/ocr-vue/.env.production    |    1 +
 code/container-ocr/ocr-vue/components.d.ts    |    8 +
 .../components/g3-container-file/index.vue    |   12 +-
 .../container-ocr/ocr-vue/src/plugins/icon.js |   12 +-
 .../ocr-vue/src/store/permission.js           |   20 +-
 .../ocr-vue/src/views/container/index.vue     |   20 +-
 .../ocr-vue/src/views/system/log/data.vue     |   11 +-
 code/jsp/editorder_s_cw.jsp                   | 2403 +++++++++++++++++
 code/jsp/js/draft-page-manager.js             |  439 +++
 20 files changed, 2992 insertions(+), 88 deletions(-)
 create mode 100644 code/container-ocr/ocr-vue/.env.development
 create mode 100644 code/container-ocr/ocr-vue/.env.production
 create mode 100644 code/jsp/editorder_s_cw.jsp
 create mode 100644 code/jsp/js/draft-page-manager.js

diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java
index 2e9cc8a6..63d593ad 100644
--- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java
+++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/DataSaveController.java
@@ -276,6 +276,9 @@ public class DataSaveController {
         mapData.put("b_option",operation);
         mapData.put("b_datas",dataStr);
 
+        mapData.put("b_inputdatetime",dateTime);
+        mapData.put("b_inputuser_id",userId);
+
         logList.add(mapData);
     }
 }
diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java
index b24ed5d8..3964a783 100644
--- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java
+++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/FileController.java
@@ -4,6 +4,7 @@ import cn.g3soft.config.FileConfig;
 import cn.g3soft.context.UserContext;
 import cn.g3soft.utils.*;
 import cn.g3soft.utils.uniqueId.idgen.UniqueId;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.DateUtil;
@@ -286,11 +287,27 @@ public class FileController {
             // 6. 删除数据库
             dbUtils.deleteById("bf_file", "subid", subid);
 
-            return Result.ok();
+            // 7. 记录日志
+            Map<String,Object> mapData = new HashMap<>();
 
+            ObjectMapper objectMapper = new ObjectMapper();
+            String dataStr = objectMapper.writeValueAsString(objectMap);
+
+            String currentDateTime = TimeUtils.getDateTime();
+
+            mapData.put("b_table","bf_file");
+            mapData.put("b_option","DELETE");
+            mapData.put("b_datas",dataStr);
+            mapData.put("b_inputdatetime",currentDateTime);
+            mapData.put("b_inputuser_id",UserContext.get().getUserId());
+
+            dbUtils.insert("log_datas","b_id",mapData);
+
+            return Result.ok();
         } catch (Exception e) {
             e.printStackTrace();
             return Result.fail("删除失败: " + e.getMessage());
         }
     }
+
 }
diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/OcrController.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/OcrController.java
index 7b352769..c30644e5 100644
--- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/OcrController.java
+++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/controller/OcrController.java
@@ -26,7 +26,6 @@ public class OcrController {
         String fileUrl = (String) params.get("fileUrl");
 
         String requestUrl = "http://127.0.0.1:8867/ocr";
-//        String requestUrl = "http://127.0.0.1:8867/paddlex/ocr";
 
         Map<String, Object> reqPayload = new HashMap<>();
         reqPayload.put("file", fileUrl);
diff --git a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/HttpUtils.java b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/HttpUtils.java
index f0188159..14a1bf69 100644
--- a/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/HttpUtils.java
+++ b/code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/utils/HttpUtils.java
@@ -8,11 +8,6 @@ import java.util.concurrent.TimeUnit;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import okhttp3.*;
 
-/**
- * 通用http发送方法
- *
- * @author ruoyi
- */
 public class HttpUtils
 {
     private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -87,19 +82,20 @@ public class HttpUtils
     // ==================== POST JSON（Map版本）====================
     public static String postJson(String url, Map<String, Object> params) throws Exception {
 
-        // 1. Map 转 JSON 字符串
-        String json = MAPPER.writeValueAsString(params);
+        RequestBody body = RequestBody.create(
+                MAPPER.writeValueAsString(params),
+                JSON
+        );
 
-        // 2. 构建请求体
-        RequestBody body = RequestBody.create(json, JSON);
+        OkHttpClient tempClient = client.newBuilder()
+                .build();
 
         Request request = new Request.Builder()
                 .url(url)
                 .post(body)
                 .build();
 
-        // 3. 执行请求
-        try (Response response = client.newCall(request).execute()) {
+        try (Response response = tempClient.newCall(request).execute()) {
             return response.body() != null ? response.body().string() : null;
         }
     }
diff --git a/code/container-ocr/ocr-springboot/src/main/resources/application-dev.yml b/code/container-ocr/ocr-springboot/src/main/resources/application-dev.yml
index 3a86beb4..462f2eef 100644
--- a/code/container-ocr/ocr-springboot/src/main/resources/application-dev.yml
+++ b/code/container-ocr/ocr-springboot/src/main/resources/application-dev.yml
@@ -4,4 +4,4 @@ server:
   port: 80
 
 file:
-  server-url: http://192.168.5.6:80/api
+  server-url: http://192.168.1.137:80/api
diff --git a/code/container-ocr/ocr-springboot/src/main/resources/application.yml b/code/container-ocr/ocr-springboot/src/main/resources/application.yml
index 9ebdc113..0e5ca111 100644
--- a/code/container-ocr/ocr-springboot/src/main/resources/application.yml
+++ b/code/container-ocr/ocr-springboot/src/main/resources/application.yml
@@ -1,7 +1,4 @@
 server:
-  servlet:
-#    context-path: / # 应用的访问路径
-#    context-path: /api/ # 应用的访问路径
   tomcat:
     uri-encoding: UTF-8  # URI编码
     accept-count: 1000  # 连接数满后的排队数
@@ -19,7 +16,7 @@ spring:
     time-zone: "Asia/Shanghai"
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
-    active: dev
+    active: build
 
 file:
   base-dir: D:/data/file
diff --git a/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties b/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties
index b3f87b91..ebae3d85 100644
--- a/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties
+++ b/code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties
@@ -1,10 +1,10 @@
-url=jdbc:sqlserver://118.89.70.199:1433;databaseName=G3BoxOCR;encrypt=false
-username=sa
-password=zhang520..
-driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-
-#url=jdbc:sqlserver://127.0.0.1:1433;databaseName=G3ContainerOCR
+#url=jdbc:sqlserver://118.89.70.199:1433;databaseName=G3BoxOCR;encrypt=false
 #username=sa
-#password=123456@aaa
+#password=zhang520..
 #driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
+url=jdbc:sqlserver://127.0.0.1:1433;databaseName=G3ContainerOCR;encrypt=false
+username=sa
+password=123456@aaa
+driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+
diff --git a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue
index 78e31249..5b99a2d0 100644
--- a/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue
+++ b/code/container-ocr/ocr-uniapp/src/pages-sub/upload/index.vue
@@ -54,9 +54,16 @@ function handleChooseBox() {
 
         imageCompress(tempFile.path).then((compressRes) => {
           form.value.b_container_img = compressRes.path
+          const fileName = tempFile.name || `image_${Date.now()}.jpg`
+          boxImage.value = {
+            ...tempFile,
+            name: fileName,
+            path: compressRes.path,
+            size: compressRes.size,
+          }
 
           uploadTempFileApi(compressRes.path, {
-            fileName: tempFile.name,
+            fileName,
           }).then((res) => {
             if (res.success) {
               recognizeOcrBoxApi({
@@ -92,12 +99,15 @@ const computedOcrScore = computed(() => {
 function resetForm() {
   boxImage.value = null
   form.value.b_container_no = ''
+  form.value.b_container_img = ''
   form.value.ocrNo = ''
   form.value.ocrScore = 0.00
 
   showResult.value = false
   isError.value = false
   ocrFinish.value = false
+  subFileList.value = []
+  subFileList2.value = []
 }
 
 function handleDeleteBoxImage() {
@@ -140,7 +150,7 @@ function beforeRemove(_index: number, _fileItem: UploadFileItem): boolean | Prom
 }
 
 async function handleConfirm() {
-  if (form.value.b_container_img === '') {
+  if (!boxImage.value) {
     toast.fail('集装箱号图片不能为空')
     return
   }
@@ -258,6 +268,13 @@ async function handleConfirm() {
       tipContainerNo.value = form.value.b_container_no
       showResult.value = true
     }
+    else {
+      toast.fail('保存失败')
+    }
+  }).catch(() => {
+    toast.fail('保存失败')
+  }).finally(() => {
+    toast.hide()
   })
 }
 
@@ -279,19 +296,8 @@ async function continueAdd() {
   const idRes = await getUniqueIdApi()
 
   if (idRes.success) {
-    boxImage.value = null
-
-    ocrFinish.value = false
-    isError.value = false
-
     resetForm()
     form.value.b_id = idRes.data
-
-    subFileList.value = []
-    subFileList2.value = []
-
-    showResult.value = false
-
     tipContainerNo.value = ''
   }
 }
diff --git a/code/container-ocr/ocr-uniapp/src/request/index.ts b/code/container-ocr/ocr-uniapp/src/request/index.ts
index fea8ae83..4269d967 100644
--- a/code/container-ocr/ocr-uniapp/src/request/index.ts
+++ b/code/container-ocr/ocr-uniapp/src/request/index.ts
@@ -6,26 +6,45 @@ import { joinUrl } from '@/utils/common'
 
 import { isH5 } from '@/utils/platform'
 
+let dbJsonCache: Record<string, string> | null = null
+let dbJsonPromise: Promise<Record<string, string>> | null = null
+
 /**
  * ======================
- * 读取机构配置
+ * 读取机构配置（带缓存）
  * ======================
  */
 function readDbJson(): Promise<Record<string, string>> {
-  return new Promise((resolve, reject) => {
+  if (dbJsonCache) {
+    return Promise.resolve(dbJsonCache)
+  }
+
+  if (dbJsonPromise) {
+    return dbJsonPromise
+  }
+
+  dbJsonPromise = new Promise((resolve, reject) => {
     if (isH5) {
-      const timestamp = Date.now()
       uni.request({
-        url: `/g3ocr-app/static/db.json?t=${timestamp}`,
+        url: '/g3ocr-app/static/db.json',
         method: 'GET',
-        success: r => resolve(r.data as Record<string, string>),
-        fail: err => reject(err),
+        success: (r) => {
+          dbJsonCache = r.data as Record<string, string>
+          resolve(dbJsonCache)
+        },
+        fail: (err) => {
+          dbJsonPromise = null
+          reject(err)
+        },
       })
     }
     else {
-      resolve(dbJson as Record<string, string>)
+      dbJsonCache = dbJson as Record<string, string>
+      resolve(dbJsonCache)
     }
   })
+
+  return dbJsonPromise
 }
 
 /**
@@ -38,23 +57,7 @@ export async function getOrgBaseUrl(orgid: string): Promise<string> {
     return ''
   }
 
-  let dbRes: Record<string, string> = {}
-
-  // 读取配置（和你原逻辑保持一致）
-  if (isH5) {
-    const timestamp = Date.now()
-    dbRes = await new Promise((resolve, reject) => {
-      uni.request({
-        url: `/g3ocr-app/static/db.json?t=${timestamp}`,
-        method: 'GET',
-        success: res => resolve(res.data as Record<string, string>),
-        fail: err => reject(err),
-      })
-    })
-  }
-  else {
-    dbRes = dbJson as Record<string, string>
-  }
+  const dbRes = await readDbJson()
 
   if (!dbRes || Object.keys(dbRes).length === 0) {
     throw new Error('机构配置获取失败')
@@ -66,7 +69,6 @@ export async function getOrgBaseUrl(orgid: string): Promise<string> {
     throw new Error('机构码无效')
   }
 
-  // 👉 关键：只返回原始 JSON 里的值
   return baseUrl
 }
 
diff --git a/code/container-ocr/ocr-vue/.env b/code/container-ocr/ocr-vue/.env
index 4da995fd..d34737e5 100644
--- a/code/container-ocr/ocr-vue/.env
+++ b/code/container-ocr/ocr-vue/.env
@@ -1,6 +1,6 @@
 # Application
 # 应用名称（用于标题、日志等）
-PUBLIC_APP_NAME=g3ocr
+PUBLIC_APP_NAME=集装箱装货影像采集
 
 # Server
 # 应用部署基础路径（路由和静态资源 base）
@@ -8,9 +8,4 @@ PUBLIC_SERVER_PATH=/g3ocr/
 # 本地开发服务器端口
 PUBLIC_SERVER_PORT=8080
 
-# API
-# 后端 API 基础地址
-# PUBLIC_API_BASE_URL=http://ser369.g3soft.cn:80/api
-PUBLIC_API_BASE_URL=http://192.168.5.6:80/api
-
 PUBLIC_ALIYUN_BUCKET = g3hd
diff --git a/code/container-ocr/ocr-vue/.env.development b/code/container-ocr/ocr-vue/.env.development
new file mode 100644
index 00000000..2988bd40
--- /dev/null
+++ b/code/container-ocr/ocr-vue/.env.development
@@ -0,0 +1 @@
+PUBLIC_API_BASE_URL=http://192.168.1.137:80/api
diff --git a/code/container-ocr/ocr-vue/.env.production b/code/container-ocr/ocr-vue/.env.production
new file mode 100644
index 00000000..9335023a
--- /dev/null
+++ b/code/container-ocr/ocr-vue/.env.production
@@ -0,0 +1 @@
+PUBLIC_API_BASE_URL=http://ser369.g3soft.cn:80/api
\ No newline at end of file
diff --git a/code/container-ocr/ocr-vue/components.d.ts b/code/container-ocr/ocr-vue/components.d.ts
index 39ff9c4a..52fa9721 100644
--- a/code/container-ocr/ocr-vue/components.d.ts
+++ b/code/container-ocr/ocr-vue/components.d.ts
@@ -18,6 +18,7 @@ declare module 'vue' {
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -27,16 +28,23 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElResult: typeof import('element-plus/es')['ElResult']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSplitter: typeof import('element-plus/es')['ElSplitter']
     ElSplitterPanel: typeof import('element-plus/es')['ElSplitterPanel']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
+    ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     G3Column: typeof import('./src/components/g3-table/g3-column.vue')['default']
diff --git a/code/container-ocr/ocr-vue/src/components/g3-container-file/index.vue b/code/container-ocr/ocr-vue/src/components/g3-container-file/index.vue
index 89b2a1f8..9f72c365 100644
--- a/code/container-ocr/ocr-vue/src/components/g3-container-file/index.vue
+++ b/code/container-ocr/ocr-vue/src/components/g3-container-file/index.vue
@@ -630,6 +630,16 @@ function handleBatchDelete() {
 }
 
 async function deleteFiles(files) {
+  // ===== 新增：校验 mx_cate_id =====
+  const protectedFiles = files.filter((item) => Number(item.mx_cate_id) === 0);
+
+  if (protectedFiles.length > 0) {
+    const names = protectedFiles.map((item) => item.mx_filename).join("，");
+
+    ElMessage.warning(`文件【${names}】属于箱门照，不允许删除`);
+    return;
+  }
+
   // 收集文件的 mx_filename
   const filenames = files.map((file) => file.mx_filename).join("， ");
 
@@ -673,7 +683,7 @@ async function deleteFiles(files) {
     }
   });
 }
-// 保存
+
 // 保存
 async function handleSave() {
   if (cateId.value !== "1" && cateId.value !== "2") {
diff --git a/code/container-ocr/ocr-vue/src/plugins/icon.js b/code/container-ocr/ocr-vue/src/plugins/icon.js
index 7940cee0..ae0aed25 100644
--- a/code/container-ocr/ocr-vue/src/plugins/icon.js
+++ b/code/container-ocr/ocr-vue/src/plugins/icon.js
@@ -3,12 +3,12 @@
  */
 
 import { addCollection } from "@iconify/vue";
-import Lucide from "@iconify/json/json/lucide.json";
-import ElementPlus from "@iconify/json/json/ep.json";
-import Mingcute from "@iconify/json/json/mingcute.json";
+// import Lucide from "@iconify/json/json/lucide.json";
+// import ElementPlus from "@iconify/json/json/ep.json";
+// import Mingcute from "@iconify/json/json/mingcute.json";
 
 export function SetupIcons() {
-  addCollection(Lucide);
-  addCollection(ElementPlus);
-  addCollection(Mingcute);
+  // addCollection(Lucide);
+  // addCollection(ElementPlus);
+  // addCollection(Mingcute);
 }
diff --git a/code/container-ocr/ocr-vue/src/store/permission.js b/code/container-ocr/ocr-vue/src/store/permission.js
index 3fd454d8..bd471563 100644
--- a/code/container-ocr/ocr-vue/src/store/permission.js
+++ b/code/container-ocr/ocr-vue/src/store/permission.js
@@ -76,16 +76,28 @@ export const usePermissionStore = defineStore("permission", () => {
     }
 
     const moduleid = route.meta.moduleId;
-    if (!moduleid) return false;
 
-    if (!hasModulePermission(moduleid)) return false;
+    if (!moduleid) {
+      return false;
+    }
+
+    const hasModule = hasModulePermission(moduleid);
+
+    if (!hasModule) {
+      return false;
+    }
 
     const actions = actionPermissions.value.filter((item) => item.ModuleID === moduleid);
 
     const action = actions.find((item) => Number(item.b_ivalue) === Number(id));
 
-    if (!action) return false;
-    if (action.b_canuse === "0") return false;
+    if (!action) {
+      return false;
+    }
+
+    if (action.b_canuse === "0") {
+      return false;
+    }
 
     // 其他情况允许
     return true;
diff --git a/code/container-ocr/ocr-vue/src/views/container/index.vue b/code/container-ocr/ocr-vue/src/views/container/index.vue
index e06bc10f..ea0ae934 100644
--- a/code/container-ocr/ocr-vue/src/views/container/index.vue
+++ b/code/container-ocr/ocr-vue/src/views/container/index.vue
@@ -89,6 +89,7 @@ const handleSizeChange = (val) => {
 
   loadTableDatas();
 };
+
 const handleCurrentChange = (val) => {
   pagination.page = val;
 
@@ -229,7 +230,7 @@ async function deleteRows(rows = []) {
         keyField: "b_id",
         inserts: [],
         updates: [],
-        deletes: deleteIds.map((id) => ({ b_id: id })),
+        deletes: rows,
       },
     ];
 
@@ -295,7 +296,11 @@ async function handleDownloadOne(data) {
   });
 
   try {
-    const fileRes = await loadDataApi("bf_file", `father = ${data.b_id}`, "mx_cate_id asc,mx_xh asc");
+    const fileRes = await loadDataApi(
+      "bf_file",
+      `father = ${data.b_id}`,
+      "mx_cate_id asc,mx_xh asc",
+    );
 
     if (!fileRes.success) {
       ElMessage.error("获取附件失败");
@@ -369,7 +374,11 @@ async function handleDownloadBatch() {
     const containerCountMap = new Map();
 
     for (const item of records) {
-      const fileRes = await loadDataApi("bf_file", `father='${item.b_id}'`, "mx_cate_id asc,mx_xh asc");
+      const fileRes = await loadDataApi(
+        "bf_file",
+        `father='${item.b_id}'`,
+        "mx_cate_id asc,mx_xh asc",
+      );
 
       const files = (fileRes.success && fileRes.data) || [];
       totalFiles += files.length;
@@ -657,7 +666,10 @@ function buildFileName(containerNo, index, fileName) {
                   </el-button>
                   <template #dropdown>
                     <el-dropdown-menu>
-                      <el-dropdown-item @click="handleUpdateShow(row)">
+                      <el-dropdown-item
+                        @click="handleUpdateShow(row)"
+                        :disabled="!permissionStore.hasActionPermission(2)"
+                      >
                         <el-icon class="el-icon--left">
                           <G3Icon icon="lucide:refresh-ccw" />
                         </el-icon>
diff --git a/code/container-ocr/ocr-vue/src/views/system/log/data.vue b/code/container-ocr/ocr-vue/src/views/system/log/data.vue
index 745b9dfa..27cb244e 100644
--- a/code/container-ocr/ocr-vue/src/views/system/log/data.vue
+++ b/code/container-ocr/ocr-vue/src/views/system/log/data.vue
@@ -76,15 +76,15 @@ async function loadTableDatas() {
   }
 
   if (searchForm.value.datas) {
-    searchCondition += `b_datas LIKE '${searchForm.value.datas}' AND `;
+    searchCondition += `b_datas LIKE '%${searchForm.value.datas}%' AND `;
   }
 
   if (searchForm.value.option) {
-    searchCondition += `b_option LIKE '${searchForm.value.option}' AND `;
+    searchCondition += `b_option LIKE '%${searchForm.value.option}%' AND `;
   }
 
   if (searchForm.value.table) {
-    searchCondition += `b_table LIKE '${searchForm.value.table}' AND `;
+    searchCondition += `b_table LIKE '%${searchForm.value.table}%' AND `;
   }
 
   if (searchCondition.endsWith(" AND ")) {
@@ -250,8 +250,11 @@ function handleSearchReset() {
             showIcon: false,
             trigger: 'cell',
           }"
+          :cell-config="{
+            height: 'auto',
+          }"
           height="100%"
-          show-overflow
+          :show-overflow="false"
           show-header-overflow
         >
           <vxe-column field="seq" type="seq" width="50" align="center" title=" " fixed="left" />
diff --git a/code/jsp/editorder_s_cw.jsp b/code/jsp/editorder_s_cw.jsp
new file mode 100644
index 00000000..f855d086
--- /dev/null
+++ b/code/jsp/editorder_s_cw.jsp
@@ -0,0 +1,2403 @@
+<%@ page language="java" import="java.util.*,com.g3.general.*" pageEncoding="UTF-8" %>
+	<%@ include file="../ini.jsp" %>
+		<% String id=request.getParameter("id"); if (id==null) { id="" ; } String ywid=request.getParameter("ywid"); if
+			(ywid==null) { ywid="" ; } String selrows=request.getParameter("selrows"); if (selrows==null) { selrows="" ; }
+			String sqshfk=request.getParameter("sqshfk"); String jsfs=request.getParameter("jsfs"); if (jsfs==null) { jsfs=""
+			; } String subviewtable=request.getParameter("subviewtable"); if (subviewtable==null) { subviewtable="" ; } String
+			StoragekeyID=request.getParameter("StoragekeyID"); if (StoragekeyID==null) { StoragekeyID="" ; } %>
+
+			<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+			<html>
+
+			<head>
+				<base href="<%=basePath%>">
+				<title>应收费用账单</title>
+				<jsp:include page="../inc.jsp"></jsp:include>
+				<script type="text/javascript" src="js/jquery-memoedit/jquery.memo.js"></script>
+				<script type="text/javascript" src="js/datagrid-drag/datagrid-dnd.js"></script>
+				<script type="text/javascript" src="js/datagrid-drag/datagrid-head.js"></script>
+				<script type="text/javascript" src="jsys/chinesetopy.js"></script>
+				<script type="text/javascript" src="js/draft-page-manager.js"></script>
+				<style>
+					.g3-label-width {
+						width: 80px;
+					}
+
+					.g3-form-col {
+						width: 270px;
+					}
+
+					.g3-form-col1 {
+						width: 320px;
+					}
+
+					.g3-data-label {
+						float: left;
+						display: block;
+						padding: 0px 4px;
+						font-weight: 400;
+						line-height: 25px;
+						width: 80px;
+						text-align: center;
+					}
+
+					.modal-dialog {
+						width: 1000px;
+					}
+
+					.modal-content {
+						width: 1000px;
+					}
+
+					.datagrid-row-delete {
+						text-decoration: line-through;
+						color: #999;
+					}
+				</style>
+			</head>
+
+			<body style="min-width: 1070px;">
+				<form id="zdskform" method="post">
+					<div class="g3-flex-main">
+						<div class="g3-toolbar">
+							<input class="g3-btn-danger" id="btn_save" type="button" tag='3' onclick="saveData()" value="保存">
+							<input class="g3-btn-blue" id="btn_repor" type="button" tag='5' onclick="selectreport()" value="报表">
+							<input class="g3-btn-blue"" id=" btn_attach" type="button" tag='8' onclick="showattach()" value="附件">
+							<input class="g3-btn-blue" type="hidden" tag='7' onclick="sh()" value="审核">
+							<input class="g3-btn-blue" id="btn_kp" type="button" tag='21' onclick="newIVData()" value="开票">
+							<input class="g3-btn-blue" id="btn_sk" type="button" tag='22' onclick="newSKData()" value="收款">
+						</div>
+						<div class="g3-flex-panel">
+							<div id="caption_yszd" class="g3-top-title" style="width: 900px;">
+								应收账单
+							</div>
+							<div class="g3-flex-row">
+								<div class="g3-form-row" id="div_business" style="width: 840px;">
+									<div class="g3-form-col" id="ed_b_id">
+										<label class="g3-form-label g3-label-width">账单号码:</label>
+										<input id="b_id" name="b_id" type="text" style="width: 170px" class="minput">
+										<input id="b_type" name="b_type" hidden type="text" style="width: 150px" value="应收">
+									</div>
+									<div class="g3-form-col" id="ed_b_date">
+										<label class="g3-form-label g3-label-width">账单日期:</label>
+										<input id="b_date" name="b_date" onFocus="WdatePicker({})" autocomplete="off" type="text"
+											style="width: 170px" class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_b_jsfs">
+										<label class="g3-form-label g3-label-width">结算方式:</label>
+										<input id="b_jsfs" name="b_jsfs" type="text" style="width: 170px" autocomplete="off" class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_b_zdname" style="display:none;">
+										<label class="g3-form-label g3-label-width">账单名称:</label>
+										<input id="b_zdname" name="b_zdname" type="text" style="width: 170px" autocomplete="off"
+											class="minput">
+										<span><input id="btn_editzdname" type="button" tag='3' onclick="editzdname()" value="✎"
+												style="width: 17px;height: 15px;margin:0px;padding:2px 2px !important;display:none;border: 1px solid #ccc;"><span>
+									</div>
+									<div class="g3-form-col" id="ed_v_dwname" style="width: 540px;">
+										<label class="g3-form-label g3-label-width">结算单位:</label>
+										<div class="g3-col-searchfield">
+											<input id="b_dw_id" name="b_dw_id" type="text" autocomplete="off" style="width: 170px"
+												class="minput"
+												onchange="comfieldChange('b_dw_id','v_dwname','b_othercompany','b_id','b_name');">
+										</div>
+										<input id="v_dwname" name="v_dwname" type="text" disabled="disabled" style="width: 257px;"
+											class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_b_dw_linkman_id">
+										<label class="g3-form-label g3-label-width">联系人:</label>
+										<input id="b_dw_linkman_id" name="b_dw_linkman_id" type="text" autocomplete="off"
+											style="width: 170px" class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_v_mycompanyname" style="width: 540px;">
+										<label class="g3-form-label g3-label-width">我方公司:</label>
+										<div class="g3-col-searchfield">
+											<input id="b_mycompany_id" name="b_mycompany_id" type="text" style="width: 170px" class="minput"
+												onchange="comfieldChange('b_mycompany_id','v_mycompanyname','b_othercompany','b_id','b_name');">
+										</div>
+										<input id="v_mycompanyname" name="v_mycompanyname" type="text" disabled="disabled"
+											style="width: 257px" class="minput">
+									</div>
+
+
+									<div class="g3-form-col" id="ed_b_yfgz" style="display:none;">
+										<label class="g3-form-label g3-label-width">
+											预收挂账:
+										</label>
+										<input id="b_yfgz" name="b_yfgz" type="text" style="width: 170px;" class="minput">
+									</div>
+
+									<div class="g3-form-col" id="ed_b_zdamount" style="display:none;">
+										<label class="g3-form-label g3-label-width">预收金额:</label>
+										<input id="b_zdamount" name="b_zdamount" type="text" autocomplete="off" style="width: 170px"
+											class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_b_amount" style="display:none;">
+										<label class="g3-form-label g3-label-width">
+											合计金额:
+										</label>
+										<input id="b_amount" name="b_amount" type="text" autocomplete="off" style="width: 170px"
+											class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_b_money_id" style="display:none;">
+										<label class="g3-form-label g3-label-width">
+											币种:
+										</label>
+										<input id="b_money_id" name="b_money_id" type="text" disabled="disabled" autocomplete="off"
+											style="width: 170px" class="minput">
+									</div>
+									<div class="g3-form-col" id="ed_v_sales_name">
+										<label class="g3-form-label g3-label-width">申请人:</label>
+										<input hidden id="b_sales_id" name="b_sales_id" style="width: 90px" type="text">
+										<input id="v_sales_name" name="v_sales_name" type="text" autocomplete="off" style="width: 170px"
+											class="minput" onchange="comfieldChange('v_sales_name','b_sales_id','b_user','b_name','b_id');">
+									</div>
+									<div class="g3-form-col" id="ed_b_state" style="display:none;">
+										<label class="g3-form-label g3-label-width">审核状态:</label>
+										<input id="b_state" name="b_state" readonly="readonly" type="text" style="width: 170px"
+											class="minput">
+									</div>
+
+									<div class="g3-form-col" id="ed_b_bankname" style="width: 540px;height:50px;">
+										<label class="g3-form-label g3-label-width"><span style="color:blue;"
+												onclick="selbank()">银行账号:</span></label>
+										<textarea cols="" id="b_bankname" name="b_bankname" autocomplete="off"
+											style="width: 448px;height:40px;" class="minput"></textarea>
+									</div>
+									<div class="g3-form-col" id="ed_b_bz" style="height:50px;">
+										<label class="g3-form-label g3-label-width">备注:</label>
+										<textarea cols="" id="b_bz" name="b_bz" style="height: 40px; width: 178px"
+											class="minput"></textarea>
+									</div>
+								</div>
+								<div id='div_iv'
+									style="display: none;height:100%;display: flex;flex-direction: column;overflow-x: hidden;">
+									<div id='iv_data'
+										style="flex-grow: 1; width: auto;display: flex;flex-direction: column;overflow-x: hidden;"></div>
+								</div>
+							</div>
+							<div class="g3-flex-grid">
+								<div style="height: calc(100% - 5px);">
+									<table id="feegrid" style="margin-bottom: 2px;"></table>
+								</div>
+								<div id='tb_con' style="margin-bottom: 2px;height: 24px;width: 100%; display: none;">
+									<div style="float:left;">
+										<input type="button" tag='3' id='btn_xzfy' onclick="selectysfee()" value="选择费用"
+											class="g3-grid-Btn g3-btn-blue">
+										<input type="button" id='btn_savezdsub' onclick="savezdsubdata()" value="保存"
+											class="g3-grid-Btn g3-btn-blue">
+										<input type="button" id='btn_select_all' onclick="toggleSelectAll()" value="全部选中"
+											class="g3-grid-Btn g3-btn-blue">
+										<input hidden type="button" tag='3' onclick="append()" value="新增">
+										<input hidden type="button" tag='3' onclick="insert()" value="插入">
+										<input id='btn_remove' type="button" tag='3' onclick="removeit()" value="删除"
+											class="g3-grid-Btn g3-btn-blue">
+										<input id='btn_undo_remove' type="button" tag='3' onclick="undoRemoveFee()" value="撤销删除"
+											class="g3-grid-Btn g3-btn-blue">
+										<!--<input type="button" onclick="removeit_all()" tag='3' value="全部删除" class="g3-grid-Btn g3-btn-blue"> -->
+										<input id="btn_editfee" type="hidden" onclick="editzdfee()" disabled="disabled" value="编辑费用"
+											class="g3-grid-Btn g3-btn-blue">
+										<input type="button" onclick="zdorder_row_mxfee()" value="横向费用" class="g3-grid-Btn g3-btn-blue">
+										<input type="button" value="更多功能" class="g3-grid-Btn g3-btn-blue" id="btn_more"
+											onclick="showg3menu('btn_more','mm_more','28')" />
+										<div id="mm_more" class="easyui-menu" style="width: 120px;display: none;">
+											<!-- <div onclick="locked_ys()" tag="3">
+											应收锁
+										</div>
+										<div class="menu-sep"></div>  -->
+											<div onclick="locked_cw()" tag="76">
+												财务锁
+											</div>
+											<div onclick="unlocked_cw()" tag="86">
+												财务解锁
+											</div>
+											<div class="menu-sep"></div>
+											<div onclick="check_fee_ysyf_cnt()" title="财务锁时，检查应收应付费用录入及核销情况">
+												检查费用
+											</div>
+											<div class="menu-sep"></div>
+											<div onclick="Save_Excel('feegrid')" tag="3">
+												导出EXCEL
+											</div>
+											<div class="menu-sep"></div>
+											<div onclick="savecolumn_con()" tag='9'>
+												栏位设定
+											</div>
+										</div>
+									</div>
+
+
+								</div>
+							</div>
+
+							<div id="subgridPager" class="easyui-pagination"
+								style="margin: 6px 0px;background:#efefef;border:1px solid #ccc;"></div>
+
+							<div class="g3-form-row" style="height: 30px; width: 99%; display: flex; align-items: center; gap: 20px;">
+								<div class="g3-form-col" id="ed_div_total" style="flex: 1; min-width: 200px;">
+									<label class="g3-form-label g3-label-width" style="width: auto;">账单金额:</label>
+									<span class="g3-form-label" id="div_total"></span>
+								</div>
+								<div class="g3-form-col" id="ed_total_select" style="flex: 1; min-width: 200px;">
+									<label class="g3-form-label g3-label-width" style="width: auto;">选中金额合计:</label>
+									<span class="g3-form-label" id="total_select"></span>
+								</div>
+								<div class="g3-form-col" id="ed_total_selectnotxz" style="flex: 1; min-width: 200px;">
+									<label class="g3-form-label g3-label-width" style="width: auto;">选中未销金额合计:</label>
+									<span class="g3-form-label" id="total_selectnotxz"></span>
+								</div>
+								<div class="g3-form-col" id="ed_total_delete" style="flex: 1; min-width: 200px;">
+									<label class="g3-form-label g3-label-width" style="width: auto; color: #d9534f;">删除金额合计:</label>
+									<span class="g3-form-label" id="total_delete" style="color: #d9534f;"></span>
+								</div>
+							</div>
+						</div>
+				</form>
+				<div id="CategoryFrm"></div>
+
+				<script type="text/javascript">
+					var tabtitle = '应收账单';
+					var notabtitle = '发票号码';
+					var datetabtitle = '开票日期';
+					var amounttabtitle = '开票金额';
+					var datatabtitle = '数据选取';
+					var ysfptabtitle = '应收发票';
+					var ssdtabtitle = '实收单';
+
+					var strid = "<%=id%>";
+					//alert(strid);
+					var conshqx = '1';
+					var oldformjson;
+					var newformjson;
+					var caniv = '0';
+					var total_select = Number(0);
+					var total_selectnotxz = Number(0);
+					var userid = "<%=userid%>";
+
+					var username = getfieldvaluebyid('b_user', 'b_name', 'b_id', userid);
+					var subviewtable = 'v_cwzd_orderfee_s';
+
+					var subdata_zdfees = new Array();
+					var mainData = {};
+
+					/**
+					 * 子表草稿态 + 分页管理模块
+					 * 使用独立模块 draft-page-manager.js 管理
+					 * 
+					 * 职责：
+					 * - 草稿池：insertRows / updateRows / deleteRows（保存提交用）
+					 * - 行展示态：行对象上的 _rowState（insert | update | delete | ''）
+					 * - 分页：remoteTotal（服务端）+ insertRows 混排
+					 * - UI 勾选：selectedRows 唯一真相源（跨页）
+					 */
+					var draftManager = window.DraftPageManager.createDraftManager({
+						keyField: 'subid',
+						pageSize: 50
+					});
+
+					/**
+					 * 修剪当前页选中状态（配合 clearChecked 使用）
+					 */
+					function pruneSelectedRowsForCurrentPage() {
+						var rows = $('#feegrid').datagrid('getRows');
+						draftManager.removeSelectionForRows(rows);
+					}
+
+					let subSummary = {
+						// 分币种
+						moneyTypes: [],
+						// 折合总金额
+						totalAmount: 0
+					};
+
+					$(function () {
+						SetEnterFocus();
+
+						fywid = "<%=ywid%>";
+						var jpowerqx = getUserPowerQX('cwzd_zdorder_s', userid);
+						for (key in jpowerqx) {
+							if (jpowerqx[key] != '1') {
+								$("a[tag='" + key + "']").linkbutton('disable');
+								$("button[tag='" + key + "']").attr("disabled", true);
+								$("input[tag='" + key + "']").attr("disabled", true);
+							}
+						}
+						if (jpowerqx['76'] != '1') {
+							var itemEls = $("div[tag='76']");
+							for (i = 0; i < itemEls.length; i++) {
+								$("#mm_more").menu('disableItem', itemEls[i]);
+							}
+						}
+						if (jpowerqx['86'] != '1') {
+							var itemEls = $("div[tag='86']");
+							for (i = 0; i < itemEls.length; i++) {
+								$("#mm_more").menu('disableItem', itemEls[i]);
+							}
+						}
+
+						$('#zdskform').form({
+							onLoadSuccess: function (data) {
+								//    if (['审核通过','归档','送审'].indexOf(data.b_state)>-1){  // == 2024-08-26 思锐:送审可修改
+								if (['审核通过', '归档'].indexOf(data.b_state) > -1) {
+									$("a[tag='3']").linkbutton('disable');
+									$("button[tag='3']").attr("disabled", true);
+									$("input[tag='3']").attr("disabled", true);
+									if (data.b_state == '审核通过') {
+										if (jpowerqx['21'] == '1') {
+											$("input[tag='21']").attr("disabled", false);
+										}
+										if (jpowerqx['22'] == '1') {
+											$("input[tag='22']").attr("disabled", false);
+										}
+									} else {
+										$("input[tag='21']").attr("disabled", true);
+										$("input[tag='22']").attr("disabled", true);
+									}
+
+									$("#b_yfgz").attr("disabled", true);
+									if (data.b_yfgz == '是') {
+										$("#btn_selectfee").attr("disabled", false);
+										$("#btn_editfee").attr("disabled", false);
+										$("#btn_removeit").attr("disabled", false);
+										$("#btn_savezdsub").show();
+									}
+								} else {
+									//== 发票登记，收款登记，审核通过之后，才能操作
+									$("input[tag='21']").attr("disabled", true);
+									$("input[tag='22']").attr("disabled", true);
+								}
+								if (data.b_yfgz == '是') {
+									$("#b_zdamount").attr("disabled", false);
+									$("#b_money_id").attr("disabled", false);
+									setAutoComplete('#b_money_id', 'b_money', 'b_name', 'b_id', '');
+								} else {
+									$("#b_zdamount").attr("disabled", true);
+									$("#b_money_id").attr("disabled", true);
+									$("#btn_savezdsub").hide();
+								}
+								if (data.b_state == '草拟') {			//=== 草拟状态，账单申请人可以编辑费用
+									$("#btn_editfee").attr("disabled", false);
+								}
+								if (data.b_state == '审核驳回') {
+									if (jpowerqx['7'] == '1') {	//=== 驳回状态，有审核权限的人才可以可以编辑费用
+										$("#btn_editfee").attr("disabled", false);
+									}
+								}
+							}
+						})
+						setcolbyfeegrid(subviewtable);
+						//	configColumn('feegrid',subviewtable,'local');
+						if (strid != "") {
+							loaddata(strid);
+							// loaddata_detail('feegrid', subviewtable, strid, '');
+							loaddata_sub()
+							calcw_fee();
+						} else {
+							console.log("走到了这里");
+
+							loaddefaultvalue('zdskform', 'v_cwzd_zdorder_s', userid);
+							//	$('#v_ownername').val(getfieldvaluebyid('b_user', 'b_name', 'b_id', userid));          
+							$('#b_id').val(getAutoID('cwzd_zdorder_s', 'g3soft'));
+							$('#b_yw_id').val(fywid);
+							$('#v_ownername').val(getfieldvaluebyid('b_user', 'b_name', 'b_id', userid));
+							$('#b_owner_id').val(userid);
+							$('#b_state').val('草拟');
+							$('#b_date').val(getnowdate());
+							$("#btn_savezdsub").hide();
+							getselrows();
+						}
+
+						$(":input[readonly='readonly']:not(#b_id):not(#b_state)").attr("disabled", "disabled");
+						var formobj = app.serializeObject2($('#zdskform'));
+						oldformjson = app.jsonToString(formobj);
+						var gridrows = $("#feegrid").datagrid("getRows");
+						// var gridrows = $("#feegrid").datagrid("getData").firstRows;
+						feegridjson = app.jsonToString(gridrows);
+
+						//     var custid=$("#b_dw_id").val();
+						///alert(custid);
+						//    setAutoCompleteEx('#b_dw_linkman_id','v_b_contact','b_name_en','b_id'," b_customer_id='"+custid+"'",'');
+
+					});
+
+					/////////////////////////////////////////////////////
+					var editIndex_con = undefined;
+					function endEditing_con() {
+						if (editIndex_con == undefined) {
+							return true
+						}
+						if ($('#feegrid').datagrid('validateRow', editIndex_con)) {
+							$('#feegrid').datagrid('endEdit', editIndex_con);
+							editIndex_con = undefined;
+							return true;
+						} else {
+							return false;
+						}
+					}
+
+					function setcolbyfeegrid(subviewtable) {
+						var columnfield = getcolumn(subviewtable);
+						var i;
+						for (i in columnfield) {
+							var colfield = columnfield[i].field;
+
+							if (['father'].indexOf(colfield) > -1) {
+								columnfield[i].formatter = function (value, row, index) {
+									return $('<a></a>', {
+										href: 'javascript:void(0)',
+										onclick: "openData('" + value + "','" + row.mx_hstype_id + "')"
+									}).text(value).get(0).outerHTML;
+								}
+							}
+
+							if (['mx_sh', 'mx_checkkp', 'b_lockedcon', 'b_out_locked', 'b_in_locked'].indexOf(colfield) > -1) {
+								columnfield[i].editor = { type: 'checkbox', options: { on: '1', off: '0' } };
+								columnfield[i].formatter = function (value, row, index) {
+									return $("<input>", {
+										type: "checkbox",
+										//命名name会导致主表formobj打包时带上打钩信息
+										//name:"DataGridCheckBox",
+										checked: value == '1' ? "checked" : false,
+										disabled: true,
+										rowIndex: index
+									}).get(0).outerHTML;
+								}
+								columnfield[i].align = 'center';
+							}
+
+							if (colfield == 'mx_invoiceno') {
+								columnfield[i].formatter = function (value, row, index) {
+									var invoiceid = row.mx_invoiceid
+									return $('<a></a>', {
+										href: 'javascript:void(0)',
+										onclick: "parent.addTab('tabId_editinvoices" + invoiceid + "','应收发票" + value + "','<%=basePath%>jcwzd/editinvoice_s.jsp?id=" + invoiceid + "')"
+									}).text(value).get(0).outerHTML;
+								}
+							}
+
+							if (['alreadyamount'].indexOf(colfield) > -1) {
+								columnfield[i].formatter = function (value, row, index) {
+									var strhref = value;
+									if (value != 0 && value != '') {
+										strhref = $('<a></a>', {
+											href: 'javascript:void(0)',
+											onclick: "showxzmod('" + row.mx_type_id + "','" + row.subid + "')"
+										}).text(value).get(0).outerHTML;
+									}
+									return strhref;
+								}
+							}
+						}
+
+						columnfield.unshift({
+							checkbox: true,
+							field: 'bcheck'
+						});
+
+						$('#feegrid').datagrid({
+							idField: 'subid',
+							fit: true,
+							remoteSort: false,
+							multiSort: true,
+							//multiSort :true,
+							singleSelect: true,
+							//ctrlSelect:true,
+							selectOnCheck: false,
+							checkOnSelect: false,
+							rownumbers: true,
+							//	    onDblClickRow:function(rowIndex, rowData){openDatayw(rowData);},		
+							//onClickRow : onClickRow_con,
+							//	onBeginEdit:onBeginEdit_con,
+							toolbar: '#tb_con',
+							columns: [columnfield],
+							// pagination : false, 
+							pageSize: 50,
+							autoRowHeight: false,
+							//pageList:[50,100,200,500], 	
+							LoadSelkeyID: undefined,
+							rowStyler: function (index, row) {
+								if (row._rowState === 'insert') {
+									return 'background-color: #f6ffed;';
+								} else if (row._rowState === 'update') {
+									return 'background-color: #fffbe6;';
+								} else if (row._rowState === 'delete') {
+									return 'background-color: #fff1f0;';
+								}
+								return '';
+							},
+							onLoadSuccess: function (data) {
+								$.messager.progress('close');
+								if ($('#feegrid').datagrid('options').LoadSelkeyID != undefined) {
+									var rows = $('#feegrid').datagrid("getRows");
+									if (rows.length > 0) {
+										$('#b_dw_id').val(rows[0].mx_dw_id);
+										$('#v_dwname').val(rows[0].v_mx_dw_name);
+										if (rows[0].b_mycompany_id != undefined && rows[0].b_mycompany_id != '') {
+											$('#b_mycompany_id').val(rows[0].b_mycompany_id);
+										}
+										if (rows[0].v_mycompanyname != undefined && rows[0].v_mycompanyname != '') {
+											$('#v_mycompanyname').val(rows[0].v_mycompanyname);
+										}
+									}
+									$('#feegrid').datagrid('options').LoadSelkeyID = undefined;
+								}
+								$('.datagrid-body tr').each(function () {
+									var rowIndex = $(this).attr('datagrid-row-index');
+									if (rowIndex !== undefined) {
+										var row = $('#feegrid').datagrid('getRows')[parseInt(rowIndex)];
+										if (row && row._rowState === 'delete') {
+											$(this).addClass('datagrid-row-delete');
+										} else {
+											$(this).removeClass('datagrid-row-delete');
+										}
+									}
+								});
+								syncFeeGridChecksFromSubState();
+								calcw_selfee();
+							},
+							onAfterEdit: function (rowIndex, row, changes) {
+								if (Object.keys(changes).length === 0) {
+									return;
+								}
+								if (draftManager.isInsertRow(row) || draftManager.isInInsertRows(row)) {
+									if (!row._rowState) {
+										row._rowState = 'insert';
+									}
+								} else if (!draftManager.isDeleteRow(row)) {
+									row._rowState = 'update';
+									draftManager.addToUpdateRows(row);
+								}
+								calcw_fee();
+							},
+							onCheckAll: function () {
+								draftManager.setAllChecked(true);
+								draftManager.clearExcludedRows();
+								calcw_selfee()
+							},
+							onUncheckAll: function () {
+								draftManager.setAllChecked(false);
+								draftManager.clearExcludedRows();
+								draftManager.clearSelectedRows();
+								calcw_selfee()
+							},
+							onCheck: function (index, row) {
+								if (draftManager.isAllChecked()) {
+									draftManager.removeExcludedRow(row);
+								} else {
+									draftManager.addSelectedRow(row);
+								}
+								calcw_selfee()
+							},
+							onUncheck: function (index, row) {
+								if (draftManager.isAllChecked()) {
+									draftManager.addExcludedRow(row);
+								} else {
+									draftManager.removeSelectedRow(row);
+								}
+								calcw_selfee()
+							}
+						}).datagrid("columnMoving");
+
+						$('#feegrid').datagrid('getPanel').find('.datagrid-body').on('scroll.datagrid', function (e) {
+							if (editIndex_con != undefined) {
+								$('#feegrid').datagrid('endEdit', editIndex_con);
+								editIndex_con = undefined;
+							}
+						})
+
+						$('#subgridPager').pagination({
+							total: draftManager.getPagination().total,
+							pageSize: draftManager.getPagination().pageSize,
+							pageNumber: draftManager.getPagination().pageNumber,
+
+							pageList: [50, 100, 200],
+
+							onSelectPage: function (pageNumber, pageSize) {
+								draftManager.setPageNumber(pageNumber);
+								draftManager.setPageSize(pageSize);
+
+								loaddata_sub();
+							},
+							onChangePageSize: function (pageSize) {
+								draftManager.setPageNumber(1);
+								draftManager.setPageSize(pageSize);
+
+								if (!draftManager.isAllChecked()) {
+									$('#feegrid').datagrid('clearChecked');
+									draftManager.clearSelectedRows();
+								}
+
+								calcw_selfee()
+
+								loaddata_sub();
+							}
+						});
+
+						//		configColumn('feegrid',subviewtable,'local');
+					}
+
+					function openData(id, hstype) {
+						var e = window.event || e;
+						if (e.stopPropagation) {
+							e.stopPropagation();
+						}
+						var data = loaddatas('s_module', "b_id='" + hstype + "'", 'b_id', '');
+						if (data.length > 0) {
+							if (data[0].b_editfile != '') {
+								parent.addTab('tabId_edit' + hstype + id, data[0].b_ChineseName + id, '<%=basePath%>' + data[0].b_editfile + '?id=' + id);
+							}
+						}
+					}
+
+					// ========== 子表：分页请求、与 insertRows 合并、行态恢复、刷新 ==========
+
+					// 拉取当前页：纯 insert 尾段走本地切片；否则 Ajax 后 merge 尾段 insert
+					function loaddata_sub() {
+						$('#feegrid').datagrid('loading');
+						$('#subgridPager').css({
+							'pointer-events': 'none',
+							'opacity': '0.6'
+						});
+						$('#subgridPager').pagination('loading');
+
+						var pagination = draftManager.getPagination();
+						var pageNumber = pagination.pageNumber;
+						var pageSize = pagination.pageSize;
+						var remoteTotal = pagination.remoteTotal;
+						var insertRows = draftManager.getInsertRows();
+
+						if (!strid) {
+							var pageData = [];
+							if (insertRows.length > 0) {
+								var startInInsert = (pageNumber - 1) * pageSize;
+								var endInInsert = startInInsert + pageSize;
+								pageData = insertRows.slice(startInInsert, endInInsert);
+							}
+
+							$('#feegrid').datagrid('loadData', pageData);
+
+							$('#subgridPager').pagination('refresh', {
+								total: insertRows.length,
+								pageNumber: pageNumber,
+								pageSize: pageSize
+							});
+
+							$('#feegrid').datagrid('loaded');
+							$('#subgridPager').css({
+								'pointer-events': '',
+								'opacity': ''
+							});
+							$('#subgridPager').pagination('loaded');
+
+							return;
+						}
+
+						if (remoteTotal > 0 && draftManager.isInsertOnlyPage(pageNumber)) {
+							var startInInsert = (pageNumber - 1) * pageSize - remoteTotal;
+							var endInInsert = startInInsert + pageSize;
+							var pageData = insertRows.slice(startInInsert, endInInsert);
+
+							$('#feegrid').datagrid('loadData', pageData);
+
+							$('#subgridPager').pagination('refresh', {
+								total: draftManager.getActualTotal(),
+								pageNumber: pageNumber,
+								pageSize: pageSize
+							});
+
+							$('#feegrid').datagrid('loaded');
+							$('#subgridPager').css({
+								'pointer-events': '',
+								'opacity': ''
+							});
+							$('#subgridPager').pagination('loaded');
+
+							return;
+						}
+
+						var searchcondition = "mx_zdorderid='" + strid + "'";
+						var searchparam = {
+							viewname: subviewtable,
+							searchcondition: searchcondition,
+							userid: '',
+							orderfield: 'father ASC, mx_xh ASC, b_id ASC',
+							keyfield: 'subid',
+							page: pagination.pageNumber,
+							rows: pagination.pageSize
+						};
+
+						$.ajax({
+							type: 'post',
+							url: 'jsp/searchdatapagenew.jsp',
+							cache: false,
+							data: searchparam,
+							dataType: 'json',
+							success: function (result) {
+								draftManager.setRemoteTotal(result.total);
+								draftManager.setCurrentRemoteRows(result.rows);
+
+								draftManager.restoreRowStates(result.rows);
+
+								var pageData = draftManager.buildPageData(result.rows, pageNumber);
+
+								$('#feegrid').datagrid('loadData', pageData);
+
+								var newPagination = draftManager.getPagination();
+								$('#subgridPager').pagination('refresh', {
+									total: newPagination.total,
+									pageNumber: newPagination.pageNumber,
+									pageSize: newPagination.pageSize
+								});
+							},
+							error: function () {
+								console.log('分页加载失败');
+							},
+							complete: function () {
+								$('#feegrid').datagrid('loaded');
+								$('#subgridPager').css({
+									'pointer-events': '',
+									'opacity': ''
+								});
+								$('#subgridPager').pagination('loaded');
+							}
+						});
+					}
+
+					// buildCurrentPageData 和 restoreRowStates 已移至 draft-page-manager.js 模块中
+
+					// 新增费用等后：若页码越界则纠页，否则重载
+					function refreshCurrentPage() {
+						var currentPage = draftManager.getPagination().pageNumber;
+						var totalPages = draftManager.getTotalPages();
+
+						if (currentPage > totalPages) {
+							draftManager.setPageNumber(totalPages);
+							$('#subgridPager').pagination('select', totalPages);
+						} else {
+							loaddata_sub();
+						}
+					}
+
+					// 仅重绘当前内存行（保存行软删后），会 clearChecked，并同步修剪 selectedRows
+					function refreshCurrentPageDisplay() {
+						var currentRows = $('#feegrid').datagrid('getRows');
+						$('#feegrid').datagrid('loadData', currentRows);
+						$('#feegrid').datagrid('clearChecked');
+						pruneSelectedRowsForCurrentPage();
+						calcw_selfee();
+					}
+
+					// 撤销删除后：重绘并恢复勾选与业务侧选中金额
+					function refreshCurrentPageAfterUndo() {
+						var currentRows = $('#feegrid').datagrid('getRows');
+						$('#feegrid').datagrid('loadData', currentRows);
+						syncFeeGridChecksFromSubState();
+						calcw_selfee();
+					}
+
+					// 物理删除 insert 行等后：按展示条数纠正页码并重载
+					function refreshCurrentPageAfterDelete() {
+						var pagination = draftManager.getPagination();
+						var currentPage = pagination.pageNumber;
+						var pageSize = pagination.pageSize;
+						var displayTotal = draftManager.getDisplayTotal();
+						var totalPages = Math.ceil(displayTotal / pageSize);
+
+						if (currentPage > totalPages && totalPages > 0) {
+							draftManager.setPageNumber(totalPages);
+							$('#subgridPager').pagination('select', totalPages);
+						} else if (displayTotal === 0) {
+							$('#feegrid').datagrid('loadData', []);
+							$('#subgridPager').pagination('refresh', {
+								total: 0,
+								pageNumber: 1,
+								pageSize: pageSize
+							});
+						} else {
+							loaddata_sub();
+						}
+
+						$('#feegrid').datagrid('clearChecked');
+						pruneSelectedRowsForCurrentPage();
+						calcw_selfee();
+					}
+
+					// 根据 selectedRows 主键集合，打勾/取消当前可见行（跨页真相源）
+					function syncFeeGridChecksFromSubState() {
+						var rows = $('#feegrid').datagrid('getRows');
+						var selKeys = {};
+						var selectedRows = draftManager.getSelectedRows();
+						for (var s = 0; s < selectedRows.length; s++) {
+							selKeys[draftManager.getRowKey(selectedRows[s])] = true;
+						}
+						var excludedKeys = {};
+						var excludedRows = draftManager.getExcludedRows();
+						for (var e = 0; e < excludedRows.length; e++) {
+							excludedKeys[draftManager.getRowKey(excludedRows[e])] = true;
+						}
+						for (var i = 0; i < rows.length; i++) {
+							var row = rows[i];
+							var key = draftManager.getRowKey(row);
+							if (draftManager.isAllChecked()) {
+								if (excludedKeys[key]) {
+									$('#feegrid').datagrid('uncheckRow', i);
+								} else {
+									$('#feegrid').datagrid('checkRow', i);
+								}
+							} else {
+								if (selKeys[key]) {
+									$('#feegrid').datagrid('checkRow', i);
+								} else {
+									$('#feegrid').datagrid('uncheckRow', i);
+								}
+							}
+						}
+					}
+
+					function toggleSelectAll() {
+						if (draftManager.isAllChecked()) {
+							draftManager.setAllChecked(false);
+							draftManager.clearExcludedRows();
+							draftManager.clearSelectedRows();
+							$('#feegrid').datagrid('clearChecked');
+							$('#btn_select_all').val('全部选中');
+						} else {
+							draftManager.setAllChecked(true);
+							draftManager.clearExcludedRows();
+							var rows = $('#feegrid').datagrid('getRows');
+							for (var i = 0; i < rows.length; i++) {
+								$('#feegrid').datagrid('checkRow', i);
+							}
+							$('#btn_select_all').val('全部反选');
+						}
+					}
+
+					//////////-------feegrid-----------
+					// 单行对「按币别汇总」的贡献，与 calcw_fee SQL 中 CASE 应收/应付 一致
+					function applyFeeRowToMoneyTypeGroups(groupMap, row, sign) {
+						var mt = row.mx_moneytype_id;
+						if (mt === undefined || mt === null || mt === '') {
+							return;
+						}
+						var rootNet = 0;
+						if (row.mx_type_id == '应收') {
+							rootNet = Number(row.mx_amount_root || 0);
+						} else if (row.mx_type_id == '应付') {
+							rootNet = -Number(row.mx_amount_root || 0);
+						}
+						var amt = Number(row.mx_amount || 0);
+						if (!groupMap[mt]) {
+							groupMap[mt] = { mx_moneytype_id: mt, mx_amount_root: 0, mx_amount: 0 };
+						}
+						groupMap[mt].mx_amount_root += sign * rootNet;
+						groupMap[mt].mx_amount += sign * amt;
+					}
+
+					function calcw_fee() {
+						if (!strid) {
+							$("#div_total").text('0.00');
+							$('#b_amount').val('0.00');
+							subSummary.moneyTypes = [];
+							subSummary.totalAmount = 0;
+							return;
+						}
+
+						var data = mainData;
+
+						// 提取币种金额（v_amount_ 开头的字段）放入 groupMap
+						var groupMap = {};
+						for (var key in data) {
+							if (key.startsWith('v_amount_')) {
+								var currency = key.replace('v_amount_', '').toUpperCase();
+								var amount = Number(data[key] || 0);
+								groupMap[currency] = {
+									mx_moneytype_id: currency,
+									mx_amount_root: amount,
+									mx_amount: amount
+								};
+							}
+						}
+
+						// 草稿：已保存行标记删除 → 仍计入 DB 汇总，需扣回；本地新增 insertRows → 尚未进 DB，需加上
+						var dIdx;
+						var deleteRows = draftManager.getDeleteRows();
+						var insertRows = draftManager.getInsertRows();
+						for (dIdx = 0; dIdx < deleteRows.length; dIdx++) {
+							applyFeeRowToMoneyTypeGroups(groupMap, deleteRows[dIdx], -1);
+						}
+						for (dIdx = 0; dIdx < insertRows.length; dIdx++) {
+							var insRow = insertRows[dIdx];
+							if (insRow._rowState === 'delete') {
+								continue;
+							}
+							applyFeeRowToMoneyTypeGroups(groupMap, insRow, 1);
+						}
+
+						// 构建合并后的 moneyTypes
+						var mergedDatas = [];
+						var mk;
+						for (mk in groupMap) {
+							var g = groupMap[mk];
+							g.mx_amount_root = Math.round(g.mx_amount_root * 1000) / 1000;
+							g.mx_amount = Math.round(g.mx_amount * 100) / 100;
+							mergedDatas.push(g);
+						}
+						mergedDatas.sort(function (a, b) {
+							return String(a.mx_moneytype_id).localeCompare(String(b.mx_moneytype_id));
+						});
+
+						// 计算总金额
+						var totalamount = 0;
+						for (var mi = 0; mi < mergedDatas.length; mi++) {
+							totalamount += Number(mergedDatas[mi].mx_amount || 0);
+						}
+						totalamount = Math.round(totalamount * 100) / 100;
+
+						// 更新 subSummary
+						subSummary.moneyTypes = mergedDatas.filter(function (r) {
+							return r.mx_amount_root !== 0 || r.mx_amount !== 0;
+						});
+						subSummary.totalAmount = totalamount;
+
+						// 构建显示文本
+						var txtArr = [];
+						for (var mi = 0; mi < mergedDatas.length; mi++) {
+							var row = mergedDatas[mi];
+							if (row.mx_amount_root === 0 && row.mx_amount === 0) {
+								continue;
+							}
+							txtArr.push(row.mx_moneytype_id + " " + row.mx_amount_root);
+						}
+						var totaltxt = txtArr.join(";");
+
+						if (totalamount !== 0) {
+							totaltxt += " 折合金额:" + totalamount;
+						}
+
+						$("#div_total").text(totaltxt);
+						$("#b_amount").val(totalamount);
+
+						calcDeleteFee();
+					}
+
+					function calcDeleteFee() {
+						var deleteRows = draftManager.getDeleteRows();
+						var deleteGroupMap = {};
+
+						for (var i = 0; i < deleteRows.length; i++) {
+							var row = deleteRows[i];
+							var mt = row.mx_moneytype_id;
+							if (mt === undefined || mt === null || mt === '') {
+								continue;
+							}
+							var rootNet = 0;
+							if (row.mx_type_id == '应收') {
+								rootNet = Number(row.mx_amount_root || 0);
+							} else if (row.mx_type_id == '应付') {
+								rootNet = -Number(row.mx_amount_root || 0);
+							}
+							var amt = Number(row.mx_amount || 0);
+							if (!deleteGroupMap[mt]) {
+								deleteGroupMap[mt] = { mx_moneytype_id: mt, mx_amount_root: 0, mx_amount: 0 };
+							}
+							deleteGroupMap[mt].mx_amount_root += rootNet;
+							deleteGroupMap[mt].mx_amount += amt;
+						}
+
+						var deleteTxtArr = [];
+						var deleteTotal = 0;
+						for (var mk in deleteGroupMap) {
+							var g = deleteGroupMap[mk];
+							g.mx_amount_root = Math.round(g.mx_amount_root * 1000) / 1000;
+							g.mx_amount = Math.round(g.mx_amount * 100) / 100;
+							deleteTxtArr.push(g.mx_moneytype_id + " " + g.mx_amount_root);
+							deleteTotal += g.mx_amount;
+						}
+
+						deleteTotal = Math.round(deleteTotal * 100) / 100;
+						var deleteTxt = deleteTxtArr.join(";");
+						if (deleteTotal !== 0) {
+							deleteTxt += " 折合金额:" + deleteTotal;
+						}
+
+						$("#total_delete").text(deleteTxt || '');
+					}
+
+					// 计算选中行的金额（仅业务有效行）
+					function calcw_selfee() {
+						var rows = draftManager.getValidSelectedRows();
+
+						var irow = rows.length;
+
+						var moneyArray = [];
+						var canadd;
+
+						for (var i = 0; i < irow; i++) {
+							//console.log(rows[i]);
+							var moneytype = rows[i].mx_moneytype_id;
+							var skamount = 0;
+							var fkamount = 0;
+							var alreadyamount = 0;
+							var notamount = 0;
+							if (rows[i].mx_type_id == '应收') {
+								skamount = rows[i].mx_amount_root;
+								alreadyamount = Number(rows[i].mx_amount_root);
+								notamount = Number(rows[i].notamount);
+							}
+							if (rows[i].mx_type_id == '应付') {
+								fkamount = rows[i].mx_amount_root;
+								alreadyamount = 0 - Number(rows[i].mx_amount_root);
+								notamount = 0 - Number(rows[i].notamount);
+							}
+							var amount = Number(skamount) - Number(fkamount);
+
+							//if(rows[i].mx_type_id=='应收'){
+							//  alreadyamount=Number(alreadyamount);
+							//}
+							canadd = true;
+							for (var k in moneyArray) {
+								if (moneyArray[k].moneyid == moneytype) {
+									moneyArray[k].totalamount = moneyArray[k].totalamount + amount;
+									moneyArray[k].totalalreadyamount = moneyArray[k].totalalreadyamount + alreadyamount;
+									moneyArray[k].totalnotamount = moneyArray[k].totalnotamount + notamount;
+									canadd = false;
+								}
+							}
+							if (canadd) {
+								moneyArray.push({ moneyid: moneytype, totalamount: amount, totalalreadyamount: alreadyamount, totalnotamount: notamount });
+							}
+						}
+						var totaltxt = "";
+						var total_select = "";
+						var total_selectnotxz = "";
+						for (var j = 0; j < moneyArray.length; j++) {
+							//totaltxt=totaltxt+moneyArray[j].moneyid+':'+Math.round((moneyArray[j].totalamount)*100)/100+';';
+							total_select = total_select + moneyArray[j].moneyid + ':' + Math.round((moneyArray[j].totalalreadyamount) * 100) / 100 + ';';
+							total_selectnotxz = total_selectnotxz + moneyArray[j].moneyid + ':' + Math.round((moneyArray[j].totalnotamount) * 100) / 100 + ';';
+						}
+						//alert(total_select);
+						//alert(total_selectnotxz);
+						//$("#div_total").text(totaltxt);
+						$("#total_select").text(total_select);
+						$("#total_selectnotxz").text(total_selectnotxz);
+					}
+
+					function savecolumn_con() {
+						saveColumn('feegrid', subviewtable);
+					}
+					////////////////////////////////////////////////////////////  	
+
+					function onclickiv(value) {
+						caniv == '0'
+					}
+					function loadivdata(strid) {
+
+						var searchcondition = " b_zdorder_id='" + strid + "'";
+						var tmpdatas = loaddatas('v_cw_invoice_s', searchcondition, 'b_id', '');
+
+						if (tmpdatas.length > 0) {
+							//  	$("#div_iv").show(); 
+						} else {
+							return;
+						}
+						var strdiv = "";
+						for (var k in tmpdatas) {
+							strdiv = strdiv + "<div class='g3-form-col' style='width: 400px;height: 25px;'>"
+								+ "<label class='g3-data-label'>" + tmpdatas[k].b_invoiceno + "</label>"
+								+ "<label class='g3-data-label' style='width:93px;'>" + tmpdatas[k].b_invoice_date + "</label>"
+								+ "<label class='g3-data-label' style='width:93px;'>" + tmpdatas[k].b_amount + "</label>"
+								+ "<label class='g3-data-label' style='color: blue;cursor: pointer;' onclick='openivid(" + "\"" + tmpdatas[k].b_id + "\"" + ")'>" + tmpdatas[k].b_id + "</label>"
+								+ "</div>"
+
+						}
+						if (strdiv != "") {
+							strdiv = "<div class='g3-form-col' style='width: 400px;height: 25px;'>"
+								+ "<label class='g3-data-label'>" + notabtitle + "</label>"
+								+ "<label class='g3-data-label' style='width:93px;'>" + datetabtitle + "</label>"
+								+ "<label class='g3-data-label' style='width:93px;'>" + amounttabtitle + "</label>"
+								+ "<label class='g3-data-label'>ID</label>"
+								+ "</div>"
+								+ strdiv;
+						}
+						$div = $(strdiv);
+						$("#iv_data").html($div);
+					}
+					function openivid(ivid) {
+						parent.addTab('tabId_editinvoices' + ivid, tabtitle + ivid, '<%=basePath%>jcwzd/editinvoice_s.jsp?id=' + ivid);
+					}
+					//////////////////////////////////////////////////////////// 
+					function loaddata(strid) {
+						var strid = strid;
+						var strtemp;
+						var searchcondition = "b_id='" + strid + "'";
+						$.ajax({
+							type: 'post',
+							url: 'jsp/loaddata.jsp',
+							cache: false,
+							async: false,
+							data: {
+								soption: 'main',
+								searchcondition: searchcondition,
+								viewname: 'v_cwzd_zdorder_s',
+								orderfield: 'b_id'
+							},
+							dataType: 'json', // 服务器返回时接收的数据类型
+							success: function (result) {
+								$('#zdskform').form('load', result);
+								$('#b_id').attr('readonly', 'readonly');
+								mainData = result;
+							},
+							error: function (result) {
+							}
+						});
+						//	loadivdata(strid);
+						//	loaddata_detail('feegrid',subviewtable,strid,'');  	  
+					}
+
+					function loaddata_subdata_zdfees() {
+						if (subdata_zdfees.length == 0) {
+
+							return;
+						}
+						var searchcondition = " subid in(" + subdata_zdfees.join(',') + ")"
+						var searchparam = {
+							viewname: "v_cwzd_orderfee_s",
+							searchcondition: searchcondition,
+							userid: userid,
+							orderfield: "b_id"
+						};
+						$.messager.progress({ title: '加载中', msg: '正在加载...' });
+						//	$('#viewgrid').datagrid('options').url='jsp/searchdatapageindex.jsp';
+						$('#feegrid').datagrid('options').url = 'jsp/searchdatapage.jsp';
+						$('#feegrid').datagrid('load', searchparam);
+					}
+
+					function loaddata_detail(gridname, viewname, strid, options) {
+						/*var searchcondition = "mx_zdorderid ='"+strid+"'"   	
+						var searchparam = {  
+							viewname : "v_cwzd_orderfee_s",
+							searchcondition : searchcondition,
+							userid : userid,
+							orderfield: "b_id"
+						};
+						$.messager.progress({title:'加载中',msg:'正在加载...'});
+					//	$('#'+gridname).datagrid('loading');
+						
+					//	$('#viewgrid').datagrid('options').url='jsp/searchdatapageindex.jsp';
+						$('#feegrid').datagrid('options').url='jsp/searchdatapage.jsp';
+						$('#feegrid').datagrid('load', searchparam);*/
+						var strid = strid;
+						var strtemp;
+						var searchcondition = "mx_zdorderid='" + strid + "'";
+
+						$.ajax({
+							type: 'post',
+							url: 'jsp/loaddata.jsp',
+							cache: false,
+							async: false,
+							data: {
+								soption: options,
+								searchcondition: searchcondition,
+								viewname: viewname,
+								orderfield: 'father'
+							},
+							dataType: 'json', // 服务器返回时接收的数据类型
+							success: function (result) {
+								$('#' + gridname).datagrid('loadData', result);
+								subdata_zdfees = result.map(function (row) {
+									return row.subid;
+								});
+								console.log('subdata_zdfees');
+								console.log(subdata_zdfees);
+							},
+							error: function (result) {
+							}
+						});
+
+
+						//	loadivdata(strid);
+					}
+					function selectreport() {
+						if (checkchange()) {
+							alert('请先保存,再打印报表!');
+							return;
+						}
+
+						var sid = $('#b_id').val();
+
+						var cateid = '应收账单';
+						var valuesql = new Array();
+						valuesql.push("select * from v_cwzd_zdorder_s where b_id='" + sid + "'");
+						valuesql.push("select * from " + subviewtable + " where mx_zdorderid='" + sid + "'" + "  order by b_id");
+						valuesql.push("exec G3_cwzd_row_mxfee'" + sid + "'");
+
+						var valuesql1 = valuesql.join("|");
+
+						var cust = $('#v_dwname').val();
+						var djid = sid;
+						if (cust != '') {
+							djid = sid + cust;
+						}
+
+
+						var url = "jsys/jreportselect.jsp?cateid=" + encodeURI(cateid) + "&valuesql=" + encodeURI(valuesql1) + "&djid=" + encodeURI(djid);
+						var datadialog = $('<div/>').dialog({
+							title: '打印报表',
+							width: 450,
+							height: 350,
+							content: '<iframe id="" src="' + url + '" allowTransparency="true" scrolling="auto" width="100%" height="99.2%" frameBorder="0" name=""></iframe>',
+							modal: true
+						});
+					}
+					function RejectData() {
+						var strid = $('#b_id').val();
+						loaddata(strid);
+						endEditing_con();
+
+						draftManager.reset();
+
+						loaddata_sub();
+
+						calcw_fee();
+						var formobj = app.serializeObject2($('#zdskform'));
+						delete formobj["bcheck"];
+						oldformjson = app.jsonToString(formobj);
+
+						var gridrows = $("#feegrid").datagrid("getRows");
+						feegridjson = app.jsonToString(gridrows);
+					}
+
+					function saveData() {
+						var flag = '';
+
+						if (document.getElementById("b_id").readOnly) {
+							flag = 'mod'
+						} else {
+							flag = 'new';
+							var sid = getAutoID('cwzd_zdorder_s', 'g3soft');
+							if (sid != "") {
+								$('#b_id').val(sid);
+							};
+						};
+
+						var strid = $('#b_id').val();
+
+						//    calcw_fee();
+						//    if(!cansavezdsub(strid,'feegrid')){
+						//		return;
+						//	}
+						strid = $('#b_id').val();
+						var maindata_insert = new Array();
+						var maindata_update = new Array();
+
+						var formobj = app.serializeObject2($('#zdskform'));
+						var cwjob = getSaveZDSubData(formobj);
+
+						formobj.b_type = "应收";
+						//	formobj['b_totaltxt'] = $("#div_total").text();    
+						formobj['b_owner_id'] = $("#b_sales_id").text();
+
+						var newformjson = app.jsonToString(formobj);
+						if (flag == 'new') {
+							formobj.b_inputdatetime = getnowtime();
+							formobj.b_inputuser_id = userid;
+							formobj.b_state = '草拟';
+							maindata_insert.push(formobj);
+						}
+						if (flag == 'mod') {
+							var jobj = getSaveMainData(strid, 'v_cwzd_zdorder_s', formobj, oldformjson);
+							console.log(jobj);
+							if (!jobj['g3_canserver']) {
+								RejectData();
+								return;
+							}
+							maindata_update.push(jobj['MainData']);
+							//	formjson=app.jsonToString(new Array(jobj['MainData']));
+							//	subupdatevalue.push(formjson);
+							//	subinsertvalue.push('[]');
+						}
+
+						var subtable = new Array();
+						var subinsertvalue = new Array();
+						var subupdatevalue = new Array();
+						var subdelvalue = new Array();
+						var keyid = new Array();
+
+						subtable.length = 0;
+						if (maindata_insert.length > 0 || maindata_update.length > 0) {
+							subtable.push('cw_zdorder');
+							subdelvalue.push('[]');
+							keyid.push('b_id');
+							subinsertvalue.push(app.jsonToString(maindata_insert));
+							subupdatevalue.push(app.jsonToString(maindata_update));
+						}
+
+						if (cwjob['g3_canserver']) {
+							subtable.push('bs_business_cw');
+							keyid.push('subid');
+							subdelvalue.push(cwjob['deleteRows']);
+							subinsertvalue.push(cwjob['insertRows']);
+							subupdatevalue.push(cwjob['updateRows']);
+						}
+
+						var sResult = saveobjt(subtable, subinsertvalue, subdelvalue, subupdatevalue, keyid);
+
+						if (sResult == 'OK') {
+							$('#b_id').attr({ readonly: 'readonly' });
+							alert('保存成功!');
+							RejectData();
+						} else {
+							alert(sResult);
+
+						}
+						return sResult;
+					}
+
+					function getSaveZDSubData(formobj) {
+						var jobj = {};
+						jobj['deleteRows'] = '[]';
+						jobj['insertRows'] = '[]';
+						jobj['updateRows'] = '[]';
+						jobj['LogChangeRows'] = '[]';
+						jobj['g3_canserver'] = false;
+
+						var zdorderno = $('#b_id').val();
+
+						var updateRows = [];
+
+						/**
+						 * 汇总 - 直接使用 subSummary
+						 */
+						formobj['b_amount'] = subSummary.totalAmount;
+						formobj['b_totaltxt'] = '';
+						formobj['b_yw_id'] = '';
+
+						var ywidMap = {};
+
+						var deleteRows = draftManager.getDeleteRows();
+						if (deleteRows) {
+							for (let d of deleteRows) {
+								if (!d || !d.subid) {
+									continue;
+								}
+								updateRows.push({
+									mx_zdorderid: '',
+									subid: d.subid
+								});
+							}
+						}
+
+						var insertRows = draftManager.getInsertRows();
+						if (insertRows) {
+							for (let r of insertRows) {
+								if (!r || !r.subid) {
+									continue;
+								}
+								updateRows.push({
+									mx_zdorderid: zdorderno,
+									father: r.father,
+									subid: r.subid
+								});
+
+								if (r.father) {
+									ywidMap[r.father] = true;
+								}
+							}
+						}
+
+						for (var i = 0; i < subSummary.moneyTypes.length; i++) {
+							var mt = subSummary.moneyTypes[i];
+							formobj['b_totaltxt'] +=
+								mt.mx_moneytype_id +
+								':' +
+								(Math.round(mt.mx_amount_root * 100) / 100) +
+								';';
+						}
+
+						formobj['b_yw_id'] =
+							Object.keys(ywidMap).join(',') || '';
+
+						jobj['updateRows'] =
+							app.jsonToString(updateRows);
+
+						if (updateRows.length > 0) {
+							jobj['g3_canserver'] = true;
+						}
+
+						return jobj;
+					}
+
+					function cansavezdsub(zdorderid, gridid) {
+						var zdorderno = zdorderid;
+						var changes = $('#' + gridid).datagrid('getRows');
+						var subxh = "";
+						for (i in changes) {
+							if (subxh != "") { subxh = subxh + "," }
+							subxh = subxh + "'" + changes[i].subxh + "'";
+						}
+						if (subxh == "") {
+							return true;
+						}
+						var searchtxt = " subxh in (" + subxh + ")";
+						//	console.log(searchtxt);
+						var stmpdata = loaddatas('bs_business_cw', searchtxt, 'subxh', '');
+						for (var i in changes) {
+							var subxh = changes[i].subxh;
+							var zdorderid = changes[i].mx_zdorderid;
+							var isdel = true;
+							for (var k in stmpdata) {
+								if (stmpdata[k].subxh == subxh) {
+									sorderid = stmpdata[k].mx_zdorderid;
+									if (sorderid != zdorderid && sorderid != '') {
+										alert('费用已存在账单中，请检查！');
+										return false;
+									}
+									if (stmpdata[k].mx_amount_root != changes[i].mx_amount_root
+										|| stmpdata[k].mx_moneytype_id != changes[i].mx_moneytype_id
+										|| stmpdata[k].mx_amount != changes[i].mx_amount
+										|| stmpdata[k].mx_dw_id != changes[i].mx_dw_id
+									) {
+										alert('费用信息已改变，请核对！');
+										return false;
+									}
+									isdel = false;
+									break;
+								}
+							}
+							if (isdel) {
+								alert('费用已删除，请核对！');
+								return false;
+							}
+						}
+						return true;
+					}
+					function savezdsubdata() {
+						if (savezdsub()) {
+							var strid = $('#b_id').val();
+							updatefieldvaluebyid('cw_zdorder', 'b_totaltxt', $("#div_total").text(), 'b_id', strid);
+							alert('保存成功！');
+						}
+					}
+					function savezdsub() {
+
+						// endEditing();  
+						//alert("11");
+						var changes = $('#feegrid').datagrid('getRows');
+						var deleteRows = $('#feegrid').datagrid('getChanges', 'deleted');
+
+						var value = "";
+						var zdorderno = $('#b_id').val();
+
+						var canlocked = false;
+						var nowtime = getnowtime();
+						if ($('#btn_save').attr('disabled') == 'disabled') {
+							canlocked = true;
+						}
+						var valuearr = new Array();
+						for (var i in changes) {
+							if (changes[i].subid != undefined) {
+								var obj = {
+									subid: changes[i].subid,
+									mx_zdorderid: zdorderno
+								}
+								if (canlocked) {
+									if (changes[i].mx_zdorderid == '' || changes[i].mx_zdorderid == undefined) {
+										obj['mx_cwsh'] = '1';
+										obj['mx_cwshdate'] = nowtime;
+										obj['mx_cwshman_id'] = username;
+									}
+								}
+								valuearr.push(obj);
+							}
+						}
+						for (var d in deleteRows) {
+							if (deleteRows[d].subid != undefined) {
+								var obj = {
+									subid: deleteRows[d].subid,
+									mx_zdorderid: ""
+								}
+								if (canlocked) {
+									obj['mx_cwsh'] = '0';
+									obj['mx_cwshdate'] = '';
+									obj['mx_cwshman_id'] = '';
+								}
+								valuearr.push(obj);
+							}
+						}
+						/*	 var savestate=true;	
+							 if(valuearr.length>0){
+								var updateRowsjson = app.jsonToString(valuearr);	
+								$.ajax({
+									type : 'post',
+									url : 'jsp/savesubdata.jsp',
+									cache : false,
+									async : false,
+									data : {
+										subtable : 'bs_business_cw',
+										subinsertvalue : "[]",
+										subdelvalue : "[]",
+										subupdatevalue : updateRowsjson,
+									},
+									dataType : 'text',
+									success : function(result) {   
+									},
+									error : function(result) {
+										savestate=false;
+									}
+								});
+							}	
+					
+							return savestate; */
+					}
+
+					jQuery_1_2_6("document").ready(function () {
+						$.extend($.fn.datagrid.defaults.editors, {
+							memoedit: {
+								init: function (container, options) {
+									var input = $('<textarea style="height: 32px;margin-top: 4px;border: 1px solid #95B8E7" class="grid_memoedit"></textarea>').appendTo(container);
+									$(input).memoedit();
+									return input;
+								},
+								getValue: function (target) {
+									return $(target).val();
+								},
+								setValue: function (target, value) {
+									$(target).val(value);
+								},
+								resize: function (target, width) {
+									var input = $(target);
+									if (input.hasClass("addpad16") == true) {
+										input.width(width - 20);
+									} else {
+										input.width(width - (input.outerWidth() - input.width()));
+									}
+								}
+							}
+						});
+						$("#b_bz").memoedit('');
+						$("#b_invoice_bz").memoedit('');
+						$("#b_bankname").memoedit('');
+
+						setAutoComplete('#v_ownername', 'b_user', 'b_name', 'b_id', '');
+						jQuery_1_2_6("#v_ownername").result(function (event, data, formatted) {
+							if (data)
+								$("#b_owner_id").val(data.b_id);
+						});
+						setAutoComplete('#v_sales_name', 'b_user', 'b_name', 'b_id', '');
+						jQuery_1_2_6("#v_sales_name").result(function (event, data, formatted) {
+							if (data)
+								$("#b_sales_id").val(data.b_id);
+						});
+
+						setAutoComplete('#b_dw_id', 'v_b_othercompany_customer', 'b_id', 'b_name', '');
+						jQuery_1_2_6("#b_dw_id").result(function (event, data, formatted) {
+							if (data) {
+								$("#v_dwname").val(data.b_name);
+								setAutoCompleteEx('#b_dw_linkman_id', 'v_b_contact', 'b_name_en', 'b_id', " b_customer_id='" + data.b_id + "'", '');
+							}
+						});
+
+						setAutoComplete('#b_mycompany_id', 'v_b_othercompany_my', 'b_id', 'b_name', '');
+						jQuery_1_2_6("#b_mycompany_id").result(function (event, data, formatted) {
+							if (data) {
+								$("#v_mycompanyname").val(data.b_name);
+								//$("#b_bankname").val(data.b_memo); 
+								// 	$("#b_bankname").val(getfieldvaluebyid('b_othercompany','b_memo','b_id',data.b_id));
+								//   	setAutoCompleteEx('#b_bankname','v_b_othercompany_bankname','mx_bankname','father'," father='"+data.b_id+"'",'');	
+							}
+						});
+						//    if($('#b_mycompany_id').val()!=''){
+						//    	setAutoCompleteEx('#b_bankname','v_b_othercompany_bankname','mx_bankname','father'," father='"+$('#b_mycompany_id').val()+"'",'');	
+						//    }	 
+
+						setAutoComplete('#b_money_id', 'b_money', 'b_name', 'b_id', '');
+						setAutoComplete('#b_jsfs', 'b_jsfs', 'b_name', 'b_id', '');
+						setAutoCompleteSimple('#b_yfgz', [['是'], ['否']]);
+						jQuery_1_2_6("#b_yfgz").result(function (event, data, formatted) {
+							if (data) {
+								if (data == '是') {
+									$("#b_zdamount").attr("disabled", false);
+									$("#b_money_id").attr("disabled", false);
+									setAutoComplete('#b_money_id', 'b_money', 'b_name', 'b_id', '');
+								} else {
+									$("#b_zdamount").attr("disabled", true);
+									$("#b_money_id").attr("disabled", true);
+									jQuery_1_2_6('#b_money_id').unautocomplete();
+								}
+							}
+						});
+						inputBtn('btn_editzdname', 'b_zdname');
+					})
+					function checkchange() {
+						if ($('#btn_save').attr('disabled') == 'disabled') {
+							return false;
+						}
+
+						endEditing_con();
+						var formobj = app.serializeObject2($('#zdskform'));
+						delete formobj["bcheck"];
+						newformjson = app.jsonToString(formobj);
+
+						// var gridrows = $("#feegrid").datagrid("getRows");
+						// var gridrows = $("#feegrid").datagrid("getData").firstRows;
+						// newfeegridjson = app.jsonToString(gridrows);
+
+						// 主表
+						if ((oldformjson != newformjson)) {
+							console.log('主表变化');
+							return true;
+						} else {
+							if (draftManager.getInsertRows().length > 0 || draftManager.getUpdateRows().length > 0 || draftManager.getDeleteRows().length > 0) {
+								return true;
+							}
+							return false;
+							// 子表
+							// if (feegridjson != newfeegridjson) {
+							// 	return true;
+							// }
+							// return false;
+						}
+
+						/*var formobj=app.serializeObject2($('#zdskform'));
+							delete formobj['bcheck'];
+							newformjson=app.jsonToString(formobj);
+							if ((oldformjson!=newformjson)){
+									return true;
+							}else{       
+									return false;
+							}*/
+					}
+
+
+					function showattach() {
+						if (!document.getElementById("b_id").readOnly) {
+							alert('请先保存数据');
+							return;
+						}
+						getattachfile(strid, 'cw_zdorder_s', '0');
+					}
+					function getselrows() {
+						var keyID = "<%=StoragekeyID%>";
+
+						if (keyID != '') {
+							var Stdata = JSON.parse(localStorage.getItem(keyID));
+							var fsa = Stdata['selrows'];
+							localStorage.removeItem(keyID);
+
+							if (fsa && fsa.length > 0) {
+								var searchcondition = "subid in(" + fsa.map(function (id) { return "'" + id + "'"; }).join(',') + ")";
+
+								$.ajax({
+									type: 'post',
+									url: 'jsp/loaddata.jsp',
+									cache: false,
+									data: {
+										soption: '',
+										searchcondition: searchcondition,
+										viewname: 'v_cwzd_orderfee_s',
+										orderfield: 'b_id'
+									},
+									dataType: 'json',
+									success: function (result) {
+										if (result && result.length > 0) {
+											if (result.length == undefined) {
+												result = [result];
+											}
+
+											if (result.length > 0) {
+												$('#b_dw_id').val(result[0].mx_dw_id);
+												$('#v_dwname').val(result[0].v_mx_dw_name);
+											}
+
+											for (var i = 0; i < result.length; i++) {
+												var r = result[i];
+												var rk = draftManager.getRowKey(r);
+												var dup = draftManager.getInsertRows().some(function (x) {
+													return draftManager.getRowKey(x) === rk;
+												});
+												if (!dup) {
+													if (!r._rowState) {
+														r._rowState = 'insert';
+													}
+													draftManager.addInsertRow(r);
+												}
+											}
+
+											refreshCurrentPage();
+											calcw_fee();
+										}
+									},
+									error: function () {
+										console.log('加载选中费用失败');
+									}
+								});
+							}
+						}
+					}
+
+					function getSelections(rows) {
+						if (rows.length != undefined) {
+							$('#b_dw_id').val(rows[0].mx_dw_id);
+							$('#v_dwname').val(rows[0].v_mx_dw_name);
+							for (var i = 0; i < rows.length; i++) {
+								$('#feegrid').datagrid('appendRow', rows[i]);
+							}
+						} else {
+							$('#b_dw_id').val(rows.mx_dw_id);
+							$('#v_dwname').val(rows.v_mx_dw_name);
+							$('#feegrid').datagrid('appendRow', rows);
+						}
+						calcw_fee();
+					}
+
+					// 子表草稿：弹窗选费用 → 写入 insertRows（去重）并刷新当前分页视图
+					function handleSelectedFee(rows) {
+						if (rows.length == undefined) {
+							rows = [rows];
+						}
+
+						if (rows.length > 0) {
+							$('#b_dw_id').val(rows[0].mx_dw_id);
+							$('#v_dwname').val(rows[0].v_mx_dw_name);
+						}
+
+						for (var i = 0; i < rows.length; i++) {
+							var r = rows[i];
+							var rk = draftManager.getRowKey(r);
+							var dup = draftManager.getInsertRows().some(function (x) {
+								return draftManager.getRowKey(x) === rk;
+							});
+							if (!dup) {
+								if (!r._rowState) {
+									r._rowState = 'insert';
+								}
+								draftManager.addInsertRow(r);
+							}
+						}
+
+						refreshCurrentPage();
+						calcw_fee();
+					}
+
+					//////////////////////////////////////////////////////////// 	
+
+					// 子表草稿：标记删除或移除 insert（数据源 getActualSelectedRows）
+					function removeit() {
+						$.messager.confirm("操作提示", '您确定要删除勾选的费用吗？', function (r) {
+							if (r) {
+								endEditing_con();
+								var selectedRows = draftManager.getValidSelectedRows();
+
+								if (selectedRows.length === 0) {
+									$.messager.alert('提示', '请选择要删除的行（已标记删除的行请使用「撤销删除」）', 'warning');
+									return;
+								}
+
+								for (var i = selectedRows.length - 1; i >= 0; i--) {
+									var row = selectedRows[i];
+									var invoiceno = row.mx_invoiceid;
+									var kp = invoiceno && invoiceno !== '' && invoiceno !== null ? '1' : '0';
+
+									if ((row.alreadyamount != 0) || (kp == '1')) {
+										$.messager.alert('提示', '已经销账或开票的费用不能删除!', 'warning');
+										return;
+									}
+								}
+
+								var hasInsertDelete = false;
+
+								for (var i = selectedRows.length - 1; i >= 0; i--) {
+									var row = selectedRows[i];
+
+									if (draftManager.isInsertRow(row) || draftManager.isInInsertRows(row)) {
+										draftManager.removeInsertRow(row);
+										draftManager.removeFromUpdateRows(row);
+										hasInsertDelete = true;
+									} else {
+										var delKey = draftManager.getRowKey(row);
+										var wasUpdate = draftManager.getUpdateRows().some(function (rr) {
+											return draftManager.getRowKey(rr) === delKey;
+										});
+										row._undoRowState = wasUpdate ? 'update' : '';
+										row._rowState = 'delete';
+										draftManager.addToDeleteRows(row);
+										draftManager.removeFromUpdateRows(row);
+									}
+
+									draftManager.removeSelectedRow(row);
+								}
+
+								calcw_fee();
+
+								if (hasInsertDelete) {
+									refreshCurrentPageAfterDelete();
+								} else {
+									refreshCurrentPageDisplay();
+								}
+							}
+						})
+					}
+
+					// 子表草稿：撤销删除（逻辑依赖 selectedRows / getDeletedSelectedRows）
+					function undoRemoveFee() {
+						endEditing_con();
+						var pageRows = $('#feegrid').datagrid('getRows');
+						var targets = [];
+						var selKeys = {};
+						var selectedRows = draftManager.getSelectedRows();
+						for (var sk = 0; sk < selectedRows.length; sk++) {
+							selKeys[draftManager.getRowKey(selectedRows[sk])] = true;
+						}
+						var hasSelectionOnPage = false;
+						for (var hp = 0; hp < pageRows.length; hp++) {
+							if (selKeys[draftManager.getRowKey(pageRows[hp])]) {
+								hasSelectionOnPage = true;
+								break;
+							}
+						}
+						if (!hasSelectionOnPage) {
+							for (var u = 0; u < pageRows.length; u++) {
+								if (pageRows[u]._rowState === 'delete') {
+									targets.push(pageRows[u]);
+								}
+							}
+						} else {
+							var delSel = draftManager.getDeletedSelectedRows();
+							var delKeys = {};
+							for (var dv = 0; dv < delSel.length; dv++) {
+								delKeys[draftManager.getRowKey(delSel[dv])] = true;
+							}
+							for (var v = 0; v < pageRows.length; v++) {
+								var pr = pageRows[v];
+								if (pr._rowState === 'delete' && delKeys[draftManager.getRowKey(pr)]) {
+									targets.push(pr);
+								}
+							}
+						}
+						if (targets.length === 0) {
+							$.messager.alert('提示', '当前页没有可撤销的删除行', 'warning');
+							return;
+						}
+						for (var w = 0; w < targets.length; w++) {
+							var row = targets[w];
+							if (row._rowState !== 'delete') {
+								continue;
+							}
+							var prev = row._undoRowState;
+							draftManager.removeFromDeleteRows(row);
+							if (prev === 'update') {
+								row._rowState = 'update';
+								draftManager.addToUpdateRows(row);
+							} else {
+								row._rowState = '';
+							}
+							delete row._undoRowState;
+						}
+						calcw_fee();
+						refreshCurrentPageAfterUndo();
+					}
+
+					// 批量删除
+					function removeit_all() {
+						// $.messager.confirm("操作提示", '您确定要删除所有费用吗？', function (r) {
+						// 	if (!r) {
+						// 		return false;
+						// 	} else {
+						// 		var rows = $('#feegrid').datagrid("getRows");
+						// 		for (var i = rows.length - 1; i >= 0; i--) {
+						// 			if (rows[i].alreadyamount == 0) {
+						// 				$('#feegrid').datagrid('deleteRow', $('#feegrid').datagrid('getRowIndex', rows[i]));
+						// 			}
+						// 		}
+						// 		if (subdata_zdfees.length > 0) {
+						// 			var sql = "select subid,father,mx_zdorderid,mx_amount,mx_sumamount from bs_business_cw where subid in(" + subdata_zdfees.join(',') + ")";
+						// 			var datas = loaddatabysql(sql, '', '');
+						// 			for (var i in datas) {
+						// 				if (datas[i].mx_sumamount == 0) {
+						// 					subdata_delete.push("'" + datas[i].subid + "'");
+						// 				}
+						// 			}
+						// 		}
+						// 	}
+						// });
+					}
+					//////////////////////////////////////////////////////////// 
+					function newSKData() {
+						if (checkchange()) {
+							savealert('请先保存数据!');
+							return;
+						}
+						var zdorderid = $('#b_id').val();
+						var url;
+						var i = 0;
+						var rows = draftManager.getValidSelectedRows();
+						if (rows.length <= 0) {
+							var moneyid = $('#b_money_id').val();
+							url = "jcwzd/editskd.jsp?zdorderid=" + zdorderid + "&moneyid=" + moneyid;
+						} else {
+							var irow = rows.length;
+							var selarray = new Array();
+							var tmpdwid = '';
+							var forderid = '';
+
+							var moneyid = rows[0].mx_moneytype_id;
+							for (i = 0; i < irow; i++) {
+								if (rows[i].mx_moneytype_id != moneyid) {
+									alert('含有不同币种，请分单收款！');
+									return;
+								}
+								if (rows[i].notamount != 0) {
+									selarray.push(rows[i].subxh);
+								}
+							}
+
+							if ((selarray == null) || (selarray == []) || (selarray == '')) {
+								alert('已收款，请检查！');
+								return;
+							}
+							var query = { selrows: selarray }
+							var keyID = 'zdorder_s_skd_data' + generateUID();
+							localStorage.setItem(keyID, JSON.stringify(query));
+
+							url = "jcwzd/editskd.jsp?StoragekeyID=" + keyID + "&zdorderid=" + zdorderid + "&moneyid=" + moneyid;
+
+							//	url="jcwzd/editskd.jsp?selrows="+selarray+"&zdorderid="+zdorderid+"&moneyid="+moneyid; 
+						}
+						/* 	BootstrapDialog.show({  
+										 title: ssdtabtitle,    
+										 id:'dialogss',		       
+										 size : BootstrapDialog.SIZE_WIDE,
+										 closeByBackdrop:false,  
+										 draggable : true,
+										 message: '<iframe id="dialogss" src="' + url 
+													+ '" allowTransparency="true" scrolling="auto" width="100%" height="99%" frameBorder="0" name=""></iframe>',
+										 onhide: function(dialogRef){
+											 $(this).remove();
+										 loaddata_detail('feegrid',subviewtable,zdorderid,''); 
+						 //        loadivdata(zdorderid);
+										 }    
+								 });*/
+
+						datadialog = parent.$('<div/>');
+						datadialog.dialog({
+							title: '实收单',
+							width: 1024,
+							height: 640,
+							id: 'dialogss',
+							cache: false,
+							closeOnEscape: false,
+							autoOpen: false,
+							left: 290,
+							top: 80,
+							onClose: function () {
+								$(this).remove();
+								loaddata_detail('feegrid', subviewtable, zdorderid, '');
+							},
+							content: '<iframe id="dialogss" name="dialogss_skd" src="' + url
+								+ '" allowTransparency="true" scrolling="auto" width="100%" height="99%" frameBorder="0" ></iframe>',
+							modal: true
+						});
+					}
+					function newIVData() {
+						if (checkchange()) {
+							savealert('请先保存数据!');
+							return;
+						}
+						var i = 0;
+						var url;
+						var rows = draftManager.getValidSelectedRows();
+						/*	if (rows.length<=0){
+											return false;
+									};
+						*/
+						var zdorderid = $('#b_id').val();
+						if (rows.length <= 0) {
+							url = "jcwzd/editinvoice_s.jsp?zdorderid=" + zdorderid;
+						} else {
+							var irow = rows.length;
+							var selarray = new Array();
+							var tmpdwid = '';
+							var forderid = '';
+							var moneyid = rows[0].mx_moneytype_id;
+
+							for (i = 0; i < irow; i++) {
+								if (rows[i].mx_moneytype_id != moneyid) {
+									alert('含有不同币种，请分开登记发票！');
+									return;
+								}
+								if (rows[i].mx_invoiceid == '') {
+									selarray.push(rows[i].subxh);
+								}
+							}
+							if ((selarray == null) || (selarray == []) || (selarray == '')) {
+								alert('已生成发票，请检查！');
+								return;
+							}
+							var query = { selrows: selarray }
+							var keyID = 'zdorder_s_iv_data' + generateUID();
+							localStorage.setItem(keyID, JSON.stringify(query));
+							//	url="jcwzd/editinvoice_s.jsp?selrows="+selarray+"&zdorderid="+zdorderid; 
+							url = "jcwzd/editinvoice_s.jsp?StoragekeyID=" + keyID + "&zdorderid=" + zdorderid;
+						}
+						/*BootstrapDialog.show({  
+										title: ysfptabtitle, 
+										id:'dialogss',		       
+										size : BootstrapDialog.SIZE_WIDE,
+										closeByBackdrop:false,  
+										draggable : true,
+										message: '<iframe id="dialogss" src="' + url 
+												 + '" allowTransparency="true" scrolling="auto" width="100%" height="99%" frameBorder="0" name=""></iframe>',
+										onhide: function(dialogRef){
+											$(this).remove();
+										loaddata_detail('feegrid',subviewtable,zdorderid,''); 
+							 //     loadivdata(zdorderid);
+										}   
+								});*/
+
+						datadialog = parent.$('<div/>');
+						datadialog.dialog({
+							title: '应收发票',
+							width: 1024,
+							height: 640,
+							id: 'dialogss',
+							cache: false,
+							closeOnEscape: false,
+							autoOpen: false,
+							left: 290,
+							top: 80,
+							onClose: function () {
+								$(this).remove();
+								loaddata_detail('feegrid', subviewtable, zdorderid, '');
+								//loadivdata(zdorderid);
+							},
+							content: '<iframe id="dialogss" name="dialogss_ysiv" src="' + url
+								+ '" allowTransparency="true" scrolling="auto" width="100%" height="99%" frameBorder="0"></iframe>',
+							modal: true
+						});
+					}
+					function selectysfee() {
+						var desgrid = "feegrid";
+						var selectsearchtxt = " and isnull(mx_zdorderid,'')='' and alreadyamount=0 ";
+						//	console.log($('#b_dw_id').val());
+						if ($('#b_dw_id').val() != '') {
+							selectsearchtxt = selectsearchtxt + " and mx_dw_id='" + $('#b_dw_id').val() + "'";
+						}
+						//	console.log(selectsearchtxt);
+						/*    if($('#b_dw_linkman_id').val()!=''){
+								selectsearchtxt = selectsearchtxt + " and b_custlinkman_id='"+$('#b_dw_linkman_id').val()+"'" ;
+							} */
+						//alert(selectsearchtxt);
+						var moduleid = "v_cwzd_orderfee_s";
+						var parentfrm = self.name;
+
+						var url = "jcwzd/dataSelect_zdfee_new.jsp?parentfrm=" + parentfrm
+							+ "&desgrid=" + desgrid + "&selectsearchtxt=" + selectsearchtxt
+							+ "&moduleid=" + moduleid + "&userid=" + userid + "&mxtypeid=应收";
+
+						var datadialog = $('<div/>').dialog({
+							id: 'dialogss',
+							title: '数据选取',
+							width: 900,
+							height: 540,
+							// left:50,
+							top: 50,
+							content: '<iframe id="" src="'
+								+ url
+								+ '" allowTransparency="true" scrolling="auto" width="100%" height="100%" frameBorder="0" name=""></iframe>',
+							modal: true,
+							onClose: function () {
+								$(this).remove();
+							}
+						});
+					}
+
+					function showhyyslog(id) {
+						// var sid=$('#b_id').val();
+						Ftype = "应收";
+						var sid = id;
+						var url;
+						url = "jbusiness/hylog.jsp?businessid=" + sid + '&type=' + Ftype;
+						if (url != undefined) {
+							var datadialog = $('<div/>').dialog({
+								title: '费用应收删除日志',
+								width: 680,
+								height: 500,
+								content: '<iframe id="" src="'
+									+ url
+									+ '" allowTransparency="true" scrolling="auto" width="100%" height="99.2%" frameBorder="0" name=""></iframe>',
+								modal: true
+							});
+						}
+					}
+
+
+					/*function showhyyslog() {
+								 // var sid=$('#b_id').val();
+									Ftype="应收";
+									var row = $('#feegrid').datagrid('getSelected');
+								if (!row) return;
+								var sid= row.father;
+								//if (sid == ''){
+									//alert('请填写箱号');
+								//	return;
+								//}
+								 //Ftype=type;
+							var url;	
+							url = "jbusiness/hylog.jsp?businessid=" +sid+'&type='+Ftype;
+							if (url != undefined) {
+								var datadialog = parent.$('<div/>').dialog({
+									title : '费用应收删除日志',
+									width : 680,
+									height : 500,
+									content : '<iframe id="" src="'
+											+ url
+											+ '" allowTransparency="true" scrolling="auto" width="100%" height="99.2%" frameBorder="0" name=""></iframe>',
+									modal : true
+								});
+							}
+						}*/
+
+
+					function showlog(type, id) {
+						var url;
+						url = "jbusiness/feelog.jsp?businessid=" + id;
+						if (url != undefined) {
+							var datadialog = $('<div/>').dialog({
+								title: '费用修改日志',
+								width: 850,
+								height: 600,
+								content: '<iframe id="" src="'
+									+ url
+									+ '" allowTransparency="true" scrolling="auto" width="100%" height="99.2%" frameBorder="0" name=""></iframe>',
+								modal: true
+							});
+						}
+
+					}
+					function selbank() {
+						var parObj = $("#b_bankname");
+						var y = parObj.offset().top + parObj.outerHeight();
+						var x = parObj.offset().left;
+						var iwidth = parObj.outerWidth();
+						$("#CategoryFrm").window({
+							width: iwidth,
+							height: 250,
+							top: y,
+							left: x,
+							title: '选取-银行账号',
+							shadow: false,
+							closable: false,
+							collapsible: false,
+							minimizable: false,
+							maximizable: false,
+							//	modal:true,
+							href: 'jselectdialog/categrid.jsp',
+							onBeforeOpen: function () {
+								$('#CategoryFrm').prev().parent().css('padding', '0px');
+								$('#CategoryFrm').prev().css('display', 'none');
+								$('#CategoryFrm').css('border-width', '0px');
+							},
+							onLoad: function () {
+								$('#p_viewgrid').datagrid({
+									striped: true,
+									singleSelect: true,
+									fit: true,
+									rownumbers: true,
+									remoteSort: false,
+									multiSort: true,
+									selectOnCheck: false,
+									checkOnSelect: false,
+									onDblClickRow: function (rowIndex, rowData) { Confirm() },
+									editIndex: undefined,
+									columns: [[
+										{ field: 'subid', title: '计划号', hidden: true, width: 90, editor: 'text', halign: 'center' },
+										{ field: 'mx_bankname', title: '银行账号', width: iwidth - 50, editor: 'text', halign: 'center' },
+									]],
+								});
+								$('#DIV_ALL').hide();
+								var sql = "select * from v_b_othercompany_bankname where father='" + $('#b_mycompany_id').val() + "'";
+								var datas = loaddatabysql(sql, 'mx_xh', '');
+								$('#p_viewgrid').datagrid('loadData', datas);
+
+								$('#CategoryFrm #p_autoh .panel .datagrid-wrap').css({ 'border-top': '0', 'border-left': '0', 'border-right': '0' });
+							},
+							onClose: function () {
+								if (CategoryFrmshowmodal) {
+									var datas = $("#p_viewgrid").datagrid('getSelected');
+									if (datas) {
+										parObj.val(datas.mx_bankname);
+									}
+								}
+							}
+						})
+					}
+
+					function editzdfee() {
+						if (checkchange()) {
+							savealert('请先保存数据!');
+							return;
+						}
+						var zdorderid = $('#b_id').val();
+						$('<div/>').dialog({
+							title: '编辑账单费用',
+							width: 900,
+							height: 600,
+							id: 'jddialog',
+							top: 50,
+							content: '<iframe id="" src="'
+								+ 'jcwzd/editzdfeemx.jsp?zdorderid=' + zdorderid
+								+ '" allowTransparency="true" scrolling="auto" width="100%" height="98.3%" frameBorder="0"></iframe>',
+							modal: true,
+							onClose: function () {
+								$(this).remove();
+								loaddata_detail('feegrid', subviewtable, zdorderid, '');
+								calcw_fee();
+								var gridrows = $("#feegrid").datagrid("getRows");
+								// var gridrows = $("#feegrid").datagrid("getData").firstRows;
+								feegridjson = app.jsonToString(gridrows);
+							},
+						});
+					}
+					function editzdname() {
+						if ($('#btn_save').attr('disabled') == 'disabled') {
+							return false;
+						}
+						if ($("b_dw_id").val() == '') {
+							alert('结算单位为空');
+							return;
+						}
+						var dwname = $("#b_dw_id").val();
+						console.log(dwname);
+						var dwrows = loaddatas('b_othercompany', " b_id='" + dwname + "'", '', '');
+						if (dwrows.length == 0) {
+							alert('找不到该结算单位');
+							return;
+						}
+						var ecode = dwrows[0].b_edicode; //== 账单前缀
+						var bdate = $("#b_date").val();
+						if (bdate == '') {
+							bdate = getnowdate();
+						}
+						console.log(bdate);
+						var datearr = bdate.split('-');
+						var zdname = "";
+						if (ecode != '') {
+							zdname = ecode + '-';
+						}
+						zdname = zdname + datearr[0] + datearr[1];
+						$("#b_zdname").val(zdname);
+					}
+					function zdorder_row_mxfee() {
+						if (!document.getElementById("b_id").readOnly) { return; }
+						var zdorderid = $("#b_id").val();
+						var query = { zdorderid: zdorderid, mxtype: '应收' }
+						var params = encodeURIComponent(JSON.stringify(query));
+						var url = "jcwzd/zdorder_rows_mxfee.jsp?" + params;
+
+						datadialog = parent.$('<div/>');
+						datadialog.dialog({
+							title: '横向费用列表' + zdorderid,
+							width: 1024,
+							height: 640,
+							id: 'dialogss',
+							cache: false,
+							closeOnEscape: false,
+							autoOpen: false,
+							//	left:290,
+							top: 120,
+							onClose: function () {
+								$(this).remove();
+							},
+							content: '<iframe id="dialogss" src="' + url
+								+ '" allowTransparency="true" scrolling="auto" width="100%" height="99%" frameBorder="0" name=""></iframe>',
+							modal: true
+						});
+					}
+					function check_fee_ysyf_cnt() {
+						if (!document.getElementById("b_id").readOnly) { return; }
+						var zdorderid = $("#b_id").val();
+						var query = { zdorderid: zdorderid }
+						var params = encodeURIComponent(JSON.stringify(query));
+						var url = "jcwzd/zdorder_check_fee.jsp?" + params;
+
+						datadialog = parent.$('<div/>');
+						datadialog.dialog({
+							title: '检查收付费用' + zdorderid,
+							width: 620,
+							height: 640,
+							id: 'dialogss',
+							cache: false,
+							closeOnEscape: false,
+							autoOpen: false,
+							//	left:290,
+							top: 120,
+							onClose: function () {
+								$(this).remove();
+							},
+							content: '<iframe id="dialogss" src="' + url
+								+ '" allowTransparency="true" scrolling="auto" width="100%" height="99%" frameBorder="0" name=""></iframe>',
+							modal: true
+						});
+					}
+					function locked_ys() {
+						var rows = draftManager.getValidSelectedRows();
+						var locked_idarr = new Array();
+						var updaterows = new Array();
+						for (var i in rows) {
+							if (locked_idarr.indexOf(rows[i].mx_keyid) == -1) {
+								locked_idarr.push(rows[i].mx_keyid);
+								var obj = {
+									b_id: rows[i].mx_keyid,
+									b_locked_ys: '1'
+								};
+								updaterows.push(obj);
+							}
+						}
+						if (updaterows.length > 0) {
+							var sResult = SaveSingleData('xc_consite_in', 'b_id', '[]', '[]', app.jsonToString(updaterows));
+							alert(sResult);
+						}
+					}
+					function locked_cw() {
+						var rows = draftManager.getValidSelectedRows();
+						var locked_idarr = new Array();
+						var updaterows = new Array();
+						for (var i in rows) {
+							if (locked_idarr.indexOf(rows[i].mx_keyid) == -1) {
+								locked_idarr.push(rows[i].mx_keyid);
+								var obj = {
+									b_id: rows[i].mx_keyid,
+									b_cw_locked: '1'
+								};
+								updaterows.push(obj);
+							}
+						}
+						if (updaterows.length > 0) {
+							var sResult = SaveSingleData('xc_consite_in', 'b_id', '[]', '[]', app.jsonToString(updaterows));
+							alert(sResult);
+						}
+					}
+					function unlocked_cw() {
+						var rows = draftManager.getValidSelectedRows();
+						var locked_idarr = new Array();
+						var updaterows = new Array();
+						for (var i in rows) {
+							if (locked_idarr.indexOf(rows[i].mx_keyid) == -1) {
+								locked_idarr.push(rows[i].mx_keyid);
+								var obj = {
+									b_id: rows[i].mx_keyid,
+									b_cw_locked: '0'
+								};
+								updaterows.push(obj);
+							}
+						}
+						if (updaterows.length > 0) {
+							var sResult = SaveSingleData('xc_consite_in', 'b_id', '[]', '[]', app.jsonToString(updaterows));
+							alert(sResult);
+						}
+					}
+
+				</script>
+			</body>
+
+			</html>
\ No newline at end of file
diff --git a/code/jsp/js/draft-page-manager.js b/code/jsp/js/draft-page-manager.js
new file mode 100644
index 00000000..9c7d45c0
--- /dev/null
+++ b/code/jsp/js/draft-page-manager.js
@@ -0,0 +1,439 @@
+/**
+ * 草稿态分页管理模块
+ * 
+ * 职责：
+ * 1. 草稿池管理：insertRows / updateRows / deleteRows
+ * 2. 分页管理：远程数据与本地数据混排
+ * 3. 选中状态管理：跨页勾选状态同步
+ * 4. 行状态恢复：_rowState 字段维护
+ * 
+ * 使用方式：
+ * var draftManager = window.DraftPageManager.createDraftManager({
+ *     keyField: 'subid',
+ *     pageSize: 50
+ * });
+ */
+(function(window) {
+    'use strict';
+
+    /**
+     * 创建草稿态管理器实例
+     * @param {Object} config 配置参数
+     * @param {string} config.keyField 主键字段名，默认 'id'
+     * @param {number} config.pageSize 每页条数，默认 50
+     * @returns {Object} 管理器实例
+     */
+    function createDraftManager(config) {
+        var keyField = config && config.keyField || 'id';
+        var defaultPageSize = config && config.pageSize || 50;
+
+        var state = {
+            pagination: {
+                pageSize: defaultPageSize,
+                pageNumber: 1,
+                total: 0,
+                remoteTotal: 0
+            },
+            currentRemoteRows: [],
+            insertRows: [],
+            updateRows: [],
+            deleteRows: [],
+            selectedRows: [],
+            isAllChecked: false,
+            excludedRows: []
+        };
+
+        // ==================== 状态查询方法 ====================
+
+        function getPagination() {
+            return {
+                pageNumber: state.pagination.pageNumber,
+                pageSize: state.pagination.pageSize,
+                total: state.pagination.total,
+                remoteTotal: state.pagination.remoteTotal
+            };
+        }
+
+        function getInsertRows() {
+            return state.insertRows;
+        }
+
+        function getUpdateRows() {
+            return state.updateRows;
+        }
+
+        function getDeleteRows() {
+            return state.deleteRows;
+        }
+
+        function getSelectedRows() {
+            return state.selectedRows;
+        }
+
+        function getValidSelectedRows() {
+            return state.selectedRows.filter(function(row) {
+                return row._rowState !== 'delete';
+            });
+        }
+
+        function getDeletedSelectedRows() {
+            return state.selectedRows.filter(function(row) {
+                return row._rowState === 'delete';
+            });
+        }
+
+        function isAllChecked() {
+            return state.isAllChecked;
+        }
+
+        function getExcludedRows() {
+            return state.excludedRows;
+        }
+
+        // ==================== 草稿池操作方法 ====================
+
+        function addInsertRow(row) {
+            if (!row._rowState) {
+                row._rowState = 'insert';
+            }
+            var key = getRowKey(row);
+            var exists = state.insertRows.some(function(r) {
+                return getRowKey(r) === key;
+            });
+            if (!exists) {
+                state.insertRows.push(row);
+            }
+        }
+
+        function removeInsertRow(row) {
+            var key = getRowKey(row);
+            state.insertRows = state.insertRows.filter(function(r) {
+                return getRowKey(r) !== key;
+            });
+        }
+
+        function addToUpdateRows(row) {
+            var key = getRowKey(row);
+            var exists = state.updateRows.some(function(r) {
+                return getRowKey(r) === key;
+            });
+            if (!exists) {
+                state.updateRows.push(row);
+            }
+        }
+
+        function removeFromUpdateRows(row) {
+            var key = getRowKey(row);
+            state.updateRows = state.updateRows.filter(function(r) {
+                return getRowKey(r) !== key;
+            });
+        }
+
+        function addToDeleteRows(row) {
+            var key = getRowKey(row);
+            var exists = state.deleteRows.some(function(r) {
+                return getRowKey(r) === key;
+            });
+            if (!exists) {
+                state.deleteRows.push(row);
+            }
+        }
+
+        function removeFromDeleteRows(row) {
+            var key = getRowKey(row);
+            state.deleteRows = state.deleteRows.filter(function(r) {
+                return getRowKey(r) !== key;
+            });
+        }
+
+        // ==================== 选中状态操作方法 ====================
+
+        function addSelectedRow(row) {
+            var key = getRowKey(row);
+            for (var i = 0; i < state.selectedRows.length; i++) {
+                if (getRowKey(state.selectedRows[i]) === key) {
+                    state.selectedRows[i] = row;
+                    return;
+                }
+            }
+            state.selectedRows.push(row);
+        }
+
+        function removeSelectedRow(row) {
+            var key = getRowKey(row);
+            state.selectedRows = state.selectedRows.filter(function(item) {
+                return getRowKey(item) !== key;
+            });
+        }
+
+        function clearSelectedRows() {
+            state.selectedRows = [];
+        }
+
+        function setAllChecked(value) {
+            state.isAllChecked = value;
+            if (value) {
+                clearSelectedRows();
+            }
+        }
+
+        function addExcludedRow(row) {
+            if (isRowExcluded(row)) {
+                return;
+            }
+            state.excludedRows.push(row);
+        }
+
+        function removeExcludedRow(row) {
+            var key = getRowKey(row);
+            state.excludedRows = state.excludedRows.filter(function(r) {
+                return getRowKey(r) !== key;
+            });
+        }
+
+        function clearExcludedRows() {
+            state.excludedRows = [];
+        }
+
+        function isRowExcluded(row) {
+            var key = getRowKey(row);
+            return state.excludedRows.some(function(r) {
+                return getRowKey(r) === key;
+            });
+        }
+
+        // ==================== 分页操作方法 ====================
+
+        function setPageNumber(pageNumber) {
+            state.pagination.pageNumber = pageNumber;
+        }
+
+        function setPageSize(pageSize) {
+            state.pagination.pageSize = pageSize;
+        }
+
+        function setRemoteTotal(remoteTotal) {
+            state.pagination.remoteTotal = remoteTotal;
+            state.pagination.total = getActualTotal();
+        }
+
+        function setCurrentRemoteRows(rows) {
+            state.currentRemoteRows = rows;
+        }
+
+        function buildPageData(remoteRows, pageNumber) {
+            var pageSize = state.pagination.pageSize;
+            var remoteTotal = state.pagination.remoteTotal;
+            var insertRows = state.insertRows;
+            var pageStart = (pageNumber - 1) * pageSize;
+            var pageEnd = pageStart + pageSize;
+
+            remoteRows.forEach(function(row) {
+                if (!row._rowState) {
+                    row._rowState = '';
+                }
+            });
+
+            insertRows.forEach(function(row) {
+                if (!row._rowState) {
+                    row._rowState = 'insert';
+                }
+            });
+
+            var result = [];
+            result = result.concat(remoteRows);
+
+            var insertStartIdx = Math.max(0, pageStart - remoteTotal);
+            var insertEndIdx = pageEnd - remoteTotal;
+
+            if (insertStartIdx < insertRows.length) {
+                var insertSlice = insertRows.slice(insertStartIdx, insertEndIdx);
+                result = result.concat(insertSlice);
+            }
+
+            if (result.length > pageSize) {
+                result = result.slice(0, pageSize);
+            }
+
+            return result;
+        }
+
+        function restoreRowStates(rows) {
+            rows.forEach(function(row) {
+                var key = getRowKey(row);
+
+                var deleteMatch = state.deleteRows.find(function(r) {
+                    return getRowKey(r) === key;
+                });
+                if (deleteMatch) {
+                    row._rowState = 'delete';
+                    if (deleteMatch._undoRowState !== undefined) {
+                        row._undoRowState = deleteMatch._undoRowState;
+                    }
+                    return;
+                }
+
+                var insertMatch = state.insertRows.find(function(r) {
+                    return getRowKey(r) === key;
+                });
+                if (insertMatch) {
+                    row._rowState = insertMatch._rowState || 'insert';
+                    return;
+                }
+
+                var updateMatch = state.updateRows.find(function(r) {
+                    return getRowKey(r) === key;
+                });
+                if (updateMatch) {
+                    row._rowState = 'update';
+                    return;
+                }
+
+                row._rowState = '';
+            });
+        }
+
+        // ==================== 工具方法 ====================
+
+        function getRowKey(row) {
+            return row[keyField];
+        }
+
+        function isInsertRow(row) {
+            return row._rowState === 'insert';
+        }
+
+        function isDeleteRow(row) {
+            return row._rowState === 'delete';
+        }
+
+        function isUpdateRow(row) {
+            return row._rowState === 'update';
+        }
+
+        function isInInsertRows(row) {
+            var key = getRowKey(row);
+            return state.insertRows.some(function(r) {
+                return getRowKey(r) === key;
+            });
+        }
+
+        function isSavedRow(row) {
+            return !isInsertRow(row) && !isInInsertRows(row);
+        }
+
+        function getActualTotal() {
+            return state.pagination.remoteTotal + state.insertRows.length;
+        }
+
+        function getDisplayTotal() {
+            var insertDisplayCount = state.insertRows.filter(function(row) {
+                return row._rowState !== 'delete';
+            }).length;
+            return state.pagination.remoteTotal + insertDisplayCount;
+        }
+
+        function getTotalPages() {
+            return Math.ceil(getActualTotal() / state.pagination.pageSize);
+        }
+
+        function hasInsertRowsInPage(pageNumber) {
+            var range = getPageRange(pageNumber);
+            var remoteTotal = state.pagination.remoteTotal;
+            return range.start < remoteTotal + state.insertRows.length &&
+                range.end > remoteTotal;
+        }
+
+        function isInsertOnlyPage(pageNumber) {
+            var range = getPageRange(pageNumber);
+            return range.start >= state.pagination.remoteTotal;
+        }
+
+        function getPageRange(pageNumber) {
+            var pageSize = state.pagination.pageSize;
+            var startIdx = (pageNumber - 1) * pageSize;
+            var endIdx = startIdx + pageSize;
+            return { start: startIdx, end: endIdx };
+        }
+
+        function removeSelectionForRows(gridRows) {
+            var drop = {};
+            for (var i = 0; i < gridRows.length; i++) {
+                drop[getRowKey(gridRows[i])] = true;
+            }
+            state.selectedRows = state.selectedRows.filter(function(item) {
+                return !drop[getRowKey(item)];
+            });
+        }
+
+        function reset() {
+            state.pagination = {
+                pageSize: defaultPageSize,
+                pageNumber: 1,
+                total: 0,
+                remoteTotal: 0
+            };
+            state.currentRemoteRows = [];
+            state.insertRows = [];
+            state.updateRows = [];
+            state.deleteRows = [];
+            state.selectedRows = [];
+            state.isAllChecked = false;
+            state.excludedRows = [];
+        }
+
+        return {
+            getPagination: getPagination,
+            getInsertRows: getInsertRows,
+            getUpdateRows: getUpdateRows,
+            getDeleteRows: getDeleteRows,
+            getSelectedRows: getSelectedRows,
+            getValidSelectedRows: getValidSelectedRows,
+            getDeletedSelectedRows: getDeletedSelectedRows,
+            isAllChecked: isAllChecked,
+            getExcludedRows: getExcludedRows,
+
+            addInsertRow: addInsertRow,
+            removeInsertRow: removeInsertRow,
+            addToUpdateRows: addToUpdateRows,
+            removeFromUpdateRows: removeFromUpdateRows,
+            addToDeleteRows: addToDeleteRows,
+            removeFromDeleteRows: removeFromDeleteRows,
+
+            addSelectedRow: addSelectedRow,
+            removeSelectedRow: removeSelectedRow,
+            clearSelectedRows: clearSelectedRows,
+            setAllChecked: setAllChecked,
+            addExcludedRow: addExcludedRow,
+            removeExcludedRow: removeExcludedRow,
+            clearExcludedRows: clearExcludedRows,
+            isRowExcluded: isRowExcluded,
+
+            setPageNumber: setPageNumber,
+            setPageSize: setPageSize,
+            setRemoteTotal: setRemoteTotal,
+            setCurrentRemoteRows: setCurrentRemoteRows,
+            buildPageData: buildPageData,
+            restoreRowStates: restoreRowStates,
+
+            getRowKey: getRowKey,
+            isInsertRow: isInsertRow,
+            isDeleteRow: isDeleteRow,
+            isUpdateRow: isUpdateRow,
+            isInInsertRows: isInInsertRows,
+            isSavedRow: isSavedRow,
+            getActualTotal: getActualTotal,
+            getDisplayTotal: getDisplayTotal,
+            getTotalPages: getTotalPages,
+            hasInsertRowsInPage: hasInsertRowsInPage,
+            isInsertOnlyPage: isInsertOnlyPage,
+            removeSelectionForRows: removeSelectionForRows,
+            reset: reset
+        };
+    }
+
+    window.DraftPageManager = {
+        createDraftManager: createDraftManager
+    };
+
+})(window);
\ No newline at end of file