Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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

@@ -19,6 +19,7 @@ const stateOptions = [
   { value: 7, label: "撤销扣减进行中" },
   { value: 8, label: "已提交QAD" },
   { value: 9, label: "红冲" },
+  { value: 10, label: "开票中" },
 ];
 const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), {

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

@@ -397,6 +397,11 @@ export default [
             "title=导入开票文件&isTop=true",
             (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
           ),
+          createButton(
+            "import",
+            "title=导入开票文件&isTop=true",
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 9) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+          ),
           createButton(
             "approval",
             "title=财务审核通过&isTop=true",
@@ -462,13 +467,13 @@ export default [
 
       //     ],
       // },
-      {
-        ...createRoute("contrast", "title=库存任务"),
-        children: [
-          createCompareVmi("bbac_sa_detail_jobservice", "Vmi", "bbac", "库存余额任务"),
+      // {
+      //   ...createRoute("contrast", "title=库存任务"),
+      //   children: [
+      //     createCompareVmi("bbac_sa_detail_jobservice", "Vmi", "bbac", "库存余额任务"),
 
-        ],
-      },
+      //   ],
+      // },
       {
         ...createPage("sum", "title=库存余额汇总"),
         children: [createButton("query", "title=查询&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],