更改了jis的edi model以及加了重开按钮

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

@@ -1,47 +1,48 @@
+import version from "../version.js";
+import { state2, state3 } from "../state.js";
+
 const schema = {
   title: "通用代码",
   type: "object",
   properties: {
-    project: {
-      title: "项目",
+    version,
+    invbillNum: {
+      title: "系统生成发票号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
     },
-      ],
+    invGroupNum: {
+      title: "发票分组号",
+      type: "string",
     },
-    value: {
-      title: "值",
+    settleGroupNum: {
+      title: "结算分组号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
     },
-      ],
+    amt: {
+      title: "金额",
+      type: "decimal",
     },
-    description: {
-      title: "描述",
+    state2,
+    Extend1: {
+      title: "扩展字段1",
       type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
     },
-        { max: 60 },
-      ],
+    Extend2: {
+      title: "扩展字段2",
+      type: "string",
     },
   },
 };
-
-const baseUrl = "settleaccount/invoice_service";
-const queryUrl = `${baseUrl}/detail_queryUrl`;
+const queryUrl = "settleaccount/invoice_service/main-query";
+const exportUrl = "settleaccount/invoice_service/export";
+const rejectUrl = "settleaccount/invoice_service/reject";
+const passedUrl = "settleaccount/invoice_service/approval-passed";
+const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
 const queryMethod = "POST";
