n20-common-lib 3.0.11 → 3.0.12

package/package.json

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

package/src/assets/css/filter.scss

@@ -24,20 +24,7 @@
     padding: 0 8px;
     margin-top: 8px;
   }
-  .add {
-    cursor: pointer;
-    margin-top: 8px;
-    img {
-      margin-right: 12px;
-    }
-    padding: 8px;
-    height: 20px;
-    line-height: 20px;
-  }
-  .add:hover {
-    border-radius: 2px;
-    background: var(--fill-1, #f7f8fa);
-  }
+
   .botton {
     padding: 8px;
     border-radius: 4px;
@@ -54,6 +41,20 @@
     margin-left: 0;
   }
 }
+.ProFilterView-add {
+  cursor: pointer;
+  margin-top: 8px;
+  img {
+    margin-right: 12px;
+  }
+  padding: 8px;
+  height: 20px;
+  line-height: 20px;
+}
+.ProFilterView-add:hover {
+  border-radius: 2px;
+  background: var(--fill-1, #f7f8fa);
+}
 .proFilterView-list-item {
   width: 100%;
   display: flex;

package/src/components/AIButton/index.vue

@@ -25,6 +25,7 @@
 <script>
 import Dialog from '../Dialog/index.vue'
 import clUpload from '../Upload/index.vue'
+import axios from '../../utils/axios.js'
 let dayjs = undefined
 import('../../index.js').then((res) => {
   dayjs = res.dayjs
@@ -81,7 +82,7 @@ export default {
         this.$message.error('请先配置bussType')
         return false
       }
-      const { data, code } = await this.$axios.post(
+      const { data, code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
         {
           beid: beid,

package/src/components/AdvancedFilter/formItemRender.vue

@@ -55,6 +55,9 @@ export default {
     handleEnter() {
       this.$emit('enter')
     },
+    handleChange(value) {
+      this.$emit('change', { field: this.item.value, value })
+    },
     handleVisibleChange(value) {
       if (!value) {
         this.handleFilter()
@@ -381,6 +384,7 @@ export default {
               value: form[item.value],
               callback: (value) => {
                 this.$set(form, item.value, value)
+                this.handleChange(value)
               }
             },
             on: {
@@ -461,6 +465,7 @@ export default {
               value: form[item.value],
               callback: (value) => {
                 this.$set(form, item.value, value)
+                this.handleChange(value)
               }
             },
             on: {
@@ -494,6 +499,7 @@ export default {
           on: {
             input: (value) => {
               this.$set(form, item.value, value)
+              this.handleChange(value)
             },
             clear: this.handleClear,
             blur: this.handleBlur,
@@ -529,9 +535,11 @@ export default {
           on: {
             'update:start-value': (value) => {
               this.$set(form, item.startValue, value)
+              this.handleChange(value)
             },
             'update:end-value': (value) => {
               this.$set(form, item.endValue, value)
+              this.handleChange(value)
             },
             clear: this.handleClear,
             blur: this.handleBlur,
@@ -579,6 +587,7 @@ export default {
           on: {
             input: (value) => {
               this.$set(form, item.value, value)
+              this.handleChange(value)
             },
             change: this.handleFilter,
             clear: this.handleClear
@@ -612,9 +621,11 @@ export default {
           on: {
             'update:start-date': (val) => {
               this.$set(form, item.startDate, val)
+              this.handleChange(val)
             },
             'update:end-date': (val) => {
               this.$set(form, item.endDate, val)
+              this.handleChange(val)
             },
             clear: this.handleClear,
             change: () => {
@@ -643,6 +654,7 @@ export default {
               value: form[item.value],
               callback: (value) => {
                 this.$set(form, item.value, value)
+                this.handleChange(value)
               }
             },
             on: {
@@ -677,6 +689,7 @@ export default {
               value: form[item.value],
               callback: (value) => {
                 this.$set(form, item.value, value)
+                this.handleChange(value)
               }
             },
             on: {

package/src/components/AdvancedFilter/index.vue

@@ -20,6 +20,7 @@
             @clean="$emit('clean')"
             @enter="$emit('enter')"
             @filter="$emit('filter', model)"
+            @change="$emit('change', $event)"
           />
         </div>
         <i

package/src/components/ApprovalButtons/index.vue

@@ -96,7 +96,7 @@
               clearable
               @focus="setAddtaskV = true"
             />
-            <el-select v-model="addTaskTag" class="m-l-ss" clearable>
+            <el-select v-if="remarkOpt && remarkOpt.length > 0" v-model="addTaskTag" class="m-l-ss" clearable>
               <el-option v-for="item in remarkOpt" :key="item.code" :label="item.name" :value="item.code" />
             </el-select>
           </div>
@@ -566,7 +566,7 @@ export default {
       }
       this.beforeFn(this.beforeRatify, async () => {
         try {
-          const res = await this.$axios.post(
+          const res = await axios.post(
             '/bems/activiti/admin/todo/showAdvancePop',
             {
               isAgentcy: this.$route.query.isAgentcy,
@@ -577,14 +577,37 @@ export default {
               noMsg: true
             }
           )
-          // 加个判断是否加签且加签是否需要提示
-          // 这里抛出提示
-          // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
-          if (res.code === 200 && res.data && (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)) {
-            this.setSpr = true
-            this.selectSprList = res.data
+          // addTaskTip 是否给出加签提示
+          if (res.code === 200 && res.data && res.data.addTaskTip) {
+            this.$confirm('请确定是否向后加签', $lc('提示'), {
+              confirmButtonText: $lc('确定'),
+              cancelButtonText: $lc('取消'),
+              type: 'warning'
+            }).then(() => {
+              // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
+              if (
+                res.code === 200 &&
+                res.data &&
+                (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)
+              ) {
+                this.setSpr = true
+                this.selectSprList = res.data
+              } else {
+                this.checkFlowFn()
+              }
+            })
           } else {
-            this.checkFlowFn()
+            // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
+            if (
+              res.code === 200 &&
+              res.data &&
+              (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)
+            ) {
+              this.setSpr = true
+              this.selectSprList = res.data
+            } else {
+              this.checkFlowFn()
+            }
           }
         } catch (error) {
           console.log(error)
@@ -602,7 +625,7 @@ export default {
     },
     async getIsShowUploadWidget() {
       const { processInstanceId: procInstId, taskId } = this.$route.query
-      let { code, data } = await this.$axios.get(
+      let { code, data } = await axios.get(
         `/bems/activiti/admin/todo/isShowUploadWidget/${procInstId}/${taskId}`,
         null,
         {
@@ -972,7 +995,7 @@ export default {
             }
           ]
         }
-        const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
+        const { code, data } = await axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
         if (code === 200) {
           this.promptType = data.promptType
           // 成功 失败  待确认 提交数据
@@ -1092,7 +1115,7 @@ export default {
     },
     // 获取数据字典加签备注
     async getMdmDataDoc() {
-      const { code, data } = await this.$axios.get(`/bems/1.0/mdmDataDoc`, {
+      const { code, data } = await axios.get(`/bems/1.0/mdmDataDoc`, {
         typeCode: 'ADD_TASK_TAG'
       })
       if (code === 200) {

package/src/components/ApprovalButtons/indexApp.vue

@@ -440,7 +440,7 @@ export default {
   data() {
     this.msgisSync = !!this.$listeners['update:message']
     return {
-      attributes: undefined,
+      attributes: { appOrPc: '3' },
       isWyfk: false,
       nextEgwOutgoingNodeId: undefined,
       nextNodeApproveUnos: undefined,
@@ -535,7 +535,7 @@ export default {
     this.getShowApprovalTo()
     this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
-    this.getConfiguration()
+    //this.getConfiguration()
     this.getIsShowUploadWidget()
   },
   methods: {
@@ -878,10 +878,11 @@ export default {
     onContinue() {
       if (this.isWyfk) {
         this.attributes = {
+          appOrPc: '3',
           ebsPaymentRiskWarning: '核实无误'
         }
       } else {
-        this.attributes = undefined
+        this.attributes = { appOrPc: '3' }
       }
       this.verifyV = false
       this.approvalFn()
@@ -918,10 +919,7 @@ export default {
               typeCode,
               isAgentcy,
               isCheck,
-              businessId: orderId,
-              attributes: {
-                appOrPc: '3'
-              }
+              businessId: orderId
             }
           ]
         }

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -178,7 +178,7 @@ export default {
     // 查询是否显示审批意见
     getAction() {
       try {
-        this.$axios.get('/bems/activiti/actAppOpi/isShowOpiUser', {}, { loading: false, noMsg: true }).then((res) => {
+        axios.get('/bems/activiti/actAppOpi/isShowOpiUser', {}, { loading: false, noMsg: true }).then((res) => {
           if (res.data === '1') {
             this.hasZdy = true
           } else {
@@ -194,7 +194,7 @@ export default {
       let list
       switch (type) {
         case '保存为常用语':
-          this.$axios.post('/bems/activiti/actAppOpi/saveAppOpi', { message: this.message }).then((res) => {
+          axios.post('/bems/activiti/actAppOpi/saveAppOpi', { message: this.message }).then((res) => {
             if (res.code === 200) {
               this.$message.success('保存成功')
             }
@@ -212,7 +212,7 @@ export default {
           this.deleteList.forEach((d) => {
             d.appNoType && list.push(d)
           })
-          this.$axios.post('/bems/activiti/actAppOpi/saveList', list).then((res) => {
+          axios.post('/bems/activiti/actAppOpi/saveList', list).then((res) => {
             if (res.code === 200) {
               this.$message.success('保存成功')
               this.setSpr = false

package/src/components/ApprovalCard/index.vue

@@ -72,7 +72,10 @@
               <div
                 v-if="item.result !== 0 && item.appOrPc !== null && item.appOrPc !== '' && item.appOrPc !== undefined"
               >
-                {{ item.appOrPc === '1' ? 'PC端审批' : item.appOrPc === '2' ? '外部系统审批' : 'App端审批' | $lc }}
+                <span v-if="item.outTitle">{{ item.outTitle }}</span>
+                <span v-else>
+                  {{ item.appOrPc === '1' ? 'PC端审批' : item.appOrPc === '2' ? '外部系统审批' : 'App端审批' | $lc }}
+                </span>
               </div>
               <div v-if="item.showConnect === '1'" class="m-l-s">
                 <span class="pointer color-ccc f-s-s" @click="seeDetail(item)"
@@ -506,6 +509,7 @@ export default {
           memberName: item.memberName, // 审批人单位
           subProcInitId: item.subProcInitId, // 子流程id
           appOrPc: item.appOrPc, // 终端标识 1 PC 2 APP
+          outTitle: item.outTitle, // 外部审批标题
           showConnect: item.showConnect, // 是否显示查看详情
           _details: item,
           deptName: item.deptName, // 部门

package/src/components/ApprovalCard/indexApp.vue

@@ -249,7 +249,7 @@
               </div>
             </div> -->
             <!-- app暂时屏蔽 -->
-            <!-- <div v-if="!item.subProcInitId && item.suggestion" class="n20-description-c n20-description-bgc m-t p-a-s">
+            <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 style="line-height: 22px">{{ item.suggestion }} </span>
             </div>
@@ -266,7 +266,7 @@
                   <div>{{ s.cfgRemark }}</div>
                 </div>
               </div>
-            </div> -->
+            </div>
             <!-- <div v-if="item.flowHisFileList" class="n20-description-c n20-description-bgc m-t p-a-s">
               <span>{{ '附件信息' | $lc }}：</span>
               <div class="flex-box">

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -49,7 +49,7 @@
             </tr>
             <tr v-for="(item, i) in assigneeEnd" :key="i">
               <td>{{ item.assignee }}</td>
-              <td class="text-c">{{ item.optName }}</td>
+              <td class="text-c">{{ item.optName || item.optResult }}</td>
               <td>{{ item.suggestion }}</td>
               <td>{{ item.endTime }}</td>
             </tr>

package/src/components/ApprovalRecord/indexApp.vue

@@ -1,43 +1,19 @@
 /* 审批记录 */
 <template>
   <div>
-    <div class="flex-box flex-r m-b-s">
-      <el-button type="text" size="mini" :disabled="false" @click="cardV = true">{{ '审批进度查看' | $lc }}</el-button>
-    </div>
-    <el-dialog
-      v-drag
-      :title="'审批记录' | $lc"
-      :visible.sync="cardV"
-      width="90%"
-      class="p-a-0"
-      append-to-body
-      top="10vh"
-    >
-      <approvalCard
-        :api-prefix="apiPrefix"
-        class="p-a"
-        :proc-inst-id="procInstIdC"
-        style="height: 70vh; overflow: auto"
-      />
-    </el-dialog>
-    <el-dialog
-      v-drag
-      :title="'查看流程' | $lc"
-      :visible.sync="imgV"
-      width="80%"
-      class="p-a-0"
-      append-to-body
-      top="10vh"
-    >
-      <approvalImg class="text-c p-a" :proc-inst-id="procInstIdC" style="height: 70vh; overflow: auto" />
-    </el-dialog>
+    <approvalCard
+      :api-prefix="apiPrefix"
+      class="p-a"
+      :proc-inst-id="procInstIdC"
+      style="height: 70vh; overflow: auto"
+    />
   </div>
 </template>
 
 <script>
-import approvalCard from '../ApprovalCard/indexApp.vue'
-import approvalImg from './approvalImg.vue'
-import getJsonc from '../../assets/getJsonc'
+import approvalCard from 'n20-common-lib/src/components/ApprovalCard/indexApp.vue'
+import approvalImg from 'n20-common-lib/src/components/ApprovalRecord/approvalImg.vue'
+import getJsonc from 'n20-common-lib/src/assets/getJsonc'
 export default {
   name: 'ApprovalRecord',
   components: {
@@ -71,9 +47,9 @@ export default {
     }
   },
   mounted() {
-    getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
+    /* getJsonc('portal/server-config.jsonc').then(({ approvalMode }) => {
       this.approvalMode = approvalMode
-    })
+    }) */
   }
 }
 </script>

package/src/components/Diff/index.vue

@@ -3,6 +3,9 @@
     <el-tooltip v-if="tooltip" :content="value" placement="top">
       <span>{{ value }}</span>
     </el-tooltip>
+    <span v-else>
+      <span>{{ value }}</span>
+    </span>
   </div>
   <div v-else class="n20-descriptions">
     <div class="m-b-ss">

package/src/components/ElectronicArchive/index.vue

@@ -538,7 +538,7 @@ export default {
   },
   methods: {
     async getOfficeStatus() {
-      const { data } = await this.$axios.get(
+      const { data } = await axios.get(
         this.requestPrefix
           ? `${this.requestPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
           : `/neams/eamsBaseFile/getOfficeIsEnable`

package/src/components/Empty/index.vue

@@ -8,6 +8,7 @@
 </template>
 
 <script>
+import icon_noData from './img/empty.png'
 import icon_empty from './img/empty.svg'
 import icon_abnormal from './img/abnormal.svg'
 import icon_relevant from './img/relevant.svg'
@@ -29,6 +30,7 @@ import icon_905 from './img/905.svg'
 import icon_906 from './img/906.svg'
 import icon_907 from './img/907.svg'
 const pics = {
+  icon_noData,
   icon_empty,
   icon_abnormal,
   icon_relevant,

package/src/components/FileUploadTable/FileUploadTableV3.vue

@@ -544,7 +544,7 @@ export default {
         this.$message.error('请先配置bussType')
         return false
       }
-      const { data, code } = await this.$axios.post(
+      const { data, code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
         {
           beid: row.beid,
@@ -594,7 +594,7 @@ export default {
         })
     },
     async getOfficeStatus() {
-      const { data } = await this.$axios.get(
+      const { data } = await axios.get(
         this.apiPrefix
           ? `${this.apiPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
           : `/neams/eamsBaseFile/getOfficeIsEnable`

package/src/components/FileUploadTable/aiCheckDialog.vue

@@ -37,6 +37,7 @@
 <script>
 import Dialog from '../Dialog/index.vue'
 import Table from '../Table/index.vue'
+import axios from '../../utils/axios.js'
 
 export default {
   name: 'AiCheckDialog',
@@ -122,7 +123,7 @@ export default {
         item.status = '1'
         return item
       })
-      const { code } = await this.$axios.post(
+      const { code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}/neams/ai/saveAiBussResult` : `/neams/ai/saveAiBussResult`,
         list
       )

package/src/components/FileUploadTable/index.vue

@@ -556,7 +556,7 @@ export default {
     },
     // ai校验结果
     async getAiCheckData(row) {
-      const { data, code } = await this.$axios.get(
+      const { data, code } = await axios.get(
         this.apiPrefix ? `${this.apiPrefix}/neams/ai/getAiBussResult` : `/neams/ai/getAiBussResult`,
         {
           beid: row.beid,
@@ -581,7 +581,7 @@ export default {
           this.$message.error('请先配置bussType')
           return false
         }
-        let { data, code } = await this.$axios.post(
+        let { data, code } = await axios.post(
           this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
           {
             ...this.AIOptions,
@@ -605,7 +605,7 @@ export default {
         this.$message.error('请先配置bussType')
         return false
       }
-      const { data, code } = await this.$axios.post(
+      const { data, code } = await axios.post(
         this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
         {
           beid: row.beid,
@@ -655,7 +655,7 @@ export default {
         })
     },
     async getOfficeStatus() {
-      const { data } = await this.$axios.get(
+      const { data } = await axios.get(
         this.apiPrefix
           ? `${this.apiPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
           : `/neams/eamsBaseFile/getOfficeIsEnable`

package/src/components/HandlingAdvice/index.vue

@@ -59,6 +59,7 @@
 import { $lc } from '../../utils/i18n/index'
 import ShowOtherAttNew from '../ApprovalButtons/showOtherAttrNew.vue'
 import ExpandablePane from '../Expandable/main.vue'
+import axios from '../../utils/axios.js'
 export default {
   name: 'HandlingAdvice',
   components: { ShowOtherAttNew, ExpandablePane },
@@ -106,7 +107,7 @@ export default {
      */
     async getHandlingAdvice(typeCode, procInstId) {
       try {
-        const { code, data } = await this.$axios.post(
+        const { code, data } = await axios.post(
           `/bems/activiti/admin/todo/isFlowStartWithOptions`,
           { typeCode },
           {
@@ -138,7 +139,7 @@ export default {
         }
         // 回显操作
         if (procInstId) {
-          const { data: data1 } = await this.$axios.get(
+          const { data: data1 } = await axios.get(
             `/bems/activiti/sample/getStartEventFlowHistory/${procInstId}`,
             {},
             {
@@ -155,6 +156,7 @@ export default {
               return {
                 ...item,
                 cfgVal: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : bcData.cfgVal,
+                cfgText: ['31'].includes(item.cfgType) ? bcData.cfgText && bcData.cfgText.split(',') : bcData.cfgText,
                 selectList: ['31'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
                 checkList: ['32'].includes(item.cfgType) ? bcData.cfgVal.split(',') : undefined,
                 cfgHasRemark: bcData.cfgHasRemark,

package/src/components/Preview/index.vue

@@ -46,6 +46,7 @@
 <script>
 import importG from '../../utils/importGlobal.js'
 import Dialog from '../Dialog/index.vue'
+import axios from '../../utils/axios.js'
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
   return component
@@ -167,7 +168,7 @@ export default {
       }
     },
     async getFileInfo(id) {
-      const response = await this.$axios.post(
+      const response = await axios.post(
         this.apiPrefix ? this.apiPrefix + '/neams/eamsbaserecord/downloadFile' : '/neams/eamsbaserecord/downloadFile',
         { beid: id },
         { responseType: 'blob', loading: true }

package/src/components/ProFilterView/advancedQuery.vue

@@ -59,7 +59,7 @@
               <el-select v-model="condition.operator" class="operator-select" placeholder="请选择操作符" size="small">
                 <el-option
                   v-for="opt in (dz[condition.advancedQueryType] && dz[condition.advancedQueryType].types) || []"
-                  :key="opt.value"
+                  :key="opt.id"
                   :label="opt.name"
                   :value="opt.value"
                   @click.native="updateOperatorOptions(opt, condition)"
@@ -146,6 +146,15 @@
                   clearable
                   @change="searchFn"
                 />
+                <!-- slot类型 - 支持自定义插槽 -->
+                <slot
+                  v-else-if="condition.valueType === 'slot'"
+                  :name="condition.slotName"
+                  :model="condition"
+                  :value="condition.value"
+                  :input="(val) => (condition.value = val)"
+                  :disabled="[5, 6].includes(condition.operator)"
+                ></slot>
               </div>
               <!-- 添加按钮 -->
               <el-button
@@ -203,6 +212,10 @@ export default {
     filterList: {
       type: Array,
       default: () => []
+    },
+    filterId: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -438,12 +451,26 @@ export default {
     }
   },
   methods: {
+    // 查询支持可配置高级查询的字段
+    getAdvancedQueryFields() {
+      let array = [
+        {
+          fileCode: '',
+          fileName: ''
+        }
+      ]
+    },
     // 修改字段
     updatefield(field, row) {
       this.$set(row, 'advancedQueryType', field.advancedQueryType)
       if (field.advancedQueryType === 4) {
         this.$set(row, 'options', field.options)
       }
+      // slot 类型特殊处理
+      if (field.type === 'slot') {
+        this.$set(row, 'valueType', 'slot')
+        this.$set(row, 'slotName', field.slotName)
+      }
       this.$set(row, 'operator', '')
     },
     // 获取所有条件组中conditions的总数