Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/components/Annex/src/Annex.vue

@@ -3,10 +3,7 @@
   <div class="annex">
     <div class="title flex items-center">
       <div class="title-txt">附件</div>
-      <el-button type="primary" @click="handleImport">
+      <UploadFile :isShowFile="false" :isShowTip="false" title="添加附件"/>
-        <Icon icon="ep:upload" />
-        添加附件
-      </el-button>
     </div>
     <div class="list">
       <div class="item flex items-start" v-for="(item, index) in data.annexList" :key="index">
@@ -28,6 +25,7 @@
 </template>
 
 <script lang="ts" setup>
+import UploadFile from '@/components/UploadFile/src/UploadFile.vue'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 defineComponent({

src/components/Form/src/helper.ts

@@ -21,6 +21,8 @@ export const setTextPlaceholder = (schema: FormSchema): PlaceholderModel => {
   }
   if (selectMap.includes(schema?.component as string)) {
     // 一些范围选择器
+    console.log('type=' +schema?.componentProps?.type);
+    
     const twoTextMap = ['datetimerange', 'daterange', 'monthrange', 'datetimerange', 'daterange']
     if (
       twoTextMap.includes(

src/components/ImportForm/src/ImportForm.vue

@@ -1,7 +1,7 @@
 <!-- 导入组件 -->
 <template>
   <Dialog v-model="dialogVisible" title="导入" width="600">
-    <el-upload ref="uploadRef" v-model:file-list="fileList" :action="importUrl + '?updateSupport=' + updateSupport"
+      <el-upload ref="uploadRef"  v-model:file-list="fileList" :action="importUrl + '?mode=' + mode + '&file=' + file + '&updatePart=' + updatePart"
       :auto-upload="false" :disabled="formLoading" :headers="uploadHeaders" :limit="1" :on-error="submitFormError"
       :on-exceed="handleExceed" :on-success="submitFormSuccess" :accept="accept" drag
       style="width:300px;margin:0 auto">
@@ -13,7 +13,7 @@
             <div class="label h-32px mr-26px color-#acaeb3 font-size-14px" style="line-height:32px">导入模式</div>
             <div class="">
               <div class="radio">
-                <el-radio-group v-model="updateSupport">
+                <el-radio-group v-model="mode">
                   <el-radio :label="1" :disabled="updateIsDisable">更新</el-radio>
                   <el-radio :label="2" :disabled="appendIsDisable">追加</el-radio>
                   <el-radio :label="3" :disabled="coverIsDisable">覆盖</el-radio>
@@ -31,7 +31,7 @@
             <div class="label h-32px mr-26px color-#acaeb3 font-size-14px" style="line-height:32px">部分保存</div>
             <div class="">
               <div class="switch">
-                <el-switch v-model="isSaveAll" />
+                <el-switch v-model="updatePart" />
               </div>
 
               <div class="tips color-#acaeb3 font-size-14px">
@@ -62,6 +62,7 @@
 // import * as UserApi from '@/api/system/user'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import download from '@/utils/download'
+import { log } from 'console'
 
 defineOptions({ name: 'ImportForm' })
 
@@ -74,6 +75,7 @@ const importUrl =
   import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
+const file = ref('')
 
 
 
@@ -89,7 +91,7 @@ const fileList = ref([]) // 文件列表
     default:'.xlsx,.xls'
   },
   // 是否更新已经存在的用户数据.默认值是1
-  updateSupport: {
+  mode: {
     type: Number,
     required: false,
     default: 1
@@ -113,18 +115,19 @@ const fileList = ref([]) // 文件列表
     default: false
   },
   // 是否部门保存,默认是
-  isSaveAll: {
+  updatePart: {
     type: Boolean,
     required: false,
     default: true
   },
 })
-const { importTemplateData, accept } = toRefs(props)
+const importTemplateData= ref(props.importTemplateData)
-const  updateSupport = ref(props.updateSupport)//是否更新已经存在的用户数据.默认值是1
+const  accept= ref(props.accept)
+const  mode = ref(props.mode)//是否更新已经存在的用户数据.默认值是1
 const updateIsDisable = ref(props.updateIsDisable)//更新是否禁用,默认值不禁用
 const appendIsDisable = ref(props.appendIsDisable)//追加是否禁用,默认值不禁用
 const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值不禁用
-const isSaveAll = ref(props.isSaveAll)//是否部门保存
+const updatePart = ref(props.updatePart)//是否部门保存
 
 /** 打开弹窗 */
 const open = () => {
@@ -135,10 +138,12 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const submitForm = async () => {
+  
   if (fileList.value.length == 0) {
     message.error('请上传文件')
     return
   }
+  file.value = fileList.value[0].name
   // 提交请求
   uploadHeaders.value = {
     Authorization: 'Bearer ' + getAccessToken(),
@@ -171,8 +176,10 @@ const submitFormSuccess = (response: any) => {
     text += '< ' + username + ': ' + data.failureUsernames[username] + ' >'
   }
   message.alert(text)
+  
   // 发送操作成功的事件
   emits('success')
+  dialogVisible.value = false
 }
 
 /** 上传错误提示 */
@@ -195,8 +202,8 @@ const handleExceed = (): void => {
 
 /** 下载模板操作 */
 const importTemplate = () => {
-  const res = importTemplateData.templateUrl
+  const res = importTemplateData.value.templateUrl
-  download.excel(res, importTemplateData.templateTitle)
+  download.excel(res, importTemplateData.value.templateTitle)
 }
 </script>
 

src/components/UploadFile/src/UploadFile.vue

@@ -20,15 +20,19 @@
       :on-preview="handlePreview"
       class="upload-file-uploader"
     >
-      <el-button type="primary"><Icon icon="ep:upload-filled" />选取文件</el-button>
+      <el-button type="primary"><Icon icon="ep:upload-filled" />{{ title }}</el-button>
       <template v-if="isShowTip" #tip>
-        <div style="font-size: 8px">
+        <div style="font-size: 8px;margin-top: 10px;">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
         <div style="font-size: 8px">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
       </template>
+      <template  v-if="!isShowFile" #file >
+          <div>
+          </div>
+        </template>
     </el-upload>
   </div>
 </template>
@@ -56,13 +60,15 @@ const props = defineProps({
   limit: propTypes.number.def(5), // 数量限制
   autoUpload: propTypes.bool.def(true), // 自动上传
   drag: propTypes.bool.def(false), // 拖拽上传
-  isShowTip: propTypes.bool.def(true) // 是否显示提示
+  isShowTip: propTypes.bool.def(true), // 是否显示提示
+  isShowFile: propTypes.bool.def(true), // 是否显示上传的文件
+  
 })
 // ========== 上传相关 ==========
 const valueRef = ref(props.modelValue)
 const uploadRef = ref<UploadInstance>()
 const uploadList = ref<UploadUserFile[]>([])
-const fileList = ref<UploadUserFile[]>(props.modelValue)
+const fileList = props.modelValue && props.modelValue.length > 0 ? ref<UploadUserFile[]>(props.modelValue) : ref<UploadUserFile[]>([])
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
@@ -148,7 +154,7 @@ const listToString = (list: UploadUserFile[], separator?: string) => {
 
 :deep(.upload-file-list .el-upload-list__item) {
   position: relative;
-  margin-bottom: 10px;
+  // margin-bottom: 10px;
   line-height: 2;
   border: 1px solid #e4e7ed;
 }

src/types/components.d.ts

@@ -37,6 +37,7 @@ export type ColProps = {
 
 export type ComponentOptions = {
   label?: string
+  type?: string
   value?: FormValueType
   disabled?: boolean
   key?: string | number

src/utils/disposition/tableColumns.ts

@@ -42,11 +42,15 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     dictType: DICT_TYPE.ITEM_STATUS,
     dictClass: 'string',
+    isForm: true,
     isSearch: true,
     isTable: true,
     table: {
       width: 100
-    } 
+    } ,
+    form: {
+      component: 'Select',
+    }
   },
   {
     label: '计量单位',
@@ -82,7 +86,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
-    } 
+    },
+    form: {
+      component: 'Switch',
+    }
   },
   {
     label: '可采购',
@@ -94,7 +101,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 100
-    } 
+    },
+    form: {
+      component: 'Radio',
+    }
   },
   {
     label: '可制造',
@@ -106,7 +116,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 100
-    } 
+    } ,
+    form: {
+      component: 'Radio',
+    }
   },
   {
     label: '可委外加工',
@@ -118,7 +131,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
-    } 
+    } ,
+    form: {
+      component: 'Radio',
+    }
   },
   {
     label: '回收件',
@@ -130,7 +146,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 100
-    } 
+    },
+    form: {
+      component: 'Radio',
+    }
   },
   {
     label: '虚零件',
@@ -142,7 +161,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 100
-    } 
+    } ,
+    form: {
+      component: 'Radio',
+    }
   },
   {
     label: 'ABC类',
@@ -242,7 +264,11 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 120
-    }  },
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
   {
     label: '是否可用',
     field: 'available',
@@ -253,7 +279,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
-    } 
+    },
+    form: {
+      component: 'Radio',
+    }
   },
   {
     label: '生效时间',
@@ -266,7 +295,14 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
     table: {
       width: 120
-    } 
+    } ,
+    form: {
+      component: 'TimePicker',
+      componentProps: {
+        type: 'datetimerange',
+      // disabled:true,
+      }
+    }
   },
   {
     label: '失效时间',
@@ -279,7 +315,12 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
     table: {
       width: 120
-    } 
+    } ,
+    form: {
+      component: 'TimePicker',
+      // valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      // format: 'YYYY-MM-DD HH:mm:ss',
+    }
   },
   {
     label: '创建时间',

src/views/system/user/UserImportForm.vue

@@ -127,6 +127,8 @@ const handleExceed = (): void => {
 
 /** 下载模板操作 */
 const importTemplate = async () => {
+  console.log(await UserApi.importUserTemplate());
+  
   const res = await UserApi.importUserTemplate()
   download.excel(res, '用户导入模版.xls')
 }

src/views/wms/itembasic/ItembasicDetail.vue

@@ -109,22 +109,26 @@ const changeRecordData = reactive({
   }]
 })
 const detailData = ref("")//详情数据
