@gct-paas/excel 0.1.21 → 0.1.23

package/dist/{dynamic-table-action-KwzaoPBC.js → dynamic-table-action-D789BgJZ.js}

@@ -1,7 +1,7 @@
 import { computed, watch, toRaw, onUnmounted, markRaw, ref, toRef, reactive, inject, provide, defineComponent, openBlock, createElementBlock, mergeProps, unref, createElementVNode, normalizeClass, renderSlot, createCommentVNode, createVNode, toDisplayString, isVNode, h, onBeforeMount, resolveComponent, createBlock, withCtx, Fragment, renderList, createTextVNode, onMounted } from "vue";
 import { cloneDeep, has, isNil, merge, defaults, pickBy, mergeWith, omit, last, pick } from "lodash-es";
-import { e as ComponentTypeEnum, F as FIELD_TYPE, i as api, aT as ButtonTypeEnum, t as FormTypeEnum, aM as safeParseArray, ao as RenderModeEnum, aO as mergeByMultiKey, aS as BpmnSignatureTypeEnum, aN as BpmnNodeTypeEnum, a9 as useWidgetStaticAttrs, bw as assembleRules, bx as deleteFormRule, by as setFormRule, aD as requestDisplayValidation, bz as isReferenceOptionActive, bA as validateAllFields, bB as runValidation, bC as stockCheck, ak as getParseRuleInfo, al as getParseRuleValue, bD as materialCheck, av as calcFillData, aq as FormulaRuleFieldKeyEnum, bE as judgeUnique, g as SubTableType, am as useCurrentPageFormState, N as Dependency_ENUM, M as ASSIGNMENTSTRATEGY_ENUM, aK as uuid2, a1 as DeviceLink, _ as _export_sfc, ah as NCB_PROVIDE, b5 as buildFormChangeDisplayRows, aP as getRowId, bu as resolveRowFormChangeMark, bt as resolveFormChangeRowUi, bj as isAnnLocationSelected, bv as setSelectMobileTdId, bk as isFormChangeGhostRow, h as CellType, ab as setSelectAnnotationId, bp as recordSubtableRowDelete, b7 as deleteSubtableRow, bq as relocateDeletedRowsToEnd, bF as FRONT_ROW_KEY, ax as transformUtils, bi as insertSubtableRows, bo as recordSubtableRowAdd, bG as q, bH as groupFixedTableRows, bI as QUICK_FILL_ALLOWED_FIELDS, bJ as processQuickFillRows, bK as getIsGroupEmpty, bg as getSubTableQuickFillInfo } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-ByU7Owiw.js";
-import { u as useFormModel, w as watchDebounced } from "./mb-render-Bh6EegbE.js";
+import { e as ComponentTypeEnum, F as FIELD_TYPE, i as api, aV as ButtonTypeEnum, t as FormTypeEnum, aO as safeParseArray, aq as RenderModeEnum, aQ as mergeByMultiKey, aU as BpmnSignatureTypeEnum, aP as BpmnNodeTypeEnum, ab as useWidgetStaticAttrs, bI as assembleRules, bJ as deleteFormRule, bK as setFormRule, aF as requestDisplayValidation, bL as isReferenceOptionActive, bM as validateAllFields, bN as runValidation, bO as stockCheck, am as getParseRuleInfo, an as getParseRuleValue, bP as materialCheck, ax as calcFillData, as as FormulaRuleFieldKeyEnum, bQ as judgeUnique, g as SubTableType, ao as useCurrentPageFormState, R as Dependency_ENUM, Q as ASSIGNMENTSTRATEGY_ENUM, aM as uuid2, a3 as DeviceLink, _ as _export_sfc, aj as NCB_PROVIDE, b7 as buildFormChangeDisplayRows, aR as getRowId, bF as resolveRowFormChangeMark, bE as resolveFormChangeRowUi, bp as isAnnLocationSelected, bG as setSelectMobileTdId, bq as isFormChangeGhostRow, h as CellType, ad as setSelectAnnotationId, bz as recordSubtableRowDelete, b9 as deleteSubtableRow, bA as relocateDeletedRowsToEnd, bR as FRONT_ROW_KEY, az as transformUtils, bo as insertSubtableRows, by as recordSubtableRowAdd, bS as q, bT as groupFixedTableRows, bU as QUICK_FILL_ALLOWED_FIELDS, bV as processQuickFillRows, bW as getIsGroupEmpty, bj as getSubTableQuickFillInfo } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-Bomssr4x.js";
+import { u as useFormModel, w as watchDebounced } from "./mb-render-BOzJ9uDs.js";
 import dayjs from "dayjs";
 import { a as useNamespace, u as useModal } from "./use-namespace-qtLS8nEh.js";
 import { Modal, message } from "ant-design-vue";
@@ -1429,6 +1429,7 @@ class MaterialConsumeTableController {
     this.tmplBomController = tmplBomController;
     this.tmplBom = tmplBom;
     this.initScanRule(this.tmplBom.barcode_parsing_rules_id_);
+    this.scanParamType = this.tmplBom.barcodeParamType;
     markRaw(this);
     this.bomEntriesValidator = new BomEntriesValidator(
       this.actualBomEntries,
@@ -1478,6 +1479,8 @@ class MaterialConsumeTableController {
   scanRuleInfo;
   /** 解析规则映射配置 */
   scanRuleProps;
+  /**条码参数配置 */
+  scanParamType;
   /**
    * 解析规则配置
    */
@@ -1692,7 +1695,8 @@ class MaterialConsumeTableController {
     if (this.isScanOpen) {
       return;
     }
-    if (!this.scanRuleInfo) {
+    console.log("open-------", this);
+    if (!this.tmplBom.disable_barcode_parsing_ && !this.scanRuleInfo || this.tmplBom.disable_barcode_parsing_ && !this.scanParamType) {
       this.error($t("sys.edhr.mcTable.scanRuleNotFound"));
       return;
     }
@@ -1700,6 +1704,10 @@ class MaterialConsumeTableController {
     this.isScanOpen = true;
     await MaterialConsumeTableController.render.openScanModal({
       title,
+      subModelKey: this.widget.props.modelKey,
+      formModelController: this.formModelController,
+      scanRules: this.scanRuleProps,
+      scanParam: this.scanParamType,
       onScan: async ({ str }) => {
         console.log("onScan", str);
         if (!str) {
@@ -1968,6 +1976,7 @@ class MaterialConsumeTableController {
       this.setDefaultValue(row);
     } else if (field === "material_no_") {
       row.product_id_ = option.product_id_;
+      row.expiration_date_ = option.validate_;
       this.setDefaultValue(row);
     } else if (field === "qty_") {
       this.updateRowConsumed();
@@ -2498,6 +2507,8 @@ class SubTableCore {
     this.isScanOpen = true;
     await this.render.openScanModal({
       title: this.ctx.widget.props.tableTitle,
+      subModelKey: this.subModelKey,
+      formModelController: this.formModelController,
       onScan: this.onScan
     });
     this.isScanOpen = false;