+const exportMethod = "POST";
+const rejectMethod = "POST";
+const passedMethod = "POST";
+const sync_qadMethod = "POST";
 
 export default function () {
   return {
@@ -77,8 +78,8 @@ export default function () {
             default: [
               {
                 logic: "and",
-                column: "project",
-                action: "like",
+                column: "version",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },
@@ -102,6 +103,14 @@ export default function () {
       schema: schema,
     },
     edit: {
+      exportUrl,
+      rejectUrl,
+      passedUrl,
+      sync_qadUrl,
+      exportMethod,
+      rejectMethod,
+      passedMethod,
+      sync_qadMethod,
       schema: schema,
     },
   };

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

@@ -1,46 +1,42 @@
+import version from "../version.js";
+
 const schema = {
   title: "通用代码",
   type: "object",
   properties: {
-    project: {
-      title: "项目",
-      type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
+    version,
+    inGroupNum:{
+      title:"发票分组号",
+      type:"string",
     },
-      ],
+    settleGroupNum:{
+      title:"结算分组号",
+      type:"string",
     },
-    value: {
-      title: "值",
-      type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
+    lu:{
+      title:"可结算分组号",
+      type:"string",
     },
-      ],
+    lu1:{
+      title:"不可结算分组号",
+      type:"string",
     },
-    description: {
-      title: "描述",
-      type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
+    qty:{
+      title:"数量",
+      type:"decimal",
     },
-        { max: 60 },
-      ],
+    extend1:{
+      title:"扩展字段1",
+      type:"string",
+    },
+    extend2:{
+      title:"扩展字段2",
+      type:"string",
     },
   },
 };
 
-const baseUrl = "settleaccount/invoice_service";
-const queryUrl = `${baseUrl}/detail_queryUrl`;
+const queryUrl = "settleaccount/invoice_service/detail_queryUrl";
 const queryMethod = "POST";
 
 export default function () {

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

@@ -1,117 +0,0 @@
-import version from "../version.js";
-import { state2, state3 } from "../state.js";
-const schema = {
-  title: "财务审核",
-  type: "object",
-  properties: {
-    version,
-    realnvBillNum: {
-      title: "实际纸质发票号",
-      type: "string",
-    },
-    invbillNum: {
-      title: "系统生成发票号",
-      type: "string",
-    },
-    amt: {
-      title: "未税金额",
-      type: "decimal",
-    },
-    taxAmt: {
-      title: "税后金额",
-      type: "decimal",
-    },
-    fileName: {
-      title: "开票Excel文件",
-      type: "string",
-    },
-    businessType: {
-      title: "业务类别",
-      type: "EnumBusinessType",
-    },
-    state2,
-  },
-};
-
-const queryUrl = "settleaccount/invoice_service/main-query";
-const exportUrl = "settleaccount/invoice_service/export";
-const rejectUrl = "settleaccount/invoice_service/reject";
-const passedUrl = "settleaccount/invoice_service/approval-passed";
-const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
-const queryMethod = "POST";
-const exportMethod = "POST";
-const rejectMethod = "POST";
-const passedMethod = "POST";
-const sync_qadMethod = "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,
-      rejectUrl,
-      passedUrl,
-      sync_qadUrl,
-      exportMethod,
-      rejectMethod,
-      passedMethod,
-      sync_qadMethod,
-      schema: schema,
-    },
-  };
-}

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

@@ -1,46 +1,58 @@
+import version from "../version.js";
+
 const schema = {
   title: "通用代码",
   type: "object",
   properties: {
-    project: {
-      title: "项目",
+    version,
+    invbillNum: {
+      title: "发票号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
     },
-      ],
+    inGroupNum: {
+      title: "发票分组号",
+      type: "string",
     },
-    value: {
-      title: "值",
+    lu: {
+      title: "可结算分组号",
       type: "string",
-      readOnly: true,
-      showForList: true,
-      rules: [
-        {
-          required: true,
     },
-      ],
+    price: {
+      title: "单价",
+      type: "decimal",
     },
-    description: {
-      title: "描述",
+    qty: {
+      title: "数量",
+      type: "decimal",
+    },
+    amt: {
+      title: "金额",
+      type: "decimal",
+    },
+    bussiessType: {
+      title: "业务分类",
+      type: "EnumBusinessType",
+    },
+    extend1: {
+      title: "扩展字段1",
       type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
     },
-        { max: 60 },
-      ],
+    extend2: {
+      title: "扩展字段2",
+      type: "string",
+    },
+    extend3: {
+      title: "扩展字段3",
+      type: "string",
+    },
+    extend4: {
+      title: "扩展字段4",
+      type: "string",
     },
   },
 };
 
-const baseUrl = "settleaccount/invoice_service";
-const queryUrl = `${baseUrl}/detail_queryUrl`;
+const queryUrl = "settleaccount/invoice_service/detail_queryUrl";
 const queryMethod = "POST";
 
 export default function () {

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

@@ -50,11 +50,10 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_se_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
+const queryUrl = "settleaccount/bbac_se_detail_service/get-list";
 // const deleteUrl = `${baseUrl}/delete-list`;
 // const importUrl = `${baseUrl}/import`;
-const exportUrl = `${baseUrl}/export`;
+const exportUrl = "settleaccount/bbac_se_detail_service/export";
 const queryMethod = "POST";
 // const deleteMethod = "POST";
 // const importMethod = "POST";

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

@@ -46,9 +46,8 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_se_edi_service";
-const queryUrl = `${baseUrl}/get-list`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/bbac_se_edi_service/get-list";
+const exportUrl = "settleaccount/bbac_se_edi_service/export";
 const queryMethod = "POST";
 const exportMethod = "POST";
 

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

@@ -53,8 +53,7 @@ const schema = {
   },
 };
 
-const baseUrl = "settleaccount/bbac_can_sa_service";
-const queryUrl = `${baseUrl}/detail-query`;
+const queryUrl = "settleaccount/bbac_can_sa_service/detail-query";
 const queryMethod = "POST";
 
 export default function () {

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

@@ -1,5 +1,5 @@
 import version from "../../version.js";
-import {state2,state3} from "../../state.js";
+import { state2, state3 } from "../../state.js";
 
 const schema = {
   title: "寄售库库存扣减审批",
@@ -29,7 +29,7 @@ const schema = {
 const queryUrl = "settleaccount/b-bAC_PD_SERVICE/main-query";
 const exportUrl = "settleaccount/b-bAC_PD_SERVICE/export";
 const rejectUrl = "settleaccount/b-bAC_PD_SERVICE/reject";
-const passedUrl = "settleaccount/b-bAC_PD_SERVICE/approval-passed"
+const passedUrl = "settleaccount/b-bAC_PD_SERVICE/approval-passed";
 const queryMethod = "POST";
 const exportMethod = "POST";
 const rejectMethod = "POST";

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js

@@ -384,7 +384,7 @@ export default [
             path: "bbac_can_sa_service",
             meta: {
               type: "page",
-              title: "BBAC发票分组号",
+              title: "可结算单",
               icon: "file",
             },
             children: [
@@ -2638,7 +2638,7 @@ export default [
     },
     children: [
       {
-        path: "invoice_service",
+        path: "invoice_map_group",
         meta: {
           type: "page",
           title: "财务审核",
@@ -2693,6 +2693,14 @@ export default [
               pattern: "paged",
             },
           },
+          {
+            path: "reopen",
+            meta: {
+              type: "button",
+              title: "重开",
+              icon: "file",
+            },
+          },
         ],
       },
       {
@@ -2716,10 +2724,10 @@ export default [
         ],
       },
       {
-        path: "invoice_map_group",
+        path: "invoice_grp",
         meta: {
           type: "page",
-          title: "发票和结算分组对应关系表",
+          title: "发票分组",
           icon: "file",
           isHidden: true,
         },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_pub_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算对比";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/contrast/bj_second_pub_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次对比";
+    config.query.schema.title = "发运与结算二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_service.js

@@ -7,6 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
+    
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_pub_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算对比";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/contrast/in_second_pub_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次对比";
+    config.query.schema.title = "发运与结算二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js

@@ -1,13 +1,13 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/job-service.js";
+import useConfig from "../../../models/bbac-edi-se-compare.js";
 
 export default {
   components: { AppList },
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI与发运数据对比";
+    config.query.schema.title = "EDI与发运数据";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/first_bbac_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI、发运与结算对比";
+    config.query.schema.title = "EDI、发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/second_bbac_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算数据二次对比";
+    config.query.schema.title = "发运与结算数据二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/third_bbac_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "买单件发运与结算数据三次对比";
+    config.query.schema.title = "买单件发运与结算数据三次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/first_hbpo_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI、发运与结算对比";
+    config.query.schema.title = "EDI、发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/hbpo_sa_detail_jobservice.js

@@ -1,13 +1,13 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/job-service.js";
+import useConfig from "../../../models/hbpo-edi-se-compare.js";
 
 export default {
   components: { AppList },
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "EDI与发运数据对比";
+    config.query.schema.title = "EDI与发运数据";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/contrast/second_hbpo_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算数据二次对比";
+    config.query.schema.title = "发运与结算数据二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_pub_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算对比";
+    config.query.schema.title = "发运与结算";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/contrast/jit_second_pub_sa_detail_jobservice.js

@@ -7,7 +7,7 @@ export default {
   template: html`<app-list :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    config.query.schema.title = "发运与结算二次对比";
+    config.query.schema.title = "发运与结算二次";
     const onCommand = async (item, rows) => {
       console.log(item.path, item, rows);
     };