ci-plus 1.9.0 → 1.9.2

package/README.md

@@ -1,6 +1,10 @@
 ## 历史更新
 
 ```js
+1.9.2
+  1、优化uploadV5.vue组件
+1.9.1
+  1、优化uploadV5.vue组件
 1.9.0
   1、uploadV4.vue组件基础上，新增uploadV5.vue组件(新增功能：配置默认选中归属公司选项)
 1.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-plus",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {

package/src/fileRelated/uploadV5.vue

@@ -179,7 +179,7 @@ interface Props {
   ifShowWarehouse?: boolean // 是否显示仓库
   requiredWarehouse?: boolean // 是否必选仓库
   ifDefaultAffiliation?: boolean // 是否默认选中归属工厂默认值true
-  defaultAffiliationOrgid?: string // 默认选中归属工厂的 orgid(默认值当前登陆账号的单位)
+  defaultAffiliation?: { orgid: string; orgname: string } // 默认选中归属工厂的 orgid(默认值当前登陆账号的单位)
   filePath?: UploadFile[] //UploadRawFile[] // 父组件传递的附件数据，用于显示附件列表和上传附件后传递给父组件附件数据
   RowIndex?: number // 父组件传递的行索引，用于父组件中删除了附件找到对应的行(用于表格表单中上传附件)
   templateName?: string //模板名称
@@ -226,8 +226,13 @@ const ifDefaultAffiliation = computed(() => {
 // 获取本地缓存中当前登陆账号的公司
 const raw = localStorage.getItem('UserData')
 const UserData = raw ? JSON.parse(raw) : {}
-const defaultAffiliationOrgid = computed(() => {
-  return props.defaultAffiliationOrgid || UserData?.resOrgId // 默认登陆账号的单位
+const defaultAffiliation = computed<{ orgid: string; orgname: string }>(() => {
+  return (
+    props.defaultAffiliation || {
+      orgid: UserData?.resOrgId || '',
+      orgname: UserData?.resOrgName || ''
+    }
+  ) // 默认登陆账号的单位
 })
 
 const emits = defineEmits<{
@@ -306,13 +311,32 @@ const submitUpload = () => {
   if (!fileList.value || !fileList.value.length) {
     return ElMessage.warning(t('fileRelated.pleaseFile'))
   }
+
+  // 判断是否归属公司必选并且选择了值
+  console.log(
+    '%c Line:312 🍤 判断',
+    'color:#33a5ff',
+    requiredAffiliation.value && !datas.value.factory_affiliation_id,
+    requiredAffiliation.value,
+    datas.value.factory_affiliation_id
+  )
   console.log(fileList.value.length)
-  if (!datas.value.warehouse_id && requiredWarehouse.value) {
-    return ElMessage.warning(t('fileRelated.pleaseSelectWarehouse'))
-  }
+  console.log(
+    '%c Line:312 🍤 判断',
+    'color:#33a5ff',
+    requiredAffiliation.value && !datas.value.factory_affiliation_id,
+    requiredAffiliation.value,
+    datas.value.factory_affiliation_id
+  )
+  console.log('%c Line:312 🍎 选中归属公司', 'color:#ed9ec7', datas.value.factory_affiliation_id)
+  console.log('%c Line:319 🍔 必填', 'color:#93c0a4', requiredAffiliation.value)
   if (!datas.value.factory_affiliation_id && requiredAffiliation.value) {
     return ElMessage.warning(t('fileRelated.selectCompany'))
   }
+  // 判断 出库是否必填 并且选择了值
+  if (!datas.value.warehouse_id && requiredWarehouse.value) {
+    return ElMessage.warning(t('fileRelated.pleaseSelectWarehouse'))
+  }
   // exporLoading.value = ElLoading.service({ text: t('fileRelated.importing') })
   exporLoading.value = true
   console.log('upload.value', upload.value)
@@ -438,7 +462,9 @@ onMounted(async () => {
 
   // 判断是否默认选中归属公司
   if (ifDefaultAffiliation.value) {
-    affiliationAll.value = defaultAffiliationOrgid.value
+    affiliationAll.value = defaultAffiliation.value.orgid // 下拉框赋值
+    datas.value.factory_affiliation_id = defaultAffiliation.value.orgid // 赋值给表单
+    datas.value.factory_affiliation_name = defaultAffiliation.value.orgname // 赋值给表单
   }
 })
 </script>