update

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js

@@ -1,4 +1,4 @@
-import version from "../../version";
+import version from "../../version.js";
 
 const schema = {
   title: "JIS结算数据",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js

@@ -102,8 +102,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js

@@ -102,8 +102,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js

@@ -103,7 +103,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       exportUrl,
       rejectUrl,
       passedUrl,
@@ -112,7 +111,6 @@ export default function () {
       rejectMethod,
       passedMethod,
       sync_qadMethod,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js

@@ -102,8 +102,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js

@@ -102,8 +102,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js

@@ -113,8 +113,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-        queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js

@@ -116,8 +116,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js

@@ -89,8 +89,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js

@@ -102,8 +102,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
-      queryMethod,
       schema: schema,
     },
   };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js

@@ -115,7 +115,6 @@ export default function () {
       schema: schema,
     },
     edit: {
-      importUrl,
       exportUrl,
       exportMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js

@@ -83,10 +83,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js

@@ -89,9 +89,7 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       exportUrl,
-      queryMethod,
       exportMethod,
       schema: schema,
     },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js

@@ -87,10 +87,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@@ -99,10 +99,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_detail_service.js

@@ -0,0 +1,136 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    keyCode: {
+      title: "LU+ASN单号",
+      type: "string",
+    },
+    billNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "发货单号",
+      type: "string",
+    },
+    site: {
+      title: "工厂地点",
+      type: "string",
+    },
+    qty: {
+      title: "结算数量",
+      type: "decimal",
+    },
+    price: {
+      title: "单价",
+      type: "decimal",
+    },
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
+    },
+    settleDate: {
+      title: "结算日期（收货日期",
+      type: "Datetime",
+    },
+    extend1: {
+      title: "扩展字段1",
+      type: "string",
+    },
+    extend2: {
+      title: "扩展字段2",
+      type: "string",
+    },
+    extend3: {
+      title: "扩展字段3",
+      type: "string",
+    },
+    groupNum: {
+      title: "结算分组",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_sa_detail_service/get-list";
+const exportUrl = "settleaccount/pub_sa_detail_service/export";
+const queryMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      deleteUrl,
+      exportUrl,
+      deleteMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_service.js

@@ -8,7 +8,7 @@ const schema = {
     version,
     state,
     billNum: {
-      title: "关联结算单号",
+      title: "结算单号",
       type: "string",
     },
   },
@@ -80,10 +80,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       deleteUrl,
       importUrl,
-      queryMethod,
       deleteMethod,
       importMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js

@@ -0,0 +1,122 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    shippingDate: {
+      title: "发货时间",
+      type: "DateTime",
+    },
+    wmsBillNum: {
+      title: "发运单号",
+      type: "string",
+    },
+    lu: {
+      title: "零件号",
+      type: "string",
+    },
+    pn: {
+      title: "生产号",
+      type: "string",
+    },
+    keyCode: {
+      title: "组合键值（LU+PN）",
+      type: "string",
+    },
+    qty: {
+      title: "数量",
+      type: "decimal",
+    },
+    seqNumber: {
+      title: "日顺序号",
+      type: "string",
+    },
+    assemblyCode: {
+      title: "小总成号",
+      type: "string",
+    },
+    injectionCode: {
+      title: "注塑码",
+      type: "string",
+    },
+    beginDate: {
+      title: "订单时间",
+      type: "DateTime",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_se_detail_service/get-list";
+const exportUrl = "settleaccount/pub_se_detail_service/export";
+const queryMethod = "POST";
+const exportMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        title: "结算数据",
+        type: "object",
+        properties: {
+          filters: {
+            title: "项目",
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [
+              {
+                logic: "and",
+                column: "version",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      exportUrl,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js

@@ -79,10 +79,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js

@@ -6,6 +6,7 @@ const schema = {
       title: "角色名",
       type: "string",
       showForList: true,
+      readOnly: true,
       rules: [
         {
           required: true,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/state.js

@@ -11,4 +11,4 @@ const state2 = Object.assign(Object.assign({}, state), { options: options.filter
 const state3 = Object.assign(Object.assign({}, state), { options: options.filter((a) => a.value > 3) });
 
 export default state;
-export { state2, state3 };
+export { state2, state3 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js

@@ -87,10 +87,8 @@ export default function () {
       schema: schema,
     },
     edit: {
-      queryUrl,
       importUrl,
       exportUrl,
-      queryMethod,
       importMethod,
       exportMethod,
       schema: schema,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@@ -86,17 +86,18 @@ export default [
               isTop: true,
             },
           },
-          {
+          // {
-            path: "update",
+          //   path: "update",
-            meta: {
+          //   meta: {
-              type: "button",
+          //     type: "button",
-              title: "编辑",
+          //     title: "编辑",
-              icon: "file",
+          //     icon: "file",
-              htmlClass: "el-button--primary",
+          //     htmlClass: "el-button--primary",
-              permission: "AbpIdentity.Users.Update",
+          //     permission: "AbpIdentity.Users.Update",
-              disabled: `(o) => o.isStatic`,
+          //     disabled: `(o) => o.isStatic`,
-            },
+             
-          },
+          //   },
+          // },
           {
             path: "delete",
             meta: {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_detail_service.js

@@ -1,7 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/input/bj_pub_sa_detail_service.js";
+import useConfig from "../../../models/pub_sa_detail_service.js";
-
 export default {
   components: { AppList },
   template: html`<app-list :config="config" @command="onCommand" />`,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_sa_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/input/bj_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_service.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/bj/input/bj_pub_se_detail_service.js";
+import useConfig from "../../../models/pub_se_detail_service.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_detail_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/input/in_pub_sa_detail_service.js";
+import useConfig from "../../../models/pub_sa_detail_service.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_sa_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/input/in_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_service.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/in/input/in_pub_se_detail_service.js";
+import useConfig from "../../../models/pub_se_detail_service.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_pub_sa_detail_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/input/jit_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_detail_service.js";
 
 export default {
   components: { AppList },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_pub_se_detail_service.js

@@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/input/jit_pub_se_detail_service.js";
+import useConfig from "../../../models/pub_se_detail_service.js";
 
 export default {
   components: { AppList },