1.更改列名，调整搜索名称

2.商务审核页面显示字段按照财务审核页面写
3.基础信息页面显示字段调整（已完成），首页导入模板加入新的模板

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js

@@ -30,7 +30,7 @@ export default {
           <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.value" />
         </el-select>
       </template>
-      <template v-else-if="getInput(schema)==='month'">
+      <template v-else-if="getInput(schema)==='month'||getInput(schema)==='datetime'">
         <el-date-picker v-model="model[prop]" :type="schema.input" :value-format="schema.format" />
       </template>
       <template v-else-if="getInput(schema)==='number'">

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

@@ -1,4 +1,4 @@
-import { billType, codeType, changedType, subBillType } from "./inventory.js";
+import { billType, codeType, subBillType } from "./inventory.js";
 
 const schema = {
   title: "寄售库存调整",
@@ -7,30 +7,26 @@ const schema = {
     logType: {
       title: "库存事务分类",
       type: "string",
+      default: "Type500",
       hidden: true,
     },
-    changedNumber: {
+    changedType: {
-      title: "变动单号",
+      title: "变动类型",
       type: "string",
-      rules: [
+      default: "in",
-        {
+      hidden: true,
-          required: true,
-        },
-      ],
     },
-    changedTime: {
+    partCode: {
-      title: "变动时间",
+      title: "LU零件号",
       type: "string",
-      input: "datetime",
       rules: [
         {
           required: true,
         },
       ],
     },
-    changedType,
+    customerPartCode: {
-    changedBy: {
+      title: "客户零件号",
-      title: "变动人",
       type: "string",
       rules: [
         {
@@ -38,26 +34,25 @@ const schema = {
         },
       ],
     },
-    partCode: {
+    codeType,
-      title: "调整LU零件号",
+    billType,
-      type: "string",
+    qty: {
+      title: "数量",
+      type: "number",
+      input: "number",
       rules: [
         {
           required: true,
         },
       ],
     },
-    customerPartCode: {
+    billTime: {
-      title: "调整客户零件号",
+      title: "发运日期",
       type: "string",
-      rules: [
+      input: "datetime",
-        {
-          required: true,
-        },
-      ],
     },
-    orderNum: {
+    changedNumber: {
-      title: "EDI原始订单号",
+      title: "变动单号",
       type: "string",
       rules: [
         {
@@ -65,39 +60,27 @@ const schema = {
         },
       ],
     },
-    billType,
+    changedTime: {
-    subBillType,
+      title: "变动时间",
-    reMark: {
-      title: "备注",
       type: "string",
-      input: "textarea",
+      input: "datetime",
-      rules: [
-        {
-          required: true,
-        },
-      ],
     },
-    vinCode: {
+    deliverTime: {
-      title: "调整生产码",
+      title: "订单日期",
       type: "string",
-      rules: [
+      input: "datetime",
-        {
-          required: true,
-        },
-      ],
     },
-    codeType,
+    erpToLoc: {
-    qty: {
+      title: "ERP库位",
-      title: "数量",
+      type: "string",
-      type: "number",
       rules: [
         {
           required: true,
         },
       ],
     },
-    billTime: {
+    orderNum: {
-      title: "发运日期",
+      title: "EDI原始订单号",
       type: "string",
       rules: [
         {
@@ -105,8 +88,8 @@ const schema = {
         },
       ],
     },
-    billNum: {
+    changedBy: {
-      title: "WMS发运单号",
+      title: "变动人",
       type: "string",
       rules: [
         {
@@ -114,18 +97,23 @@ const schema = {
         },
       ],
     },
-    deliverTime: {
+    subBillType,
-      title: "订单日期",
+    reMark: {
+      title: "备注",
+      type: "string",
+      input: "textarea",
+    },
+    vinCode: {
+      title: "EDI订单生产码",
       type: "string",
-      input: "datetime",
       rules: [
         {
           required: true,
         },
       ],
     },
-    erpToLoc: {
+    billNum: {
-      title: "ERP库位",
+      title: "WMS发运单号",
       type: "string",
       rules: [
         {
@@ -139,7 +127,7 @@ const schema = {
 const baseUrl = "settleaccount/vmi";
 const queryUrl = `${baseUrl}/log`;
 const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
+const createUrl = "settleaccount/vmi/edit-balance";
 const updateUrl = `${baseUrl}/update/%s`;
 const deleteUrl = `${baseUrl}/delete-list`;
 const importUrl = `${baseUrl}/code-setting-upload-excel-import`;

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

@@ -29,13 +29,41 @@ const options3 = [
   { value: 9, label: "JIT直供件BBAC" },
   { value: 10, label: "JIT直供件HBPO" },
 ];
-const options4 = [
+const billType = {
-  { value: "In", label: "入库" },
+  title: "发货类型",
-  { value: "Out", label: "出库" },
+  type: "number",
-];
+  input: "select",
-const billType = { title: "发货类型", type: "number", input: "select", options: options1, clearable: true };
+  options: options1,
-const codeType = { title: "生产码类型", type: "string", input: "select", options: options2, clearable: true };
+  clearable: true,
-const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3, clearable: true };
+  rules: [
-const changedType = { title: "变动类型", type: "string", input: "select", options: options4, clearable: true };
+    {
+      required: true,
+    },
+  ],
+};
+const codeType = {
+  title: "生产码类型",
+  type: "string",
+  input: "select",
+  options: options2,
+  clearable: true,
+  rules: [
+    {
+      required: true,
+    },
+  ],
+};
+const subBillType = {
+  title: "发货子类型",
+  type: "number",
+  input: "select",
+  options: options3,
+  clearable: true,
+  rules: [
+    {
+      required: true,
+    },
+  ],
+};
 
-export { billType, codeType, subBillType, changedType };
+export { billType, codeType, subBillType };

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

@@ -1,4 +1,4 @@
-import { billType, codeType, changedType, subBillType } from "./inventory.js";
+import { billType, codeType, subBillType } from "./inventory.js";
 
 //变动单据号、发生时间、生产码类型、、订单号、库位、变动数、EDI顺序号、备注、变动类型（In、Out标识）、发货类型（JIS\JIT\买单件\备件等）、
 //实扣LU零件号、实扣客户零件号、结算LU零件号、结算客户零件号、实扣生产码、结算生产码
@@ -7,47 +7,16 @@ const schema = {
   title: "库存事务日志",
   type: "object",
   properties: {
-    changedNumber: {
-      title: "变动单号",
-      type: "string",
-    },
-    changedTime: {
-      title: "变动时间",
-      type: "string",
-      input: "datetime",
-    },
-    changedType,
-    changedBy: {
-      title: "变动人",
-      type: "string",
-    },
     partCode: {
       title: "LU零件号",
       type: "string",
     },
-    partCode2: {
-      title: "结算厂内零件号",
-      type: "string",
-    },
     customerPartCode: {
-      title: "结算客户零件号",
+      title: "客户零件号",
-      type: "string",
-    },
-    realCode: {
-      title: "WMS实发生产码",
-      type: "string",
-    },
-    vinCode: {
-      title: "EDI订单生产码",
-      type: "string",
-    },
-    settlementVinCode: {
-      title: "结算生产码",
       type: "string",
     },
     codeType,
     billType,
-    subBillType,
     qty: {
       title: "数量",
       type: "number",
@@ -62,6 +31,10 @@ const schema = {
       type: "string",
       input: "datetime",
     },
+    erpToLoc: {
+      title: "ERP库位",
+      type: "string",
+    },
     seq: {
       title: "EDI顺序号",
       type: "string",
@@ -82,14 +55,40 @@ const schema = {
       title: "PJIS生产顺序号",
       type: "string",
     },
+    changedNumber: {
+      title: "变动单号",
+      type: "string",
+    },
+    changedTime: {
+      title: "变动时间",
+      type: "string",
+      input: "datetime",
+    },
+    changedBy: {
+      title: "变动人",
+      type: "string",
+    },
+    partCode2: {
+      title: "结算厂内零件号",
+      type: "string",
+    },
+    realCode: {
+      title: "WMS实发生产码",
+      type: "string",
+    },
+    vinCode: {
+      title: "EDI订单生产码",
+      type: "string",
+    },
+    settlementVinCode: {
+      title: "结算生产码",
+      type: "string",
+    },
+    subBillType,
     isReplenished: {
       title: "是否补货",
       type: "boolean",
     },
-    erpToLoc: {
-      title: "ERP库位",
-      type: "string",
-    },
     configcode: {
       title: "配置码",
       type: "string",
@@ -156,10 +155,24 @@ export default function () {
               {
                 logic: "and",
                 column: "billTime",
-                action: "like",
+                action: "BiggerThanOrEqual",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "billTime",
+                action: "SmallThanOrEqual",
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "isReplenished",
+                action: "equal",
+                value: true,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 column: "billType",

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

@@ -18,10 +18,6 @@ export default function () {
         title: "LU零件号",
         type: "string",
       },
-      vinCode: {
-        title: "生产码",
-        type: "string",
-      },
       customerPartCode: {
         title: "客户零件号",
         type: "string",
@@ -83,6 +79,14 @@ export default function () {
         title: "WMS实发生产码",
         type: "string",
       },
+      vinCode: {
+        title: "EDI订单生产码",
+        type: "string",
+      },
+      settlementVinCode: {
+        title: "结算生产码",
+        type: "string",
+      },
     },
   };
 }

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

@@ -0,0 +1,8 @@
+const options1 = [
+  { value: 1, label: "正常" },
+  { value: 2, label: "报废" },
+  { value: 3, label: "提交" },
+];
+
+const invoiceState = { title: "发票状态", type: "string", input: "select", options: options1 };
+export default invoiceState;

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

@@ -1,51 +1,42 @@
 import version from "../../version.js";
-import { state2, state3 } from "../../state.js";
+import { state2 as state, state3 } from "../../state.js";
+import businessType from "../../businessType.js";
+import invoiceState from "../../invoiceState.js";
 
 const schema = {
   title: "商务审批",
   type: "object",
   properties: {
-    settleBillNum: {
+    version,
-      title: "关联结算单号",
+    realnvBillNum: {
+      title: "金税发票号",
       type: "string",
     },
-    site: {
+    invbillNum: {
-      title: "工厂地点",
+      title: "系统发票号",
       type: "string",
     },
-    version,
+    amt: {
-    state2,
+      title: "未税金额",
-    price: {
+      type: "number",
-      title: "单价",
-      type: "decimal",
     },
-    billNum: {
+    taxAmt: {
-      title: "结算单号",
+      title: "税后金额",
-      type: "string",
+      type: "number",
-    },
-
-    settleDate: {
-      title: "结算日期",
-      type: "DateTime",
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "string",
+      type: "number",
-    },
-    lu: {
-      title: "零件号",
-      type: "string",
-    },
-    pn: {
-      title: "生产号",
-      type: "string",
     },
-    qty: {
+    businessType,
-      title: "结算数量",
+    state,
-      type: "decimal",
+    invoiceState,
+    taxDiff: {
+      title: "发票税后尾差",
+      type: "number",
     },
-    groupNum: {
+    clientCode: {
-      title: "结算分组号",
+      title: "客户代码",
       type: "string",
     },
   },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js

@@ -1,51 +1,42 @@
 import version from "../../version.js";
-import { state2, state3 } from "../../state.js";
+import { state2 as state, state3 } from "../../state.js";
+import businessType from "../../businessType.js";
+import invoiceState from "../../invoiceState.js";
 
 const schema = {
   title: "不可结算单",
   type: "object",
   properties: {
-    state2,
+    version,
-    settleBillNum: {
+    realnvBillNum: {
-      title: "关联结算单号",
+      title: "金税发票号",
       type: "string",
     },
-    site: {
+    invbillNum: {
-      title: "工厂地点",
+      title: "系统发票号",
       type: "string",
     },
-    version,
+    amt: {
-    price: {
+      title: "未税金额",
-      title: "单价",
+      type: "number",
-      type: "decimal",
     },
-    billNum: {
+    taxAmt: {
-      title: "结算单号",
+      title: "税后金额",
-      type: "string",
+      type: "number",
-    },
-
-    settleDate: {
-      title: "结算日期",
-      type: "DateTime",
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "string",
+      type: "number",
-    },
-    lu: {
-      title: "零件号",
-      type: "string",
-    },
-    pn: {
-      title: "生产号",
-      type: "string",
     },
-    qty: {
+    businessType,
-      title: "结算数量",
+    state,
-      type: "decimal",
+    invoiceState,
+    taxDiff: {
+      title: "发票税后尾差",
+      type: "number",
     },
-    groupNum: {
+    clientCode: {
-      title: "结算分组号",
+      title: "客户代码",
       type: "string",
     },
   },

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

@@ -1,75 +1,46 @@
 import version from "./version.js";
-import { state2, state3 } from "./state.js";
+import { state2 as state, state3 } from "./state.js";
+import businessType from "./businessType.js";
+import invoiceState from "./invoiceState.js";
 
 const schema = {
-  title: "结算数据",
+  title: "不可结算单",
   type: "object",
   properties: {
-    settleBillNum: {
+    version,
-      title: "关联结算单号",
+    realnvBillNum: {
+      title: "金税发票号",
       type: "string",
     },
-    site: {
+    invbillNum: {
-      title: "工厂地点",
+      title: "系统发票号",
       type: "string",
     },
-    businessType: {
+    amt: {
-      title: "业务分类",
+      title: "未税金额",
-      type: "EnumBusinessType",
+      type: "number",
-    },
-    version,
-    state2,
-    price: {
-      title: "价格",
-      type: "decimal",
-    },
-    billNum: {
-      title: "结算单号",
-      type: "string",
     },
-    settleDate: {
+    taxAmt: {
-      title: "下线日期",
+      title: "税后金额",
-      type: "DateTime",
+      type: "number",
     },
     invGroupNum: {
       title: "发票分组号",
-      type: "string",
+      type: "number",
-    },
-    lu: {
-      title: "零件号",
-      type: "string",
-    },
-    pn: {
-      title: "发货单号",
-      type: "string",
-    },
-    keycode: {
-      title: "键值",
-      type: "string",
     },
-    qty: {
+    businessType,
-      title: "结算数量",
+    state,
-      type: "decimal",
+    invoiceState,
+    taxDiff: {
+      title: "发票税后尾差",
+      type: "number",
     },
-    groupNum: {
+    clientCode: {
-      title: "结算分组号",
+      title: "客户代码",
-      type: "decimal",
-    },
-    entend1: {
-      title: "扩展1",
-      type: "string",
-    },
-    entend2: {
-      title: "扩展2",
-      type: "string",
-    },
-    entend3: {
-      title: "扩展3",
       type: "string",
     },
   },
 };
-
 const queryUrl = "settleaccount/pub_ba_service/main-query";
 const exportUrl = "settleaccount/pub_ba_service/export";
 const invoiceUrl = "settleaccount/pub_ba_service/generate-invoice";

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

@@ -5,11 +5,11 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "客户物料号",
+      title: "厂内物料号",
       type: "string",
     },
     repLU: {
-      title: "替换客户物料号",
+      title: "替换厂内物料号",
       type: "string",
     },
     businessType: {

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

@@ -3,7 +3,7 @@ const schema = {
   type: "object",
   properties: {
     project: {
-      title: "项目",
+      title: "业务类别",
       type: "string",
       readOnly: true,
       showForList: true,
@@ -14,7 +14,7 @@ const schema = {
       ],
     },
     value: {
-      title: "值",
+      title: "库位",
       type: "string",
       readOnly: true,
       showForList: true,
@@ -24,18 +24,6 @@ const schema = {
         },
       ],
     },
-    description: {
-      title: "描述",
-      type: "string",
-      input: "textarea",
-      showForList: true,
-      rules: [
-        {
-          required: true,
-        },
-        { max: 60 },
-      ],
-    },
   },
 };
 

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

@@ -245,7 +245,7 @@ export default [
         path: "tb_re-parts-relationship_service",
         meta: {
           type: "page",
-          title: "客户替换件关系",
+          title: "厂内替换件关系",
           icon: "file",
           children: [
             {

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

@@ -3671,7 +3671,7 @@ export default [
             },
           },
           {
-            path: "data-export",
+            path: "dataExport",
             meta: {
               type: "button",
               title: "补货数据导出",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/inventory/log.js

@@ -1,15 +1,52 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
 import useConfig from "../../../models/inventory/log.js";
+import { reactive, ref } from "vue";
+import request from "../../request/index.js";
+import { schemaToModel } from "../../utils/index.js";
 
 export default {
   components: { AppList },
-  template: html`<app-list :config="config" @command="onCommand" />`,
+  template: html`<app-list :config="config" @command="onCommand" />
+    <el-dialog v-model="dialog" width="45%" title="补货数据导出">
+      <el-form :model="exportModel" style="height:100%;">
+        <el-form-item label="" label-width="100px">
+          开始时间<el-date-picker v-model="exportModel.startDatetime" value-format="YYYY-MM-DD" />
+          <span style="margin:0 .5em;">-</span>
+          结束时间<el-date-picker v-model="exportModel.endDatetime" value-format="YYYY-MM-DD" />
+        </el-form-item>
+        <el-button type="primary" @click="openDialog" style="margin-left: 10px;">确定</el-button>
+      </el-form>
+    </el-dialog> `,
   setup() {
+    const defaultExportModel = {
+      startDatetime: "",
+      endDatetime: "",
+    };
+    const exportModel = ref(defaultExportModel);
     const config = useConfig();
+    const dialog = ref(false);
+    const prop = ref("");
+    const queryModel = ref(schemaToModel(config.query.schema));
+    function buildQuery() {
+      const postData = JSON.parse(JSON.stringify(queryModel.value));
+      return postData;
+    }
+    const openDialog = async () => {
+      // const url = 
+      // const method = 
+      // const postData = buildQuery();
+      const response = await request(url, postData, { method });
+      if (!response.errors) {
+        window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`));
+      }
+      dialog.value = false;
+    };
     const onCommand = async (item, rows) => {
+      prop.value = item.path;
+      dialog.value = true;
       console.log(item.path, item, rows);
     };
-    return { config, onCommand };
+    return { config, onCommand, dialog, prop, exportModel, openDialog };
   },
 };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/settlement/hbpo_jit_pub_ba_service.js

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