-onMounted(async () => {
-  // 获取详情
-  detailData.value = await getItembasic(query.id)
-})
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
-  templateUrl: UserApi.importUserTemplate(),
+  templateUrl: '',
   templateTitle: '导入模版99.xls'
 })
+onMounted(async () => {
+  // 获取详情
+  detailData.value = await getItembasic(query.id)
+  importTemplateData.templateUrl = await UserApi.importUserTemplate()
+})
+
 // 导入成功之后
 const importSuccess = () => {
 
+
 }
 /** 搜索按钮操作 */
 const handleQuery = () => {
 
+  importFormRef.value.open()
 }
 
 /** 重置按钮操作 */
@@ -163,9 +167,7 @@ const current = ref(0)
 const { tableObject, tableMethods } = useTable({
   getListApi: ItembasicApi.getItembasicPage // 分页接口
 })
-console.log(tableObject);
 const change = (item, index) => {
-  console.log(item);
   current.value = index
 }
 

src/views/wms/itembasic/ItembasicForm.vue

@@ -1,19 +1,15 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
-     <Form ref="formRef" v-loading="formLoading" :rules="ItemBasicRules" :schema="ItemBasic.allSchemas.formSchema"  :is-col="true"/>
+      <Form ref="formRef" v-loading="formLoading" :rules="ItemBasicRules" :schema="ItemBasic.allSchemas.formSchema" :model="formData"
-    
+        :is-col="true" />
-  </div>
+
+    </div>
     <template #footer>
