ci-plus 1.9.0 → 1.9.1

package/README.md

@@ -1,6 +1,8 @@
 ## 历史更新
 
 ```js
+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.1",
   "description": "ci组件库",
   "main": "./index.ts",
   "scripts": {

package/src/fileRelated/uploadV5.vue

@@ -306,13 +306,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)
@@ -439,6 +458,7 @@ onMounted(async () => {
   // 判断是否默认选中归属公司
   if (ifDefaultAffiliation.value) {
     affiliationAll.value = defaultAffiliationOrgid.value
+    datas.value.factory_affiliation_id = defaultAffiliationOrgid.value
   }
 })
 </script>