Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-pro

src/main.js

@@ -45,7 +45,9 @@ import 'bpmn-js/dist/assets/bpmn-font/css/bpmn.css';
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css';
 import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
 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',

src/views/project-manage/planManage/components/plan-form.vue

@@ -245,7 +245,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="附件">
-            <fileUpload v-model="form.files" :type="dialogType"></fileUpload>
+            <fileMain v-model="form.files" :type="dialogType"></fileMain>
           </el-form-item>
         </el-col>
       </el-row>
@@ -260,14 +260,16 @@
   } from '@/api/project-manage';
   import PersonSelect from '@/components/CommomSelect/person-select.vue';
   import ProjectForm from '@/views/project-manage/project-initiation/components/project-form.vue';
-  import fileUpload from '@/BIZComponents/addDoc/index.vue';
+  // import fileUpload from '@/BIZComponents/addDoc/index.vue';
   import { getFile } from '@/api/system/file';
   import { getTargetPlanTreeAPI } from '@/api/project-manage/plan';
   import userSelectDialog from '@/BIZComponents/user-select/user-select.vue';
 
   export default {
     name: 'plan-form',
-    components: { fileUpload, ProjectForm, PersonSelect, userSelectDialog },
+    components: {
+      //  fileUpload, 
+      ProjectForm, PersonSelect, userSelectDialog },
     props: {
       dialogType: {
         type: String,

src/views/project-manage/project-initiation/components/project-form.vue

@@ -292,7 +292,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="附件">
-            <fileUpload v-model="form.files" :type="dialogType"></fileUpload>
+            <fileMain v-model="form.files" :type="dialogType"></fileMain>
           </el-form-item>
         </el-col>
       </el-row>
@@ -342,58 +342,58 @@
 
   import linkParentDialog from '@/components/linkParentDialog';
 
-  import PersonSelect from '@/components/CommomSelect/person-select.vue';
-  import customDialog from '../../components/custom-dialog.vue';
-  import fileUpload from '@/BIZComponents/addDoc/index.vue';
-  import { getFile } from '@/api/system/file';
-  import contractListDialog from '@/views/project-manage/components/contractListDialog.vue';
-  import orderListDialog from '@/BIZComponents/orderListDialog/orderListDialog.vue';
-  import { getProduceTreeByCode } from '@/api/custom';
-  import moment from 'moment';
-  import { cityData } from 'ele-admin/packages/utils/regions';
+import PersonSelect from '@/components/CommomSelect/person-select.vue';
+import customDialog from '../../components/custom-dialog.vue';
+// import fileUpload from '@/BIZComponents/addDoc/index.vue';
+import { getFile } from '@/api/system/file';
+import contractListDialog from '@/views/project-manage/components/contractListDialog.vue';
+import orderListDialog from '@/BIZComponents/orderListDialog/orderListDialog.vue';
+import { getProduceTreeByCode } from '@/api/custom';
+import moment from 'moment';
+import { cityData } from 'ele-admin/packages/utils/regions';
 
   import { contactDetail } from '@/api/eos';
 
-  import { reviewStatusEnum } from '@/enum/dict';
-  export default {
-    name: 'project-form',
-    components: {
-      fileUpload,
-      PersonSelect,
-      customDialog,
-      contractListDialog,
-      orderListDialog,
-      linkParentDialog
+import { reviewStatusEnum } from '@/enum/dict';
+export default {
+  name: 'project-form',
+  components: {
+    // fileUpload,
+    PersonSelect,
+    customDialog,
+    contractListDialog,
+    orderListDialog,
+    linkParentDialog
+  },
+  props: {
+    code: {
+      type: String,
+      default: ''
+    },
+    dialogType: {
+      type: String,
+      default: ''
+    },
+    dialogForm: {
+      type: Object,
+      default: () => {
+        return {
+          ...this.form
+        };
+      }
+    },
+    teamList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
+    deptList: {
+      type: Array,
+      default: () => {
+        return [];
+      }
     },
-    props: {
-      code: {
-        type: String,
-        default: ''
-      },
-      dialogType: {
-        type: String,
-        default: ''
-      },
-      dialogForm: {
-        type: Object,
-        default: () => {
-          return {
-            ...this.form
-          };
-        }
-      },
-      teamList: {
-        type: Array,
-        default: () => {
-          return [];
-        }
-      },
-      deptList: {
-        type: Array,
-        default: () => {
-          return [];
-        }
-      },
 
       deptTreeList: {
         type: Array,

src/views/project-manage/task-manage/components/submitDeliverablesInfoTable.vue

@@ -68,7 +68,7 @@
 <!--              @click="downloadFile(item)">-->
 <!--              {{ item.name }}-->
 <!--            </el-link>-->
-            <fileUpload v-model="row.files" :type="dialogType=='view'||row.status==1||[1,2].includes(row.processStatus)?'view':''" ></fileUpload>
+            <fileMain v-model="row.files" :type="dialogType=='view'||row.status==1||[1,2].includes(row.processStatus)?'view':''" ></fileMain>
           </el-form-item>
         </template>
         <template v-slot:headerRequired="{column}">
@@ -87,14 +87,14 @@
 
 import {mapGetters} from 'vuex'
 import {getByCode} from "@/api/system/dictionary-data";
-import fileUpload from "@/BIZComponents/addDoc/index.vue";
+// import fileUpload from "@/BIZComponents/addDoc/index.vue";
 import {getFile} from "@/api/system/file";
 import {proStatusEnum, reviewStatusEnum} from "@/enum/dict";
 
 export default {
   type: "deliverablesInfoTable",
   components: {
-    fileUpload,
+    // fileUpload,
 
   },
   props: {