n20-common-lib 2.20.23 → 2.20.24

package/package.json

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

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/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/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>