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

src/api/customers.js

@@ -7,6 +7,7 @@ export const customer = {
   detailUrl: '/customer/getOne',
   updateUrl: '/customer/update',
   deleteUrl: '/customer/delete',
+  updataAppUrl: '/customer/rejectCustomerCommit',
 }
 //查询省级供应商待审批列表
 export const province = {

src/views/customers/citypotenial-list/index.vue

@@ -396,7 +396,7 @@ export default {
       })
     },
     btnLink(row) {
-      window.location.href = row.FileURL
+      window.open(row.FileURL)
     },
     handleSelectRSP(value) {
       console.log('val', value)

src/views/login/city-register/index.vue

@@ -360,9 +360,9 @@ export default {
         extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
         extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)', trigger: 'blur' }],
         extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
-        extProvince_SDK: [{ required: true, message: '请选择省份', trigger: ['blur', 'change'] }],
-        extCity_SDK: [{ required: true, message: '请选择市', trigger: 'blur' }],
-        extDistrict_SDK: [{ required: true, message: '请选择区', trigger: 'blur' }],
+        extProvince_SDK: [{ required: true, message: '请选择省份' }],
+        extCity_SDK: [{ required: true, message: '请选择市' }],
+        extDistrict_SDK: [{ required: true, message: '请选择区' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],
@@ -370,7 +370,7 @@ export default {
         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
         extUnis_SDK: [{ required: true, message: '请输入Unis业务负责人姓名', trigger: 'blur' }],
         extUnisPhone_SDK: [{ required: true, message: '请输入Unis业务负责人电话', trigger: 'blur' }],
-        file: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+        file: [{ required: true, message: '请上传附件' }],
         extUnisEmail_SDK: [{ required: true, message: '请输入Unis业务负责人邮箱', trigger: 'blur' },
         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
       },
@@ -399,9 +399,14 @@ export default {
     getList() {
       this.page.searchKey = this.formInline.Name
       this.$request(Qcc.searchUrl, this.page).then((resp) => {
+        if(resp.results.Result){
          this.tableData = resp.results.Result
           this.page = resp.results.Paging
           this.TotalRecords = resp.results.Paging.TotalRecords
+        }else{
+          this.$message.warning('无相关公司！')
+        }
+       
       })
     },
     selectCountry() {

src/views/login/components/personal-info/constant.js

+import { file } from '@/api/customers'
+
+const tableConfig = {
+  tableTitle: '附件信息',
+  url: file.searchUrl,
+  // url: '',
+  isSearch: true,
+  defaultColumns: {
+    minWidth: 120,
+    showOverflowTooltip: true,
+    align: 'center'
+  },
+  columns: {
+    CreateOn_SDK: {
+      label: '创建时间'
+    },
+    FileName: {
+      label: '文件名'
+    },
+    handle: {
+      label: '操作',
+      hideInFilter: true,
+      fixed: 'right',
+      renderItem: (h, scope, listeners) => {
+        return h('div', [
+          // h('el-button', {
+          //   on: {
+          //     click: (e) => listeners.handleEdit(scope.row, 'edit')
+          //   },
+          //   props: {
+          //     icon: 'el-icon-edit-outline',
+          //     type: 'text'
+          //   }
+          // }, '编辑'),
+          h('el-button', {
+            on: {
+              click: (e) => listeners.handleDownload(scope.row, 'takeEffect')
+            },
+            props: {
+              icon: 'el-icon-circle-check',
+              type: 'text'
+            }
+          }, '下载'),
+        ])
+      },
+    }
+  }
+}
+
+const formConfig = {
+  labelPosition: 'left',
+  isShowBackBtn: false,
+  isShowSubmitBtn: false,
+  formDesc: {
+    TypeCode: {
+      vif: false,
+      label: '类型',
+      default: ''
+    },
+    FileDetails: {
+      label: '附件'
+    }
+  }
+}
+
+export default {
+  tableConfig,
+  formConfig,
+  ...file
+}

src/views/login/components/personal-info/index.vue

+<template>
+  <div class="table-container">
+    <form-title :title="tableConfig.tableTitle">
+      <div v-if="isShowEditBtn">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd()"
+          :disabled="addBtnStart"
+        >添加</el-button>
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          @click="handleDelete()"
+          :disabled="dedeleBtnStart"
+        >删除</el-button>
+      </div>
+    </form-title>
+    <ele-table
+      ref="eleTable"
+      :multiple="true"
+      :listeners="tableListeners"
+      v-bind="tableConfig"
+      :expand-params="expandParams"
+      @handleSelectionChange="handleSelectionChange"
+    />
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="dialogFormVisible"
+      :loading="loading"
+    >
+      <ele-form
+        ref="form"
+        v-model="formData"
+        v-bind="formConfig"
+      >
+        <template v-slot:FileDetails>
+          <upload-btn
+            :objectID="formData.ObjectID"
+            :fileDetails="formData.FileDetails"
+            :file-list="fileList"
+            @change="changeFileList"
+          />
+        </template>
+      </ele-form>
+      <div
+        slot="footer"
+        class="dialog-footer"
+      >
+        <el-button @click="dialogFormVisible = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="handleSave"
+          :loading='loading'
+        >保存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import constant from './constant'
+import UploadBtn from './upload-btn'
+import { file, fileInfoSearch } from '@/api/customers'
+export default {
+  components: { UploadBtn, fileInfoSearch },
+  name: 'FileInfo',
+  props: {
+    isShowEditBtn: {
+      type: Boolean,
+      default: true
+    },
+    // 不同的typeCode代表不同模块的附件
+    typeCode: {
+      type: String,
+      required: true
+    },
+    // 同一模块的附件通过moduleType区分
+    moduleType: {
+      type: String,
+      default: ''
+    },
+    // path: {
+    //   type: String,
+    //   required: true
+    // },
+    objectID: {
+      type: String,
+      default: ''
+    },
+    addBtnStart: {
+      type: Boolean,
+      default: true,
+    },
+    dedeleBtnStart: {
+      type: Boolean,
+      default: true,
+    },
+    isShowBtn: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  data() {
+    return {
+      tableConfig: constant.tableConfig,
+      formConfig: constant.formConfig,
+      expandParams: {},
+      desc: {},
+      tableListeners: {}, // 事件监听对象，供ele-table内部调用
+      formData: {},
+      fileList: [],
+      row: {},
+      $index: -1,
+      current: null,
+      dialogFormVisible: false,
+      dialogTitle: '',
+      loading: false,
+      // url: ''
+    }
+  },
+  watch: {
+    isShowEditBtn: {
+      handler(val){},
+      deep: true,
+      immediate: true
+      // this.tableConfig.columns.handle.vif = val
+    },
+    addBtnStart: {
+      handler(val){},
+      deep: true,
+      immediate: true,
+    },
+    dedeleBtnStart: {
+      handler(val){},
+      deep: true,
+      immediate: true,
+    },
+    isShowBtn: {
+      handler(val){},
+      deep: true,
+      immediate: true,
+    }
+  },
+  created() {
+    this.tableConfig.columns.handle.vif = this.isShowBtn
+    constant.tableConfig.initialParams = {
+      BusinessObjectID: this.objectID || this.$route.query.objectID,
+      TypeCode: this.typeCode
+    }
+    if (this.moduleType) {
+      constant.tableConfig.initialParams.ModuleType = this.moduleType
+    }
+    constant.formConfig.formDesc.TypeCode.default = this.typeCode
+    // constant.formConfig.formDesc.Path.default = this.path
+    this.tableListeners = {
+      handleEdit: this.handleEdit,
+      handleDownload: this.handleDownload
+    }
+  },
+  methods: {
+    getDetails(params) {
+      this.loading = true
+      this.$request(file.detailUrl, params).then((res) => {
+        this.loading = false
+        this.formData = res.results[0]
+      })
+    },
+    handleAdd() {
+      this.dialogTitle = '创建附件'
+      this.formData = {}
+      this.fileList = []
+      this.dialogFormVisible = true
+    },
+    handleEdit(row, index) {
+      this.dialogTitle = '编辑附件'
+      this.$index = index
+      this.row = row
+      this.formData = {}
+      this.getDetails({ objectID: row.ObjectID })
+      this.fileList = []
+      this.dialogFormVisible = true
+    },
+    // 选择/删除临时文件
+    changeFileList(fileList) {
+      this.fileList = fileList
+    },
+    handleSave() {
+      const fd = this.$getUpdateChange(this.row, this.formData)
+      if (Object.keys(fd).length < 2 && this.fileList.length === 0) {
+        this.dialogFormVisible = false
+        return
+      }
+      const formData = new FormData()
+      for (const key in fd) {
+        formData.append(key, fd[key])
+      }
+      if (this.moduleType) {
+        formData.append('moduleType', this.moduleType)
+      }
+      this.fileList.forEach((item) => {
+        formData.append('file', item.raw)
+      })
+      // if (this.fileList.length > 0) {
+      //   formData.path = this.path
+      // }
+      if (!this.formData.ObjectID) {
+        const businessObjectID =
+          this.$route.query.objectID || this.tableConfig.initialParams.objectID
+        console.log(businessObjectID)
+        formData.append('businessObjectID', businessObjectID)
+        formData.delete('objectID')
+        this.loading = true
+        this.$request(file.createUrl, formData).then(() => {
+          this.loading = false
+          this.dialogFormVisible = false
+          this.fileList = []
+          this.$message.success('添加成功！')
+          this.$refs.eleTable.url = file.searchUrl
+          this.$refs.eleTable.handleSearch()
+        }).catch(() => {
+          this.loading = false
+        })
+      } else {
+        formData.append('typeCode', this.typeCode)
+        this.$request(file.updateUrl, formData).then((res) => {
+          this.loading = false
+          this.dialogFormVisible = false
+          this.$message.success('修改成功！')
+          // this.tableConfig.url = file.searchUrl
+          this.$refs.eleTable.url = file.searchUrl
+          this.$refs.eleTable.handleSearch()
+        }).catch(() => {
+          this.loading = false
+        })
+      }
+    },
+    handleSelectionChange(selection) {
+      this.current = selection.length > 0 ? selection[0] : null
+    },
+    handleDelete() {
+      if (this.current === null) {
+        this.$message.warning('请先选择一行数据')
+        return
+      }
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$request(file.deleteUrl, { objectID: this.current.ObjectID }).then(() => {
+            this.$message.success('删除成功！')
+            this.$refs.eleTable.url = file.searchUrl
+            this.$refs.eleTable.handleSearch()
+          }
+          )
+        })      
+      // this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning'
+      // }).then(() => {
+      //   this.$request(file.deleteUrl, { objectID: this.current.ObjectID }).then(() => {
+      //     this.$message.success('删除成功！')
+      //     this.$refs.eleTable.url = file.searchUrl
+      //     this.$refs.eleTable.handleSearch()
+      //   }
+      //   )
+      // })
+    },
+    handleDownload(row) {
+      window.open(row.FileURL)
+    }
+  }
+}
+</script>
+
+<style>
+</style>

src/views/login/components/personal-info/upload-btn.vue

+<template>
+  <div>
+    <el-upload
+      v-if="vif"
+      :disabled="disabled"
+      ref="upload"
+      action="false"
+      :limit="5"
+      :multiple="multiple"
+      :on-change="handleChange"
+      :on-remove="handleRemove"
+      :auto-upload="false"
+      :on-exceed="handleExceed"
+      :file-list="fileList"
+    >
+      <el-button size="small" type="primary">上传文件</el-button>
+    </el-upload>
+    <!-- <upload-list
+      v-if="objectID"
+      v-bind="config"
+      :files="fileDetails"
+      @remove="handleRemoveReq" /> -->
+  </div>
+</template>
+
+<script>
+import { file } from '@/api/customers'
+import UploadList from '@/components/UploadFile/UploadList.vue'
+export default {
+  components: { UploadList },
+  name: 'UploadBtn',
+  props: {
+    vif: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    objectID: {
+      type: String,
+      default: function() {
+        return this.$route.query.objectID
+      }
+    },
+    // 是否支持多选文件
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    // 已上传到服务器的文件列表
+    fileDetails: {
+      type: Array,
+      default: function() {
+        return []
+      }
+    },
+    config: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    fileList: {
+      type: Array,
+    }
+  },
+  data() {
+    return {}
+  },
+  watch: {
+    fileList: {
+      handler(newVal){ },
+      deep: true,
+      immediate: true,
+    }
+  },
+  created() {
+  },
+  methods: {
+    // 监控上传文件列表
+    handleChange(file, fileList) {
+      this.fileList = fileList
+      this.$emit('change', fileList)
+    },
+    // 移除文件
+    handleRemove(file, fileList) {
+      this.fileList = fileList
+      this.$emit('change', fileList)
+    },
+    handleExceed() {
+      this.$message.warning('上传文件超出文件数量')
+    }
+    // // 删除文件
+    // handleRemoveReq(index, item) {
+    //   this.$request(file.deleteDetailUrl, [{ objectID: item.ObjectID }]).then(() => {
+    //       this.$message.success('删除成功！')
+    //       this.fileDetails.splice(index, 1)
+    //     }
+    //   )
+    // }
+  }
+}
+</script>
+
+<style>
+</style>

src/views/login/prov-register/index.vue

@@ -459,12 +459,12 @@ export default {
       bOptions: [],
       cOptions: [],
       supplierBaseRules: {
-        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
-        extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)', trigger: 'blur' }],
-        extCorporateName_SDK: [{ required: true, message: '请输入法人', trigger: 'blur' }],
-        extProvince_SDK: [{ required: true, message: '请选择省份', trigger: ['blur', 'change'] }],
-        extCity_SDK: [{ required: true, message: '请选择市', trigger: 'blur' }],
-        extDistrict_SDK: [{ required: true, message: '请选择区', trigger: 'blur' }],
+        extSocialUnifiedCreditCode_SDK: [{ required: true, message: '请输入统一社会信用代码' }],
+        extRegisteredCapital_SDK: [{ required: true, message: '请输入注册资本(万元)' }],
+        extCorporateName_SDK: [{ required: true, message: '请输入法人' }],
+        extProvince_SDK: [{ required: true, message: '请选择省份' }],
+        extCity_SDK: [{ required: true, message: '请选择市' }],
+        extDistrict_SDK: [{ required: true, message: '请选择区' }],
         extAddressDetail_SDK: [{ required: true, message: '请输入详细经营地址', trigger: 'blur' }],
         extLeader_SDK: [{ required: true, message: '请输入公司负责人姓名', trigger: 'blur' }],
         extLeaderPhone_SDK: [{ required: true, message: '请输入公司负责人联系电话', trigger: 'blur' }],
@@ -478,10 +478,10 @@ export default {
         extBusinessPhone_SDK: [{ required: true, message: '请输入商务负责人电话', trigger: 'blur' }],
         extBusinessEmail_SDK: [{ required: true, message: '请输入商务负责人邮箱', trigger: 'blur' },
         { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
-        extChannelType_SDK: [{ required: true, message: '请选择签约渠道类型', trigger: 'blur' }],
-        extProductGroup_KUT: [{ required: true, message: '请选择签约产品组', trigger: 'blur' }],
-        extTotalAgent_KUT: [{ required: true, message: '请选择签约总代', trigger: 'blur' }],
-        file: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+        extChannelType_SDK: [{ required: true, message: '请选择签约渠道类型' }],
+        extProductGroup_KUT: [{ required: true, message: '请选择签约产品组' }],
+        extTotalAgent_KUT: [{ required: true, message: '请选择签约总代' }],
+        file: [{ required: true, message: '请上传附件' }],
       },
       dialogTableVisible: false,
       TotalRecords: 0,
@@ -510,9 +510,13 @@ export default {
     getList() {
       this.page.searchKey = this.formInline.Name
       this.$request(Qcc.searchUrl, this.page).then((resp) => {
+        if(resp.results.Result){
           this.tableData = resp.results.Result
         this.page = resp.results.Paging
         this.TotalRecords = resp.results.Paging.TotalRecords
+        }else{
+          this.$message.warning('无相关公司！')
+        } 
       })
     },
     selectCountry() {