ci-plus 1.5.0 → 1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {
@@ -12,7 +12,7 @@
     "vue",
     "element-plus",
     "ui组件库二次封装",
-    "utils中新增一个文件下载的工具函数2"
+    "标识卡模板中将下道工序改为显示名称"
   ],
   "type": "module",
   "author": {

package/src/dailog/dialog.vue

@@ -4,6 +4,10 @@
 defineOptions({ name: 'ci-dialog' })
 import { ref, reactive } from 'vue'
 import { Close, FullScreen } from '@element-plus/icons-vue'
+import {
+  ElDialog,
+  ElButton,
+} from 'element-plus'
 import './style/index.less'
 //  接收fugure组件传值
 export interface Props {

package/src/fileRelated/ciupload.vue

@@ -39,7 +39,13 @@
 <script setup lang="ts">
 defineOptions({ name: 'ci-upload' })
 import { ref } from 'vue'
-import { ElMessage, ElLoading, genFileId } from 'element-plus'
+import {
+  ElMessage,
+  ElLoading,
+  genFileId,
+  ElButton,
+  ElPopover
+} from 'element-plus'
 import axios from 'axios'
 import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 const upload = ref<UploadInstance>()

package/src/fileRelated/seeFile.vue

@@ -31,7 +31,11 @@ defineOptions({ name: 'ci-seeFile' })
 import { ref, watch } from 'vue'
 import axios from 'axios'
 import apis from '../utils/baseApi'
-import { ElMessage } from 'element-plus'
+import {
+  ElMessage,
+  ElButton,
+  ElPopover
+} from 'element-plus'
 
 const props = defineProps({
   url: {
@@ -47,7 +51,7 @@ const props = defineProps({
 // 定义一个函数，用于处理字符串
 const setFilePath = (arr: string[], url?: string) => {
   // console.log('重新渲染数据', arr);
-  if (arr && arr.length > 0) {
+  if (arr && Array.isArray(arr) && arr.length > 0) {
     let newArr: { name: string; oldName: string }[] = []
     arr.forEach((item, i) => {
       let segments = item.split('.')
@@ -65,7 +69,7 @@ const setFilePath = (arr: string[], url?: string) => {
 
 // 将路径处理成附件的参数
 const fileArr = (url: string, pathArr: string[]) => {
-  if (pathArr && pathArr.length > 0) {
+  if (pathArr && Array.isArray(pathArr) && pathArr.length > 0) {
     let objArr: any = []
     if (pathArr.length > 0) {
       pathArr.map((item: any) => {

package/src/fileRelated/uploadV2.vue

@@ -83,7 +83,12 @@ const fileArr = (url: string, pathArr: string[]) => {
 }
 
 import { ref } from 'vue'
-import { ElMessage, ElLoading, genFileId } from 'element-plus'
+import {
+  ElMessage,
+  ElLoading,
+  ElButton,
+  ElPopover
+} from 'element-plus'
 import axios from 'axios'
 import type {
   UploadFile,

package/src/identificationCard/identificationCard.vue

@@ -1439,6 +1439,7 @@
 defineOptions({ name: 'ci-identificationCard' })
 import { ref, onMounted, nextTick, watch, computed } from 'vue'
 import barCode from './barCode.vue'
+import { ElButton,ElImage } from 'element-plus'
 import CiQrcode from './qrcode'
 // 导入 public/C&U.png 图片
 // import C_U from '@/assets/C&U.png'

package/src/queryCondition/src/index.vue

@@ -144,6 +144,12 @@
 defineOptions({ name: 'ci-query-condition' })
 import RenderComp from './renderComp.vue'
 import { computed, ref, watch, useSlots, onMounted, reactive, toRef } from 'vue'
+import {
+  ElButton,
+  ElForm,
+  ElFormItem,
+  ElIcon,
+} from 'element-plus'
 const props = defineProps({
   opts: {
     type: Object,

package/src/select/select.vue

@@ -57,6 +57,11 @@
 <script setup lang="ts">
 defineOptions({ name: 'ci-select' })
 import { computed, useSlots } from 'vue'
+import {
+  ElPagination,
+  ElCheckbox,
+  ElOption
+} from 'element-plus'
 const props: any = defineProps({
   modelValue: {
     type: [String, Number, Array]

package/src/selectSuffix/selectSuffix.vue

@@ -171,7 +171,21 @@
 <script setup lang="ts">
 import { reactive, h, ref, onMounted, watch } from 'vue'
 import { Operation, Search } from '@element-plus/icons-vue'
-import { ElMessage, ElTable } from 'element-plus'
+import {
+  ElMessage,
+  ElTable,
+  ElTableColumn,
+  ElSelectV2,
+  ElPagination,
+  ElIcon,
+  ElDialog,
+  ElRow,
+  ElCol,
+  ElButtonGroup,
+  ElTooltip,
+  ElButton,
+  ElInput
+} from 'element-plus'
 import axios from 'axios'
 import { SelectSuffix, Basic, AnyO } from './types'
 defineOptions({

package/src/selectTable/src/index.vue

@@ -152,7 +152,7 @@ defineOptions({ name: 'ci-select-table' })
 import TQueryCondition from '../../queryCondition/src/index.vue'
 import RenderCol from './renderCol.vue'
 import { computed, useAttrs, useSlots, ref, watch, nextTick, reactive, onMounted } from 'vue'
-import { ElMessage } from 'element-plus'
+import { ElMessage,ElInput,ElSelect,ElButton,ElTable,ElTableColumn,ElRadio,ElPagination } from 'element-plus'
 import ClickOutside from '../../utils/directives/click-outside/index'
 const props = defineProps({
   // input输入框的值（modelValue）

package/src/sortableTable/headerCheckBox.vue

@@ -31,7 +31,7 @@
 import { computed, ref } from 'vue'
 import headerPopover from './utils/headerPopover.vue'
 import filterIconVue from './utils/filterIcon.vue'
-import { TooltipTriggerType } from 'element-plus'
+import { TooltipTriggerType,ElCheckboxGroup,ElCheckbox } from 'element-plus'
 const props = defineProps<{
   text?: string
   initValue?: string

package/src/sortableTable/headerInput.vue

@@ -169,8 +169,7 @@ import SvgIcon from '../svgIcon/svgicon.vue'
 import { computed, ref, watch, PropType, onMounted } from 'vue'
 import lodash, { debounce } from 'lodash-es'
 import headerPopover from './utils/headerPopover.vue'
-import filterIconVue from './utils/filterIcon.vue'
-import { TooltipTriggerType } from 'element-plus'
+import { TooltipTriggerType,ElSelect,ElOption,ElInput,ElSelectV2,ElPagination,ElDatePicker } from 'element-plus'
 
 // 定义 props 的类型
 interface SelectConfig {

package/src/sortableTable/headerRange.vue

@@ -59,7 +59,7 @@
 import { computed, ref } from 'vue'
 import headerPopover from './utils/headerPopover.vue'
 import filterIconVue from './utils/filterIcon.vue'
-import { TooltipTriggerType } from 'element-plus'
+import { TooltipTriggerType, ElInput, ElDatePicker } from 'element-plus'
 import { Shortcuts } from './utils/dateShortcuts'
 type InputConfig = {
   placeholder?: string

package/src/sortableTable/headerSelectV2.vue

@@ -44,9 +44,8 @@
 import SvgIcon from '@/components/SvgIcon.vue'
 import { computed, ref } from 'vue'
 import headerPopover from './utils/headerPopover.vue'
-import filterIconVue from './utils/filterIcon.vue'
+import { TooltipTriggerType, ElSelectV2   } from 'element-plus'
 import { Props } from 'element-plus/es/components/select-v2/src/useProps'
-import { TooltipTriggerType } from 'element-plus'
 import { useWeighingStore } from '@/store/Weighing'
 import { removeParamsFilters } from './utils/removeParamsFilters'
 const store = useWeighingStore()

package/src/sortableTable/sortableTable.vue

@@ -22,7 +22,7 @@
 </template>
 <script setup lang="ts">
 defineOptions({ name: 'ci-table' })
-import { CellCls, ElTable } from 'element-plus'
+import { CellCls, ElTable  } from 'element-plus'
 import Sortable from 'sortablejs'
 import { VNode, computed, ref } from 'vue'
 import { SortableTableIns, SortColumn } from './utils/interface'

package/src/sortableTable/sortableTableDialog.vue

@@ -52,6 +52,7 @@ import { SortableTableDialog } from './utils/interface'
 import sortableTableDragItem from './utils/sortableTableDragItem.vue'
 import { Rank } from '@element-plus/icons-vue'
 import SvgIcon from '../svgIcon/svgicon.vue'
+import { ElDialog,ElButton,ElTooltip,ElIcon,ElPopover } from 'element-plus'
 
 const emits = defineEmits(['update:modelValue', 'update:data', 'submit'])
 const state = ref(false)

package/src/sortableTable/utils/headerPopover.vue

@@ -12,7 +12,7 @@
     <template #reference>
       <slot name="reference" :open="open" :close="close" :toggle="toggle" />
     </template>
-    <div style="display: flex; align-items: center; justify-content: center" v-loading="loading">
+    <div style="display: flex; align-items: center; justify-content: center" >
       <div style="flex-grow: 1">
         <slot :closeF="close" />
       </div>
@@ -39,7 +39,7 @@
 
 <script setup lang="ts">
 import { onMounted, ref } from 'vue'
-import { ElPopover, TooltipTriggerType } from 'element-plus'
+import { ElPopover,ElButton, TooltipTriggerType } from 'element-plus'
 const popoverRef = ref<InstanceType<typeof ElPopover>>()
 const props = defineProps<{
   popperStyle: any // el-popover的自定义样式

package/src/sortableTable/utils/sortableTableColumnCell.vue

@@ -55,6 +55,7 @@
 defineOptions({ name: 'ci-columncell' })
 import { Scope, SortColumn } from './interface'
 import { h } from 'vue'
+import { ElTableColumn} from 'element-plus'
 
 const props = defineProps<{
   data: SortColumn

package/src/sortableTable/utils/sortableTableDragItem.vue

@@ -47,6 +47,7 @@
 <script setup lang="ts">
 import SvgIcon from '../../svgIcon/index'
 import { computed } from 'vue'
+import { ElInput, ElButton , ElIcon} from 'element-plus'
 // import draggable from 'vuedraggable'
 import { VueDraggable } from 'vue-draggable-plus'
 import { SortColumn, SortableTableIns } from './interface'

package/src/utils/ajaxBox.ts

@@ -59,13 +59,29 @@ const downFileFn = function (blob: Blob | BlobPart, fileName: string) {
 
 }
 
+type Obj = {
+  [key: string]: any
+}
 const ajaxBox = {
   downFile: function (blob: Blob | BlobPart, fileName: string) {
     downFileFn(blob, fileName);
   },
 
   // 下载文件
-  downFileFetch: function (fillAddress, fileName, method, headers, params, cbpercentage) {
+  /**
+   * 下载文件函数
+   * @param fillAddress string 表示服务端接口url地址
+   * @param fileName string 下载后的文件名
+   * @param method  string  如果不想写get呢，你就写个null，但是你得写进去
+   * @param headers Object  请求头
+   * @param params  Object  请求参数
+   * 将给定的blob对象转换为文件，并提供一个下载链接以供用户下载。
+   * 如果blob对象是JSON格式，则尝试解析为JavaScript对象，并显示相应的错误消息。
+   * 如果解析失败，则直接以原始格式下载blob对象。
+   */
+
+
+  downFileFetch: function (fillAddress: string, fileName: string, method: string, headers: Obj, params: Obj, cbpercentage: Function) {
     let options = {
       method: method || 'GET',
     }
@@ -138,6 +154,7 @@ const ajaxBox = {
         readBlobInChunks()
       })
   }
+
   /*
     sendJSONP: function (url, callbackName, callback) {
       const script = document.createElement('script');
@@ -162,3 +179,30 @@ const ajaxBox = {
 
 }
 export default ajaxBox;
+
+
+/**
+ * 使用下载示例
+const exportFile = () => {
+  let rowData = InventoryTableRef.value!.getSelectionRows()
+
+  const url = storageModule + 'storage_standing_book_batch_export_get/'
+  const headers = {
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+  }
+  const params = {
+    ids: JSON.stringify(rowData.map((v: { id: any }) => v.id)),
+    state: 1,
+    org_id: UserData.orgId,
+    storage_type: 'CAILIAO',
+  }
+
+  CiPlus.Fn.ajaxBox.downFileFetch(
+    url,
+    '材料库_库存台账数据.xlsx',
+    'GET',
+    headers,
+    params,
+  )
+}
+ */

package/src/utils/cardPrint.ts

@@ -171,7 +171,7 @@ export const cardPrint = (
             r5c4: item.card_code, // 标识卡号
             r6c2: item.center_data[0]?.tail_reason, // 尾料原因
             r7c2: item.process_name, // 本工序
-            r7c4: item.next_process_code, // 下工序
+            r7c4: item.next_process_name, // 下工序
             r8c2: item.current_inventory, // 本箱数量
             r8c4: item.opt_user_name, // 操作工/自检员
             r9c2: item.center_data[0]?.inspector, // 检验员
@@ -632,7 +632,7 @@ export const cardPrint = (
             r50c3: '本工序',
             r50c4: item.process_name,
             r51c1: '下工序',
-            r51c2: item.next_process_code,
+            r51c2: item.next_process_name,
             r51c3: '本箱数量',
             r51c4: item.current_inventory,
             r52c1: '操作员',

package/src/sortableTable/utils/sortableTableColumnCell2.vue

@@ -1,70 +0,0 @@
-<!-- /*
-* @module sortableTableColumnCell
-* @author : 杨佳贺&卖女孩的小火柴
-* @description : 表格列单元格
-* @version : 1.0.0
-* @since : 创建时间 2023-12-29 13:40:49
-* @lastTime : 2023-12-29 新增默认居中显示属性
-* @lastTime : 2024-01-03 新增默认超出隐藏悬停显示、拖拽改变列宽
-*/ -->
-
-<template>
-  <el-table-column v-if="!data.hide && data.children" v-bind="data.col">
-    <sortable-table-column-cell v-for="v in data.children || []" :key="v.key" :data="v" />
-  </el-table-column>
-  <el-table-column
-    v-else-if="!data.hide && data.scope"
-    v-bind="data.col"
-    :align="data.col.align || 'center'"
-    :showOverflowTooltip="data.col.showOverflowTooltip || true"
-    :resizable="data.col.resizable || true"
-  >
-    <template #default="scope">
-      {{ data.scope(scope) }}
-    </template>
-    <template #header="header">
-      <component :is="headerVue(header)" :header="header"></component>
-    </template>
-  </el-table-column>
-  <el-table-column
-    v-else-if="!data.hide && data.component"
-    v-bind="data.col"
-    :align="data.col.align || 'center'"
-    :showOverflowTooltip="data.col.showOverflowTooltip || true"
-    :resizable="data.col.resizable || true"
-  >
-    <template #default="scope">
-      <component :is="data.component(h, scope)" :scope="scope"></component>
-    </template>
-    <template #header="header">
-      <component :is="headerVue(header)" :header="header"></component>
-    </template>
-  </el-table-column>
-  <el-table-column
-    v-else-if="!data.hide"
-    v-bind="data.col"
-    :align="data.col.align || 'center'"
-    :showOverflowTooltip="data.col.showOverflowTooltip || true"
-    :resizable="data.col.resizable || true"
-  >
-    <template #header="header">
-      <component :is="headerVue(header)" :header="header"></component>
-    </template>
-  </el-table-column>
-</template>
-<script setup lang="ts">
-import { Scope, SortColumn } from './interface'
-import { h } from 'vue'
-defineOptions({ name: 'ci-columncell' })
-
-const props = defineProps<{
-  data: SortColumn
-}>()
-const headerVue = (header: Pick<Scope<any>, '$index' | 'column'>) => {
-  const item = props.data.header?.(h, header)
-  if (!item) return h('div', props.data.col.label)
-  if (typeof item === 'string') return h('div', item)
-  return item
-}
-</script>
-<style scoped></style>

package/src/sortableTable/utils/sortableTableDragItem2.vue

@@ -1,196 +0,0 @@
-<!-- 2023-12-29 新增显示/隐藏按钮 -->
-
-<template>
-  <!-- <vue-draggable
-    class="drag-container"
-    :list="modelValue"
-    chosen-class="hover"
-    handle=".mover"
-    draggable=".item"
-    itemKey="key"
-  > -->
-  <vue-draggable
-    class="drag-container"
-    v-model="modelValue"
-    chosen-class="hover"
-    handle=".mover"
-    draggable=".item"
-    itemKey="key"
-  >
-    <!-- <template #item="{ element, index }: { element: SortColumn; index: number }">
-      <div :class="{ item: true, 'item-hide': element.hide }">
-        <div class="mover">
-          <el-icon :size="16"><Rank /></el-icon>
-        </div>
-        <div class="title" @click="handleShow(element)">
-          {{ element.col.label }}
-        </div>
-        <div class="pin" v-if="showPin">
-          <span
-            v-if="element.col.fixed === true || element.col.fixed === 'left'"
-            @click="element.col.fixed = void 0"
-          >
-            <svg-icon name="regular-left" size="20" color="#2C93FF"></svg-icon>
-          </span>
-          <span v-else @click="element.col.fixed = 'left'">
-            <svg-icon name="regular-center" size="20"></svg-icon>
-          </span>
-          <span v-if="element.col.fixed === 'right'" @click="element.col.fixed = void 0">
-            <svg-icon name="regular-right" size="20" color="#2C93FF"></svg-icon>
-          </span>
-          <span v-else @click="element.col.fixed = 'right'">
-            <svg-icon name="regular-center" size="20"></svg-icon>
-          </span>
-        </div>
-        <div class="ifshow">
-          <el-button
-            :type="element.hide ? 'primary' : ''"
-            @click="handleShow(element)"
-            size="small"
-          >
-            {{ element.hide ? '显示' : '隐藏' }}
-          </el-button>
-        </div>
-        <div class="widths">
-          宽度：
-          <el-input class="w-50 m-2" v-model="element.col.width" size="small" width="50"></el-input>
-        </div>
-        <sortable-table-drag-item v-if="element.children" v-model="element.children" />
-      </div>
-    </template> -->
-    <div v-for="(element, index) in modelValue" :class="{ item: true, 'item-hide': element.hide }">
-      <div class="mover">
-        <el-icon :size="16"><Rank /></el-icon>
-      </div>
-      <div class="title" @click="element.hide = !element.hide">
-        {{ element.col.label }}
-      </div>
-      <div class="pin" v-if="showPin">
-        <!-- <span v-if="element.col.fixed === true || element.col.fixed === 'left'" @click="element.col.fixed = void 0">
-          <var-icon name="pin-off" :size="16" style="transform: rotate(-30deg); color: cadetblue" />
-        </span>
-        <span v-else @click="element.col.fixed = 'left'">
-          <var-icon name="pin" :size="16" style="transform: rotate(-30deg)" />
-        </span>
-        <span v-if="element.col.fixed === 'right'" @click="element.col.fixed = void 0">
-          <var-icon name="pin-off" :size="16" style="transform: scaleX(-1) rotate(-30deg); color: cadetblue" />
-        </span>
-        <span v-else @click="element.col.fixed = 'right'">
-          <var-icon name="pin" :size="16" style="transform: rotate(30deg)" />
-        </span> -->
-        <span
-          v-if="element.col.fixed === true || element.col.fixed === 'left'"
-          @click="element.col.fixed = void 0"
-        >
-          <svg-icon name="regular-left" size="20" color="#2C93FF"></svg-icon>
-        </span>
-        <span v-else @click="element.col.fixed = 'left'">
-          <svg-icon name="regular-center" size="20"></svg-icon>
-        </span>
-        <span v-if="element.col.fixed === 'right'" @click="element.col.fixed = void 0">
-          <svg-icon name="regular-right" size="20" color="#2C93FF"></svg-icon>
-        </span>
-        <span v-else @click="element.col.fixed = 'right'">
-          <svg-icon name="regular-center" size="20"></svg-icon>
-        </span>
-      </div>
-      <div class="ifshow">
-        <el-button :type="element.hide ? 'primary' : ''" @click="handleShow(element)" size="small">
-          {{ element.hide ? '显示' : '隐藏' }}
-        </el-button>
-      </div>
-      <div class="widths">
-        宽度：
-        <el-input class="w-50 m-2" v-model="element.col.width" size="small" width="50"></el-input>
-      </div>
-      <sortable-table-drag-item v-if="element.children" v-model="element.children" />
-    </div>
-  </vue-draggable>
-</template>
-<script setup lang="ts">
-import SvgIcon from '../../svgIcon/index'
-import { computed } from 'vue'
-// import draggable from 'vuedraggable'
-import { VueDraggable } from 'vue-draggable-plus'
-import { SortColumn, SortableTableIns } from './interface'
-import { Rank } from '@element-plus/icons-vue'
-const props = defineProps<{
-  modelValue: SortableTableIns['modelValue']
-  showPin?: boolean
-}>()
-const emits = defineEmits(['update:modelValue', 'update:data'])
-const modelValue = computed({
-  get() {
-    return props.modelValue
-  },
-  set(value) {
-    emits('update:modelValue', value)
-  }
-})
-
-// 显示或者隐藏列
-const handleShow = (col: SortColumn) => {
-  // console.log('显示或者隐藏列', col)
-  col.hide = !col.hide
-}
-</script>
-<style scoped lang="scss">
-$hoverBC: rgba(137, 182, 233, 0.5);
-
-.drag-container {
-  // display: flex;
-  width: 100%;
-  flex-direction: column;
-
-  .item {
-    border: 1px solid #f2f2f2;
-    display: flex;
-    align-items: center;
-    white-space: nowrap;
-    width: 100%;
-    .mover,
-    .title {
-      padding: 5px;
-      cursor: pointer;
-      &:hover {
-        background: $hoverBC;
-      }
-    }
-    .title {
-      width: 150px;
-      border-left: 1px solid #f2f2f2;
-      border-right: 1px solid #f2f2f2;
-      overflow: hidden;
-    }
-    .pin {
-      cursor: pointer;
-      > *:hover {
-        background: $hoverBC;
-      }
-      > * {
-        padding: 5px;
-      }
-    }
-    .ifshow {
-      text-align: center;
-      flex: 1;
-      line-height: 32px;
-      .el-button {
-        margin-bottom: 0;
-      }
-    }
-    .widths {
-      .el-input {
-        width: 50px !important;
-        margin-right: 20px;
-      }
-    }
-  }
-  .item-hide {
-    background: rgba(218, 218, 218, 0.5);
-  }
-  .hover {
-    background: $hoverBC;
-  }
-}
-</style>