ci-plus 1.9.1 → 1.9.3

package/README.md

@@ -1,6 +1,10 @@
 ## 历史更新
 
 ```js
+1.9.3
+  1、优化uploadV5.vue组件添加必填标识
+1.9.2
+  1、优化uploadV5.vue组件添加归属公司默认选中的orgname
 1.9.1
   1、优化uploadV5.vue组件
 1.9.0

package/package.json

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

package/src/fileRelated/uploadV5.vue

@@ -44,7 +44,10 @@
     </el-upload>
 
     <div class="slot" style="display: flex; flex-direction: column; align-items: flex-end">
-      <div style="width: 100%; margin: 4px 2px" v-if="ifShowAffiliation">
+      <div style="width: 100%; margin: 4px 2px; display: flex" v-if="ifShowAffiliation">
+        <span style="line-height: 30px; color: red; margin-right: 4px" v-if="requiredAffiliation"
+          >*</span
+        >
         <el-select-v2
           size="small"
           v-model="affiliationAll"
@@ -56,7 +59,10 @@
           @change="changeAll"
         />
       </div>
-      <div style="width: 100%; margin: 4px 2px" v-if="ifShowWarehouse">
+      <div style="width: 100%; margin: 4px 2px; display: flex" v-if="ifShowWarehouse">
+        <span style="line-height: 30px; color: red; margin-right: 4px" v-if="requiredWarehouse"
+          >*</span
+        >
         <el-select-v2
           size="small"
           v-model="warehouseAll"
@@ -179,7 +185,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 +232,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<{
@@ -457,8 +468,9 @@ onMounted(async () => {
 
   // 判断是否默认选中归属公司
   if (ifDefaultAffiliation.value) {
-    affiliationAll.value = defaultAffiliationOrgid.value
-    datas.value.factory_affiliation_id = defaultAffiliationOrgid.value
+    affiliationAll.value = defaultAffiliation.value.orgid // 下拉框赋值
+    datas.value.factory_affiliation_id = defaultAffiliation.value.orgid // 赋值给表单
+    datas.value.factory_affiliation_name = defaultAffiliation.value.orgname // 赋值给表单
   }
 })
 </script>