vue2-client 1.8.392 → 1.8.394

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.392",
+  "version": "1.8.394",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XAddReport/XAddReport.vue

@@ -8,7 +8,7 @@
     height="60%"
     okText="提交"
     @cancel="close"
-    :footer="null">
+    @ok="$refs.main.onSubmit()">
     <div style="max-height: 70vh; overflow-y: auto;" v-if="showReport">
       <x-report
         @updateImg="updateImg"
@@ -26,7 +26,7 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-import XReport from '@vue2-client/pages/XReportGridView/XReport'
+import XReport from '@vue2-client/pages/XReportGridView/XReport.vue'
 
 export default {
     name: 'XAddReport',
@@ -74,6 +74,7 @@ export default {
       close () {
         this.loading = false
         this.visible = false
+        this.$emit('close')
       },
       onSubmit (params) {
         this.loading = true

package/src/base-client/components/common/XReport/XReportDemo.vue

@@ -24,7 +24,7 @@ import XReport from '@vue2-client/base-client/components/common/XReport'
 import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 
 export default {
-  name: 'Example',
+  name: 'XReportDemo',
   components: {
     XReport
   },

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -103,7 +103,7 @@ import applyBaseInformation from './WorkflowPageDetail/ApplyBaseInformation'
 import applyHandle from './WorkflowPageDetail/ApplyHandle'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from './WorkflowPageDetail/applyDetailView'
+import { applyDetailViewApi } from '../../services/api/applyService/apiApply'
 import ApplyWorkflowLog from './WorkflowPageDetail/ApplyWorkflowLog'
 import LeaveMessage from './WorkflowPageDetail/LeaveMessage'
 

package/src/pages/WorkflowDetail/WorkflowPageDetail/ApplyBaseInformation.vue

@@ -117,7 +117,7 @@ import { mapState } from 'vuex'
 import { formatDate } from '@vue2-client/utils/util'
 import { post } from '@vue2-client/services/api/restTools'
 import moment from 'moment'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import WorkOrderParentDetails from './WorkOrderParentDetails'
 
 export default {

package/src/pages/WorkflowDetail/WorkflowPageDetail/ApplyBaseInformationDetails.vue

@@ -105,7 +105,7 @@ import { mapState } from 'vuex'
 import { formatDate } from '@vue2-client/utils/util'
 import { post } from '@vue2-client/services/api/restTools'
 import moment from 'moment'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import WorkOrderParentDetails from './WorkOrderParentDetails'
 
 export default {

package/src/pages/WorkflowDetail/WorkflowPageDetail/ApplyHandle.vue

@@ -231,7 +231,7 @@ import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativ
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import { formatDate } from '@vue2-client/utils/util'
 // import { commonApi } from 'vue2-client/src/services/api/common'
 import { mapState } from 'vuex'

package/src/pages/WorkflowDetail/WorkflowPageDetail/ApplyHandleReso.vue

@@ -227,7 +227,7 @@ import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativ
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import { formatDate } from '@vue2-client/utils/util'
 import { commonApi } from 'vue2-client/src/services/api/common'
 import { mapState } from 'vuex'

package/src/pages/WorkflowDetail/WorkflowPageDetail/ApplyWorkflowLog.vue

@@ -25,7 +25,7 @@
 
 <script>
 import { post } from '@vue2-client/services/api/restTools'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 
 export default {
   name: 'ApplyWorkflowLog',

package/src/pages/WorkflowDetail/WorkflowPageDetail/LeaveMessage.vue

@@ -47,7 +47,7 @@
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
 import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 
 
 export default {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkOrderParentDetails.vue

@@ -94,7 +94,7 @@ import applyBaseInformationDetails from './ApplyBaseInformationDetails'
 import applyHandle from './ApplyHandle'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import ApplyWorkflowLog from './ApplyWorkflowLog'
 // import LeaveMessage from '@/components/LeaveMessage'
 

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkflowDetailResso.vue

@@ -103,7 +103,7 @@ import applyBaseInformationDetails from './ApplyBaseInformationDetails'
 import ApplyHandleReso from './ApplyHandleReso'
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 import { post } from 'vue2-client/src/services/api/restTools'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import ApplyWorkflowLog from './ApplyWorkflowLog'
 
 export default {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkflowListResolution.vue

@@ -72,7 +72,7 @@ import WorkflowDetail from '../WorkflowDetail.vue'
 import WorkflowDetailResso from './WorkflowDetailResso'
 import { mapState } from 'vuex'
 import moment from 'moment'
-import { applyDetailViewApi } from './applyDetailView'
+import { applyDetailViewApi } from '../../../services/api/applyService/apiApply'
 import { post } from '@vue2-client/services/api'
 
 export default {

package/src/pages/XReportGridView/XReportDemo.vue

@@ -20,7 +20,7 @@ import XReport from './XReport'
 import { exportHTMLNodeToPDF } from '@vue2-client/utils/htmlToPDFApi'
 
 export default {
-  name: 'Example',
+  name: 'XReportDemo',
   components: {
     XReport
   },

package/src/pages/XReportGridView/XReportTrGroup.vue

@@ -385,7 +385,7 @@
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import { formatDate } from '@vue2-client/utils/util'
 import { nanoid } from 'nanoid'
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
+// import XFormTable from '@vue2-client/base-client/components/common/XFormTable'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 // import { getConfigByName } from '@vue2-client/services/api/common'
 
@@ -393,7 +393,7 @@ export default {
   name: 'XReportTrGroup',
   components: {
     Upload,
-    XFormTable
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
   },
   props: {
     // 每一行的配置

package/src/router/guards.js

@@ -169,7 +169,9 @@ const loginGuard = (to, from, next, options) => {
       r: v4LoginData.r
     }
     Vue.$store.commit('account/setLogin', login)
-    loadRoutes(funcToRouter(v4LoginData.functions))
+    if (!Vue.$store.state?.setting?.menuData) {
+      loadRoutes(funcToRouter(v4LoginData.functions))
+    }
     next()
   } else {
     const { store, message } = options

package/src/{pages/WorkflowDetail/WorkflowPageDetail/applyDetailView.js → services/api/applyService/apiApply.js}

@@ -1,3 +1,4 @@
+// 工单专用api
 const applyDetailViewApi = {
   // 查询：获取报装基本数据
   getApplyBasicInfo: '/api/af-apply/logic/getApplyBasicInfo',