Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/views/customers/customers-add/components/customersAdd-accessory/index.vue

@@ -37,9 +37,9 @@ export default {
     },
     objectId: {
      handler(newVal) {
-        constant.tableConfig.initialParams = {
-          BusinessObjectID: newVal
-        }    
+        // constant.tableConfig.initialParams = {
+        //   BusinessObjectID: newVal
+        // }  
       },
       immediate: true,
       deep: true

src/views/customers/customers-add/index.vue

@@ -114,7 +114,7 @@ export default {
             },
             ExtCity_SDK: {
               type: 'select',
-              label: '城市',
+              label: '地市',
               layout: 12,
               isOptions: true,
               optionsLinkageFields: ['ExtProvince_SDK'],

src/views/public/file-info/constant.js

@@ -2,7 +2,8 @@ import { file } from '@/api/customers'
 
 const tableConfig = {
   tableTitle: '附件信息',
-  url: file.searchUrl,
+  // url: file.searchUrl,
+  url: '',
   isSearch: true,
   defaultColumns: {
     minWidth: 120,
@@ -65,10 +66,11 @@ const formConfig = {
     //   vif: false,
     //   label: '编码'
     // },
-    // TypeCode: {
-    //   vif: false,
-    //   label: '类型'
-    // },
+    TypeCode: {
+      vif: false,
+      label: '类型',
+      default: ''
+    },
     // Note: {
     //   label: '备注',
     //   type: 'textarea'

src/views/public/file-info/index.vue

@@ -77,10 +77,10 @@ export default {
       type: String,
       default: ''
     },
-    path: {
-      type: String,
-      required: true
-    },
+    // path: {
+    //   type: String,
+    //   required: true
+    // },
     objectID: {
       type: String,
       default: ''
@@ -118,7 +118,7 @@ export default {
       constant.tableConfig.initialParams.ModuleType = this.moduleType
     }
     constant.formConfig.formDesc.TypeCode.default = this.typeCode
-    constant.formConfig.formDesc.Path.default = this.path
+    // constant.formConfig.formDesc.Path.default = this.path
     this.tableListeners = {
       handleEdit: this.handleEdit,
       handleDownload: this.handleDownload
@@ -165,11 +165,11 @@ export default {
         formData.append('moduleType', this.moduleType)
       }
       this.fileList.forEach((item) => {
-        formData.append('files', item.raw)
+        formData.append('file', item.raw)
       })
-      if (this.fileList.length > 0) {
-        formData.path = this.path
-      }
+      // if (this.fileList.length > 0) {
+      //   formData.path = this.path
+      // }
       if (!this.formData.ObjectID) {
         const businessObjectID =
           this.$route.query.objectID || this.tableConfig.initialParams.objectID
@@ -180,9 +180,11 @@ export default {
           this.loading = false
           this.dialogFormVisible = false
           this.$message.success('添加成功！')
+          this.tableConfig.url = '/search'
           this.$refs.eleTable.handleSearch()
         }).catch(() => {
           this.loading = false
+          this.tableConfig.url = '/search'
         })
       } else {
         formData.append('typeCode', this.typeCode)
@@ -190,6 +192,7 @@ export default {
           this.loading = false
           this.dialogFormVisible = false
           this.$message.success('修改成功！')
+          this.tableConfig.url = '/search'
           this.$refs.eleTable.handleSearch()
         }).catch(() => {
           this.loading = false