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

@@ -16,11 +16,13 @@ const stateOptions = [
   { value: 4, label: "客户已收票" },
   { value: 5, label: "已扣减" },
   { value: 6, label: "扣减进行中" },
-  { value: 7, label: "撤销扣减进行中" },
+  { value: 7, label: "撤销扣减进行中" }, 
-  { value: 12, label: "发票同步中" },
   { value: 8, label: "已提交QAD" },
   { value: 9, label: "红冲" },
-  { value: 10, label: "开票中" },
+  { value: 10, label: "生成发票中" },
+  { value: 11, label: "扣减单生成中" },
+  { value: 12, label: "发票同步中" },
+  { value: 13, label: "可结退回不可结同步中" },
 ];
 const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), {
@@ -202,11 +204,13 @@ const invState = {
     { value: 4, label: "客户已收票" },
     { value: 5, label: "已扣减" },
     { value: 6, label: "扣减进行中" },
-    { value: 7, label: "撤销扣减进行中" },
+    { value: 7, label: "撤销扣减进行中" },    
-    { value: 12, label: "发票同步中" },
     { value: 8, label: "已提交QAD" },
     { value: 9, label: "红冲" },
     { value: 10, label: "生成发票中" },
+    { value: 11, label: "扣减单生成中" },
+    { value: 12, label: "发票同步中" },
+    { value: 13, label: "可结退回不可结同步中" },
   ],
 };