n20-common-lib 2.14.17 → 2.14.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.14.17",
+  "version": "2.14.19",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalCard/index.vue

@@ -176,7 +176,7 @@
                       <div v-if="row.resultName !== '撤回' || showCtdMsg">
                         <div v-if="row.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
                           <span v-if="row.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
-                          <span>{{ row.suggestion }} </span>
+                          <span style="line-height: 22px">{{ row.suggestion }} </span>
                         </div>
                         <div
                           v-if="row.flowHistoryCfgs && row.flowHistoryCfgs.length"
@@ -202,7 +202,7 @@
             </div>
             <div v-if="!item.subProcInitId && item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span v-if="item.result !== status.waiting">{{ '审批意见：' | $lc }}</span>
-              <span>{{ item.suggestion }} </span>
+              <span style="line-height: 22px">{{ item.suggestion }} </span>
             </div>
             <div v-if="item.flowHistoryCfgs && item.flowHistoryCfgs.length" class="n20-description-c m-t p-a-s">
               <span

package/src/components/FileUploadTable/index.vue

@@ -49,22 +49,24 @@
           <slot slot="header" slot-scope="scope" name="type-header" :column="scope.column">{{ '附件类型' | $lc }}</slot>
           <slot slot-scope="{ row }" name="type" :row="row">
             <span v-if="readonly">{{ row[keys.type] | typeFiter(typeOptions) }}</span>
-            <el-select
-              v-else
-              v-model="row[keys.type]"
-              :disabled="row._typeDisabled"
-              :placeholder="'请选择' | $lc"
-              style="width: 100%"
-              @change="$emit('typeChange', row[keys.type])"
-            >
-              <el-option
-                v-for="item in typeOptions"
-                :key="item.type"
-                :disabled="item.disabled"
-                :value="item.type"
-                :label="item.label"
-              />
-            </el-select>
+            <div v-else class="flex-box flex-v">
+              <span v-if="requiredTypes.includes(row[keys.type])" style="color: red" class="m-r-s">*</span>
+              <el-select
+                v-model="row[keys.type]"
+                :disabled="row._typeDisabled"
+                :placeholder="'请选择' | $lc"
+                style="width: calc(100% - 16px)"
+                @change="$emit('typeChange', row[keys.type])"
+              >
+                <el-option
+                  v-for="item in typeOptions"
+                  :key="item.type"
+                  :disabled="item.disabled"
+                  :value="item.type"
+                  :label="item.label"
+                />
+              </el-select>
+            </div>
           </slot>
         </el-table-column>
         <el-table-column :label="'附件名称' | $lc" :prop="keys.name">
@@ -434,6 +436,10 @@ export default {
     }
 
     return {
+      // 是否仅平铺必选附件
+      fileRequired: true,
+      // 必传附件
+      requiredTypes: [],
       fileText: '',
       bathType: '',
       indexK: '$index',
@@ -473,6 +479,25 @@ export default {
       return this.dataPorp.multiple ?? true
     }
   },
+  watch: {
+    dataPorp: {
+      handler() {
+        this.requiredTypes = this.dataPorp.typeOptions
+          .filter((item) => {
+            return item.required === 1
+          })
+          .map((item) => {
+            return item.attno
+          })
+        if (this.dataPorp.typeOptions.length === 0) {
+          return false
+        }
+        this.setTableData()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   mounted() {
     this.getConfiguration()
   },
@@ -495,13 +520,41 @@ export default {
         this.$emit('aiFn', data)
       }
     },
+    // 平铺附件
+    setTableData() {
+      if (this.tableData.length === 0) {
+        this.dataPorp.typeOptions
+          .filter((item) => {
+            if (this.fileRequired) {
+              return item.required === 1
+            } else {
+              return item.required === 1 || item.required === 0
+            }
+          })
+          .forEach((item) => {
+            let obj
+            obj = {
+              id: 'n' + Math.random(),
+              name: ''
+            }
+            obj[this.keys.type] = item.attno
+            obj[this.keys.time] = ''
+            obj[this.keys.user] = JSON.parse(sessionStorage.getItem('userInfo')).uname
+
+            console.log(obj)
+            this.tableData.push(obj)
+          })
+      }
+    },
     getConfiguration() {
       getJsonc('portal/server-config.jsonc', null, true)
         .then(({ loginConf }) => {
           this.fileText = loginConf?.sLogan?.fileText
+          this.fileRequired = loginConf?.fileRequired
         })
         .catch(() => {
           this.fileText = ''
+          this.fileRequired = true
         })
     },
     async getOfficeStatus() {