cnhis-design-vue 3.0.4 → 3.0.5

package/es/index.js

@@ -45158,14 +45158,12 @@ var script = /* @__PURE__ */ defineComponent({
         previewText: { type: String, required: false, default: "\u6253\u5370\u9884\u89C8" },
         formatEditText: { type: String, required: false, default: "\u683C\u5F0F\u7F16\u8F91" },
         identityVerificationTitle: { type: String, required: false, default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C" },
-        params: { type: Array, required: true },
-        hisParams: { type: null, required: true },
+        params: { type: Array, required: false, default: () => [] },
         prevFn: { type: Function, required: false, default: () => Promise.resolve() },
         verifyUser: { type: Function, required: false, default: () => Promise.resolve() },
         queryPrintFormatByNumber: { type: Function, required: true, default: () => Promise.resolve({}) },
         queryTemplateParams: { type: Function, required: false, default: () => Promise.resolve({}) },
-        strategy: { type: String, required: false, default: "MULTI" },
-        versionType: { type: [Number, String], required: false, default: "2" }
+        strategy: { type: String, required: false, default: "MULTI" }
     },
     emits: ["success", "error"],
     setup(__props, { emit }) {
@@ -45206,7 +45204,7 @@ var script = /* @__PURE__ */ defineComponent({
             let id = state.currentFormatId;
             return state.formatList.find((item) => item.id === id);
         });
-        const formatTitle = computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+        computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
         const getTemplateIdByFormatId = (id) => {
             let find = state.formatList.find((item) => item.id === id);
             return find.templateId;
@@ -45228,34 +45226,6 @@ var script = /* @__PURE__ */ defineComponent({
             };
             emit("error", error);
         };
-        const getHisParams = (index = 0) => {
-            const { reportid = "280" } = props.hisParams;
-            const { id, name } = state.templateParams;
-            return {
-                reportid,
-                formatid: state.currentFormatId || id,
-                formatname: name,
-                param: props.params[index]
-            };
-        };
-        const getOnceHisParams = () => {
-            const { reportid = "280" } = props.hisParams;
-            const { id, name } = state.templateParams;
-            const obj = {};
-            Object.keys(props.params[0]).forEach((v) => {
-                obj[v] = [];
-                props.params.forEach((k) => {
-                    obj[v].push(k[v]);
-                });
-                obj[v] = obj[v].join(",");
-            });
-            return {
-                reportid,
-                formatid: state.currentFormatId || id,
-                formatname: name,
-                param: obj
-            };
-        };
         const getPrintParams = (index = 0) => {
             const params = state.printParams[index];
             return JSON.stringify(params);
@@ -45299,49 +45269,26 @@ var script = /* @__PURE__ */ defineComponent({
                 prevFnError();
                 return Promise.reject();
             }).then(() => {
-                if (props.versionType == 1 || props.versionType == 3) {
-                    const printFn = props.versionType == 1 ? "handleHisPrint" : "handleOldHisPrint";
-                    if (props.strategy === "MULTI") {
-                        for (let i = 0; i < props.params.length; i++) {
-                            const params = getHisParams(i);
-                            printInstance[printFn](7, params).then((res) => {
-                                console.log(res, "777777777777");
-                            }).catch((error) => {
-                                console.log(error, "error777");
-                            });
-                        }
-                    }
-                    else {
-                        const params = getOnceHisParams();
-                        printInstance[printFn](7, params).then((res) => {
-                            console.log(res, "777777777777");
-                        }).catch((error) => {
-                            console.log(error, "error777");
-                        });
-                    }
-                }
-                else {
-                    if (props.strategy === "MULTI") {
-                        for (let i = 0; i < state.printParams.length; i++) {
-                            const queryParams = {
-                                formatId: state.currentFormatId,
-                                templateId: getTemplateIdByFormatId(state.currentFormatId),
-                                params: getPrintParams(i)
-                            };
-                            printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
-                        }
-                    }
-                    else {
+                if (props.strategy === "MULTI") {
+                    for (let i = 0; i < state.printParams.length; i++) {
                         const queryParams = {
                             formatId: state.currentFormatId,
                             templateId: getTemplateIdByFormatId(state.currentFormatId),
-                            params: getOnceParams()
+                            params: getPrintParams(i)
                         };
-                        printInstance.printDirect(queryParams, (res) => {
-                            callLocalServicesSuccessCb(res, "print");
-                        }, callLocalServicesErrorCb);
+                        printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
                     }
                 }
+                else {
+                    const queryParams = {
+                        formatId: state.currentFormatId,
+                        templateId: getTemplateIdByFormatId(state.currentFormatId),
+                        params: getOnceParams()
+                    };
+                    printInstance.printDirect(queryParams, (res) => {
+                        callLocalServicesSuccessCb(res, "print");
+                    }, callLocalServicesErrorCb);
+                }
             }).finally(() => {
                 state.visible = false;
             });
@@ -45351,26 +45298,15 @@ var script = /* @__PURE__ */ defineComponent({
                 prevFnError();
                 return Promise.reject();
             }).then(() => {
-                if (props.versionType == 1 || props.versionType == 3) {
-                    const params = props.strategy === "MULTI" ? getHisParams() : getOnceHisParams();
-                    const printFn = props.versionType == 1 ? "handleHisPrint" : "handleOldHisPrint";
-                    printInstance[printFn](8, params).then((res) => {
-                        console.log(res, 88888888);
-                    }).catch((error) => {
-                        console.log(error, "error888");
-                    });
-                }
-                else {
-                    const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
-                    const queryParams = {
-                        formatId: state.currentFormatId,
-                        templateId: getTemplateIdByFormatId(state.currentFormatId),
-                        params
-                    };
-                    printInstance.preview(queryParams, (res) => {
-                        callLocalServicesSuccessCb(res, "preview");
-                    }, callLocalServicesErrorCb);
-                }
+                const params = props.strategy === "MULTI" ? getPrintParams() : getOnceParams();
+                const queryParams = {
+                    formatId: state.currentFormatId,
+                    templateId: getTemplateIdByFormatId(state.currentFormatId),
+                    params
+                };
+                printInstance.preview(queryParams, (res) => {
+                    callLocalServicesSuccessCb(res, "preview");
+                }, callLocalServicesErrorCb);
             }).finally(() => {
                 state.visible = false;
             });
@@ -45380,18 +45316,7 @@ var script = /* @__PURE__ */ defineComponent({
                 prevFnError();
                 return Promise.reject();
             }).then(() => {
-                if (props.versionType == 1 || props.versionType == 3) {
-                    const params = props.strategy === "MULTI" ? getHisParams() : getOnceHisParams();
-                    const printFn = props.versionType == 1 ? "handleHisPrint" : "handleOldHisPrint";
-                    printInstance[printFn](9, params).then((res) => {
-                        console.log(res, 999999);
-                    }).catch((error) => {
-                        console.log(error, "error999");
-                    });
-                }
-                else {
-                    state.identityVerification.visible = true;
-                }
+                state.identityVerification.visible = true;
             }).finally(() => {
                 state.visible = false;
             });
@@ -45436,25 +45361,6 @@ var script = /* @__PURE__ */ defineComponent({
             let findDefault = list.find((item) => item[key] == 1);
             return findDefault?.id || list[0].id;
         };
-        const setOptions = () => {
-            const children = state.formatList.map((v) => {
-                return {
-                    label: v.name,
-                    key: v.id
-                };
-            });
-            options.unshift({
-                label: formatTitle.value,
-                key: "format",
-                children
-            });
-        };
-        const initHIS = (formatListResult) => {
-            state.formatList = formatListResult ? formatListResult.list.filter((item) => item.printmark == 1) : [];
-            setOptions();
-            state.currentFormatId = getDefaultFormatId(state.formatList, "printmark");
-            state.templateParams = state.formatList[0];
-        };
         const formatFormatList = (list) => {
             let formatList = [];
             list.forEach((item) => {
@@ -45518,7 +45424,7 @@ var script = /* @__PURE__ */ defineComponent({
         };
         const initCRM = async (formatListResult) => {
             state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
-            setOptions();
+            console.log("formatListResult", formatListResult);
             state.currentFormatId = getDefaultFormatId(state.formatList, "defaultFlag");
             if (!state.currentFormatId) {
                 window.$message.error("\u83B7\u53D6\u6253\u5370\u683C\u5F0F\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01");
@@ -45544,12 +45450,7 @@ var script = /* @__PURE__ */ defineComponent({
             setTimeoutSpin();
             instantiatePrintSDK();
             const formatListResult = await props.queryPrintFormatByNumber();
-            if (props.versionType == 1 || props.versionType == 3) {
-                initHIS(formatListResult);
-            }
-            else {
-                await initCRM(formatListResult);
-            }
+            await initCRM(formatListResult);
             setLoaded();
             return true;
         };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.0.4",
+  "version": "3.0.5",
   "main": "es/index.js",
   "module": "es/index.js",
   "scripts": {

package/packages/button-print/src/ButtonPrint.vue

@@ -58,17 +58,15 @@ interface Props {
   previewText?: string
   formatEditText?: string
   identityVerificationTitle?: string
-  params: any[],
-  hisParams: any
+  params?: any[],
   prevFn?: Function
   verifyUser?: Function
   queryPrintFormatByNumber: Function
   queryTemplateParams?: Function
   strategy?: string
-  versionType?: number | string
 }
 const props = withDefaults(defineProps<Props>(), {
-  // baseUrl: '',
+  params: () => ([]),
   btnText: '打印',
   printText: '直接打印',
   previewText: '打印预览',
@@ -79,7 +77,6 @@ const props = withDefaults(defineProps<Props>(), {
   queryPrintFormatByNumber: () => Promise.resolve({}),
   queryTemplateParams: () => Promise.resolve({}),
   strategy: 'MULTI',
-  versionType: '2'
 });
 const emit = defineEmits(['success', 'error']);
 
@@ -140,34 +137,6 @@ const prevFnError = () => {
   };
   emit('error', error);
 }
-const getHisParams = (index: number = 0) => {
-  const { reportid = '280' } = (props.hisParams as any);
-  const { id, name } = (state.templateParams as any);
-  return {
-    reportid,
-    formatid: state.currentFormatId || id,
-    formatname: name,
-    param: props.params[index]
-  };
-}
-const getOnceHisParams = () => {
-  const { reportid = '280' } = (props.hisParams as any);
-  const { id, name } = (state.templateParams as any);
-  const obj: any = {}
-  Object.keys((props.params as any)[0]).forEach(v => {
-    obj[v] = [];
-    props.params.forEach((k: any) => {
-      obj[v].push(k[v]);
-    });
-    obj[v] = obj[v].join(',');
-  });
-  return {
-    reportid,
-    formatid: state.currentFormatId || id,
-    formatname: name,
-    param: obj
-  };
-}
 const getPrintParams = (index: number = 0) => {
   const params = state.printParams[index];
   return JSON.stringify(params);
@@ -215,55 +184,30 @@ const handleClickPrint = () => {
       return Promise.reject();
     })
     .then(() => {
-      if (props.versionType == 1 || props.versionType == 3) {
-        const printFn = props.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
-        if (props.strategy === 'MULTI') {
-          for (let i = 0; i < props.params.length; i++) {
-            const params = getHisParams(i);
-            printInstance[printFn](7, params)
-              .then((res: any) => {
-                console.log(res, '777777777777');
-              })
-              .catch((error:any) => {
-                console.log(error, 'error777');
-              });
-          }
-        } else {
-          const params = getOnceHisParams();
-          printInstance[printFn](7, params)
-            .then((res: any) => {
-              console.log(res, '777777777777');
-            })
-            .catch((error:any) => {
-              console.log(error, 'error777');
-            });
-        }
-      } else {
-        if (props.strategy === 'MULTI') {
-          // 循环多条
-          for (let i = 0; i < state.printParams.length; i++) {
-            const queryParams = {
-              formatId: state.currentFormatId,
-              templateId: getTemplateIdByFormatId(state.currentFormatId),
-              params: getPrintParams(i)
-            };
-            printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
-          }
-        } else {
-          // 聚合一条
+      if (props.strategy === 'MULTI') {
+        // 循环多条
+        for (let i = 0; i < state.printParams.length; i++) {
           const queryParams = {
             formatId: state.currentFormatId,
             templateId: getTemplateIdByFormatId(state.currentFormatId),
-            params: getOnceParams()
+            params: getPrintParams(i)
           };
-          printInstance.printDirect(
-            queryParams,
-            (res: any) => {
-              callLocalServicesSuccessCb(res, 'print');
-            },
-            callLocalServicesErrorCb
-          );
+          printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
         }
+      } else {
+        // 聚合一条
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          params: getOnceParams()
+        };
+        printInstance.printDirect(
+          queryParams,
+          (res: any) => {
+            callLocalServicesSuccessCb(res, 'print');
+          },
+          callLocalServicesErrorCb
+        );
       }
     })
     .finally(() => {
@@ -277,31 +221,19 @@ const handleClickPreview = async () => {
       return Promise.reject();
     })
     .then(() => {
-      if (props.versionType == 1 || props.versionType == 3) {
-        const params = props.strategy === 'MULTI' ? getHisParams() : getOnceHisParams();
-        const printFn = props.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
-        printInstance[printFn](8, params)
-          .then((res: any) => {
-            console.log(res, 88888888);
-          })
-          .catch((error: any) => {
-            console.log(error, 'error888');
-          });
-      } else {
-        const params = props.strategy === 'MULTI' ? getPrintParams() : getOnceParams();
-        const queryParams = {
-          formatId: state.currentFormatId,
-          templateId: getTemplateIdByFormatId(state.currentFormatId),
-          params
-        };
-        printInstance.preview(
-          queryParams,
-          (res: any) => {
-            callLocalServicesSuccessCb(res, 'preview');
-          },
-          callLocalServicesErrorCb
-        );
-      }
+      const params = props.strategy === 'MULTI' ? getPrintParams() : getOnceParams();
+      const queryParams = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId(state.currentFormatId),
+        params
+      };
+      printInstance.preview(
+        queryParams,
+        (res: any) => {
+          callLocalServicesSuccessCb(res, 'preview');
+        },
+        callLocalServicesErrorCb
+      );
     })
     .finally(() => {
       state.visible = false;
@@ -314,19 +246,7 @@ const handleClickEdit = () => {
       return Promise.reject();
     })
     .then(() => {
-      if (props.versionType == 1 || props.versionType == 3) {
-        const params = props.strategy === 'MULTI' ? getHisParams() : getOnceHisParams();
-        const printFn = props.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
-        printInstance[printFn](9, params)
-          .then((res: any) => {
-            console.log(res, 999999);
-          })
-          .catch((error: any) => {
-            console.log(error, 'error999');
-          });
-      } else {
-        state.identityVerification.visible = true;
-      }
+      state.identityVerification.visible = true;
     })
     .finally(() => {
       state.visible = false;
@@ -383,12 +303,6 @@ const setOptions = () => {
     children
   })
 }
-const initHIS = (formatListResult: any) => {
-  state.formatList = formatListResult ? formatListResult.list.filter((item: any) => item.printmark == 1) : [];
-  setOptions();
-  state.currentFormatId = getDefaultFormatId(state.formatList, 'printmark');
-  state.templateParams = state.formatList[0];
-}
 const formatFormatList = (list: any[]): any => {
   let formatList: any[] = [];
 
@@ -459,7 +373,7 @@ const formatParams = ({ customizeDataset = [], param = [] }, params: any[] = [])
 }
 const initCRM = async (formatListResult: any) => {
   state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
-  setOptions();
+  console.log('formatListResult', formatListResult)
   state.currentFormatId = getDefaultFormatId(state.formatList, 'defaultFlag');
 
   if (!state.currentFormatId) {
@@ -488,11 +402,7 @@ const init = async () => {
 
   instantiatePrintSDK();
   const formatListResult = await props.queryPrintFormatByNumber()
-  if (props.versionType == 1 || props.versionType == 3) {
-    initHIS(formatListResult);
-  } else {
-    await initCRM(formatListResult);
-  }
+  await initCRM(formatListResult);
 
   setLoaded();