diff --git a/src/assets/js/api/supplier.js b/src/assets/js/api/supplier.js new file mode 100644 index 00000000..ea202266 --- /dev/null +++ b/src/assets/js/api/supplier.js @@ -0,0 +1,22 @@ +/** + * api接口统一管理 + */ +import {get,post} from '../http' + +// 供应商基本信息 +export const getSupplierInfoApi = data => post('xmgl/xzSupplier/getXzSupplierByUserId', data); + +// 企业类型列表 +export const getCompanyTypeApi = data => get('xmgl/xzSupplierType/list', data); + +// 信息填报保存 +export const infoReportSaveApi = data => post('xmgl/xzSupplier/saveSupplier', data); + +// 资质文件 +export const getQualificationFileApi = data => post('xmgl/xzSupplierQualification/list', data); +export const addQualificationFileApi = data => post('xmgl/xzSupplierQualification/add', data); +export const editQualificationFileApi = data => post('xmgl/xzSupplierQualification/edit', data); +export const deleteQualificationFileApi = data => post('xmgl/xzSupplierQualification/delete', data); + +// 资质申请 +export const getQualificationApplyListApi = data => post('xmgl/xzSupplierQualificationApply/page', data); diff --git a/src/assets/js/http.js b/src/assets/js/http.js index a284e46b..2717a9e3 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 diff --git a/src/router/index.js b/src/router/index.js index b52d5fee..f39483fb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2814,6 +2814,14 @@ const routes2 = [ "@/views/projectFront/engineerArchives/workingDraw.vue", ], resolve), }, + + // 供应商管理系统——承包资质申请 + { + path: "/supplier/qualification/apply", + name: "承包资质申请", + component: () => + import("@/views/supplierAdmin/qualificationApply/index.vue"), + }, ], }, //扫二维码路由 @@ -3132,13 +3140,6 @@ const routes2 = [ name: "supplierIndex", component: () => import("../views/supplierAdmin/supplierIndex.vue"), }, - //承包资质申请 - { - path: "/supplier/qualification/apply", - name: "承包资质申请", - component: () => - import("@/views/supplierAdmin/qualificationApply/index.vue"), - }, // 工作台 { path: "/workSpace", diff --git a/src/store/index.js b/src/store/index.js index d76a5a6e..67abeeae 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,19 +46,19 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - BASEURL: baseUrl - ? baseUrl - : window.location.protocol + "//" + window.location.host + "/", //正式环境 - UPLOADURL: - window.location.protocol + - "//" + - window.location.host + - "/upload/image", //正式环境 - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/", //正式环境 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/companyAdmin/supplierManage/index.vue b/src/views/companyAdmin/supplierManage/index.vue index 2b2e2556..fdfea1e8 100644 --- a/src/views/companyAdmin/supplierManage/index.vue +++ b/src/views/companyAdmin/supplierManage/index.vue @@ -7,23 +7,23 @@ :model="searchForm" ref="searchForm" > - + - + - + @@ -190,7 +189,9 @@ export default { return { downloadUrl: "", searchForm: { - fileName: "", + account: "", + companyName: "", + timeRange: [] }, total: 0, pageNo: 1, @@ -299,10 +300,16 @@ export default { headquartersSn: this.$store.state.userInfo.headquartersSn, pageNo:this.pageNo, pageSize: this.pageSize, - accountType: 2 + accountType: 2, + account: this.searchForm.account, + companyName: this.searchForm.companyName + } + if (this.searchForm.timeRange.length > 0) { + requestData.createTime_begin = this.searchForm.timeRange[0]; + requestData.createTime_end = this.searchForm.timeRange[1]; } getUserAuditListApi(requestData).then((res) => { - this.userAuditList = res.result.records; + this.tableData = res.result.records; this.total = res.result.total; }); }, diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index 9900e75d..dc84a932 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -934,6 +934,7 @@ export default { break; case 5: case 6: + case 11: // 中建四局 this.$store.commit("setMenuList", projectModule); this.$store.commit("setProjectManageMenuList", projectModule); diff --git a/src/views/jxjadmin/moduleMenuManage.vue b/src/views/jxjadmin/moduleMenuManage.vue index 3ebff180..c485a4cd 100644 --- a/src/views/jxjadmin/moduleMenuManage.vue +++ b/src/views/jxjadmin/moduleMenuManage.vue @@ -740,7 +740,7 @@ export default { ] }, btnList: [], - moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台'], + moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理'], searchModuleType: 2, styleTypeArr: [ '普通项目级版本', diff --git a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue index 4e31c1d5..0406b04f 100644 --- a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue +++ b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue @@ -57,19 +57,19 @@ width="200" prop="jobName" align="center" - label="序号" + label="资质申请时间" > - + - diff --git a/src/views/supplierAdmin/supplierIndex.vue b/src/views/supplierAdmin/supplierIndex.vue index ed250978..570e120e 100644 --- a/src/views/supplierAdmin/supplierIndex.vue +++ b/src/views/supplierAdmin/supplierIndex.vue @@ -3,17 +3,25 @@
-
+
-
{{ item.title }}
+
{{ item.moduleName }}
-
{{ item.describe }}
-
进入
+
{{ item.moduleDesc }}
+
进入
- +
@@ -21,6 +29,7 @@