-      <!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <!-- 列表头部 -->
-      <el-button @click="dialogVisible = false">取 消</el-button> -->
+      <TableHead :HeadButttondata="Butttondata" @buttonBaseClick="buttonBaseClick" />
-        <!-- 列表头部 -->
-    <TableHead
-      :HeadButttondata="Butttondata" 
-      @buttonBaseClick="buttonBaseClick"
-    />
     </template>
-    
+
   </Dialog>
 </template>
 <script setup lang="ts">
@@ -21,6 +17,7 @@ import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { ItemBasic, ItemBasicRules } from '@/utils/disposition/tableColumns.ts'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { log } from 'console'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -28,6 +25,7 @@ const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref('')
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 
@@ -38,14 +36,16 @@ const open = async (type: string, id?: number) => {
   formType.value = type
   resetForm()
   // 修改时，设置数据
-  // if (id) {
+  if (id) {
-  //   formLoading.value = true
+    formLoading.value = true
-  //   try {
+    try {
-  //     formData.value = await ItembasicApi.getItembasic(id)
+      const data = await ItembasicApi.getItembasic(id)
-  //   } finally {
+      formRef.value.setValues(data)
-  //     formLoading.value = false
+      
-  //   }
+    } finally {
-  // }
+      formLoading.value = false
+    }
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -126,7 +126,4 @@ const buttonBaseClick = (val, item) => {
 }
 
 </script>
-<style scoped>
+<style scoped></style>
-
-
-</style>