yusheng пре 11 месеци
родитељ
комит
ea46e36160

+ 7 - 13
src/main.js

@@ -6,10 +6,7 @@ import store from './store';
 import router from './router';
 import permission from './utils/permission';
 
-import {
-  MAP_KEY,
-  LICENSE_CODE
-} from '@/config/setting';
+import { MAP_KEY, LICENSE_CODE } from '@/config/setting';
 import EleAdmin from 'ele-admin';
 import VueClipboard from 'vue-clipboard2';
 import i18n from './i18n';
@@ -21,19 +18,18 @@ import TinymceEditor from '@/components/TinymceEditor/index.vue';
 // import SvgIcon from '@/components/FormGenerator/components/SvgIcon'; // svg component
 import HeaderTitle from '@/components/header-title';
 import authSelection from '@/components/authSelection';
-import permissionccc from '@/utils/permissionccc.js'
+import permissionccc from '@/utils/permissionccc.js';
 
-Vue.directive('permissionccc',permissionccc)
+Vue.directive('permissionccc', permissionccc);
 Vue.component('HeaderTitle', HeaderTitle);
 Vue.component('authSelection', authSelection);
 
-
 import Print from 'vue-printjs';
 Vue.use(Print);
 
 // 公共搜索文件
 import seekPage from '@/components/common/seekPage';
-Vue.component('seekPage', seekPage)
+Vue.component('seekPage', seekPage);
 
 // // register globally
 Vue.component('tinymce', TinymceEditor);
@@ -91,10 +87,8 @@ Vue.use(VueClipboard);
 let instance = null;
 
 function render(props = {}) {
-  const {
-    container,
-    routerBase
-  } = props;
+  const { container, routerBase, fileMain } = props;
+  Vue.component('fileMain', fileMain);
   // const router = new VueRouter({
   //   base: window.__POWERED_BY_QIANKUN__ ? routerBase : process.env.BASE_URL,
   //   mode: 'history',
@@ -121,7 +115,7 @@ export async function bootstrap() {
 export async function mount(props) {
   console.log('[vue] props from main framework', props);
   Vue.prototype.$portalStore = props.store;
-  initParentStore(props.store ?.state);
+  initParentStore(props.store?.state);
   props.onGlobalStateChange((state, prev) => {
     // state: 变更后的状态; prev 变更前的状态
     initParentStore(state);

+ 2 - 2
src/views/documentManagement/certificateManagement/components/add-dialog.vue

@@ -158,7 +158,7 @@
 <script>
   import staffSelection from './staffSelection.vue';
   import { saveOrEdit, getPhotoInfo } from '@/api/documentManagement';
-  import fileMain from '@/components/addDoc/index.vue';
+  // import fileMain from '@/components/addDoc/index.vue';
 
   import { getCode } from '@/api/ruleManagement/matter';
   import productTable from './productTable.vue';
@@ -182,7 +182,7 @@
       productTable,
       supplierSelection,
       customerSelection,
-      fileMain
+      // fileMain
     },
     //注册组件
     data() {

+ 2 - 2
src/views/documentManagement/certificateManagement/components/detail-dialog.vue

@@ -85,12 +85,12 @@
 <script>
   import { getPhotoInfo } from '@/api/documentManagement';
   import dictMixins from '@/mixins/dictMixins';
-  import fileMain from '@/components/addDoc/index.vue';
+  // import fileMain from '@/components/addDoc/index.vue';
   import bpmDetail from '@/views/bpm/processInstance/businessDetail.vue';
 
   export default {
     mixins: [dictMixins],
-    components: { fileMain,bpmDetail },
+    components: { bpmDetail },
     //注册组件
     data() {
       return {

+ 2 - 2
src/views/documentManagement/certificateManagement/index.vue

@@ -117,12 +117,12 @@
   import { getImageUrl } from '@/utils/file.js';
   import { deepClone } from '@/utils';
   import { holderTypeOptions } from '@/enum/dict.js';
-  import fileMain from '@/components/addDoc/index.vue';
+  // import fileMain from '@/components/addDoc/index.vue';
   import { reviewStatus } from '@/enum/dict';
 
   export default {
     mixins: [dictMixins, tabMixins],
-    components: { certificateSearch, addDialog, detailDialog, fileMain,processSubmitDialog },
+    components: { certificateSearch, addDialog, detailDialog,processSubmitDialog },
     data() {
       return {
         processSubmitDialogFlag:false,

+ 3 - 3
src/views/material/BOMmanage/components/replaceMaterialPop.vue

@@ -47,7 +47,7 @@
       </template>
 
       <template v-slot:bomArtFiles="{ row }">
-        <fileUpload v-model="row.bomArtFiles" type="add" size="mini" />
+        <fileMain v-model="row.bomArtFiles" type="add" size="mini" />
       </template>
 
       <template v-slot:remark="{ row }">
@@ -72,11 +72,11 @@
   </el-dialog>
 </template>
 <script>
-  import fileUpload from '@/components/addDoc/index.vue';
+  // import fileUpload from '@/components/addDoc/index.vue';
   import ProductModalMultiple from './ProductModalMultiple.vue';
   export default {
     components: {
-      fileUpload,
+      // fileUpload,
       ProductModalMultiple
     },
     props: {

+ 3 - 3
src/views/material/BOMmanage/components/workingProcedure.vue

@@ -332,7 +332,7 @@
             </template>
 
             <template v-slot:bomArtFiles="{ row }">
-              <fileUpload v-model="row.bomArtFiles" type="add" size="mini" />
+              <fileMain v-model="row.bomArtFiles" type="add" size="mini" />
             </template>
 
             <template v-slot:remark="{ row }">
@@ -485,7 +485,7 @@
 import dictMixins from '@/mixins/dictMixins';
 import * as dayjs from 'dayjs';
 import { getFile } from '@/api/system/file';
-import fileUpload from '@/components/addDoc/index.vue';
+// import fileUpload from '@/components/addDoc/index.vue';
 import { workingProcedureUpdate } from '@/api/material/BOM';
 import ParamModal from '@/views/technology/productParam/components/ParamModal.vue';
 import ProductModal from '@/components/select/bom/ProductModal.vue';
@@ -503,7 +503,7 @@ export default {
   components: {
     userSearch,
     ParamModal,
-    fileUpload,
+    // fileUpload,
     ProductModal,
     jobDialog,
     ProductModalMultiple,