diff --git a/anrui-base/anrui-base-ui/.env.development b/anrui-base/anrui-base-ui/.env.development index 1510fefa66..25d917fcc7 100644 --- a/anrui-base/anrui-base-ui/.env.development +++ b/anrui-base/anrui-base-ui/.env.development @@ -6,6 +6,4 @@ VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 ##VUE_APP_URL = "http://26077a35f5.wicp.vip" -VUE_APP_URL = "http://192.168.2.102:8111" -##VUE_APP_URL = "http://127.0.0.1:8111" -##VUE_APP_URL = "http://1mn7264414.qicp.vip" +VUE_APP_URL = "http://anrui.yyundong.com" diff --git a/anrui-base/anrui-base-ui/src/utils/auth.js b/anrui-base/anrui-base-ui/src/utils/auth.js index 253a8e9962..eb9a03502d 100644 --- a/anrui-base/anrui-base-ui/src/utils/auth.js +++ b/anrui-base/anrui-base-ui/src/utils/auth.js @@ -16,8 +16,8 @@ export function removeToken() { } export function getStorage() { -// return sessionStorage.getItem('token') -return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NDgyNzQ1MjN9.JmSFOKi0juJHaABaXoJnRZKhKlxApkIvs3NTKGpgCGs'; + return sessionStorage.getItem('token') + // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NDgyNzQ1MjN9.JmSFOKi0juJHaABaXoJnRZKhKlxApkIvs3NTKGpgCGs' } export function setStorage(session) { diff --git a/anrui-buscenter/anrui-buscenter-ui/.env.development b/anrui-buscenter/anrui-buscenter-ui/.env.development index 0c8e9236c7..02f8ee89a0 100644 --- a/anrui-buscenter/anrui-buscenter-ui/.env.development +++ b/anrui-buscenter/anrui-buscenter-ui/.env.development @@ -5,8 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -####VUE_APP_URL = "http://26077a35f5.wicp.vip" -VUE_APP_URL = "http://26077a35f5.wicp.vip:25879" ##VUE_APP_URL = "http://192.168.2.44:8111" -VUE_APP_URL = "http://120.46.131.15:8111" -##VUE_APP_URL = "http://1mn7264414.qicp.vip" +VUE_APP_URL = "http://anrui.yyundong.com" diff --git a/anrui-buscenter/anrui-buscenter-ui/src/utils/auth.js b/anrui-buscenter/anrui-buscenter-ui/src/utils/auth.js index 34b5a8fc8e..5075ab8849 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/utils/auth.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/utils/auth.js @@ -8,7 +8,7 @@ export function getToken() { } export function setToken(token) { - return Cookies.set(TokenKey, token, { expires: 7, path: '/' }) + return Cookies.set(TokenKey, token, {expires: 7, path: '/'}) } export function removeToken() { @@ -16,8 +16,8 @@ export function removeToken() { } export function getStorage() { - return sessionStorage.getItem('token') - // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NTM2MTQwMjJ9.CAT-RYSdYeSIL_rDVNQsRJX4beAjU0YpKCd9uMkAL4A' + return sessionStorage.getItem('token') + // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NTM2MTQwMjJ9.CAT-RYSdYeSIL_rDVNQsRJX4beAjU0YpKCd9uMkAL4A' } export function setStorage(session) { diff --git a/anrui-buscenter/anrui-finmanage-ui/.env.development b/anrui-buscenter/anrui-finmanage-ui/.env.development index e350384fee..25d917fcc7 100644 --- a/anrui-buscenter/anrui-finmanage-ui/.env.development +++ b/anrui-buscenter/anrui-finmanage-ui/.env.development @@ -5,4 +5,5 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -VUE_APP_URL = "http://26077a35f5.wicp.vip" +##VUE_APP_URL = "http://26077a35f5.wicp.vip" +VUE_APP_URL = "http://anrui.yyundong.com" diff --git a/anrui-buscenter/anrui-finmanage-ui/src/utils/auth.js b/anrui-buscenter/anrui-finmanage-ui/src/utils/auth.js index 767985e090..8a7d0a4c7d 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/utils/auth.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/utils/auth.js @@ -17,8 +17,9 @@ export function removeToken() { export function getStorage() { return sessionStorage.getItem('token') -// return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiIwZDhkODExOS1kNDc2LTQ3Y2UtODljMi0wNzVjZDgwOWRkYTYiLCJpc3MiOiJXQksiLCJleHAiOjE2Mzc4MDIwODh9.zLhMa-pfxK19jB1gXjjxjYQp3wxjMaJsFa_xQrwknps'; + // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiIwZDhkODExOS1kNDc2LTQ3Y2UtODljMi0wNzVjZDgwOWRkYTYiLCJpc3MiOiJXQksiLCJleHAiOjE2Mzc4MDIwODh9.zLhMa-pfxK19jB1gXjjxjYQp3wxjMaJsFa_xQrwknps'; } + export function setStorage(session) { return sessionStorage.setItem('token', session) } diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js index 8ffacd3964..5ea0307695 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js @@ -209,3 +209,11 @@ export function selVehModelByUseOrgSidAll(data) { }) } +// 车辆台账查询 已改 +export function pagerListByOrgSidPath(data) { + return request({ + url: '/base/v1/basevehicle/pagerListByOrgSidPath', data, + method: 'post', + headers: { 'Content-Type': 'application/json' } + }) +} diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 9614b340db..72ba535f0e 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -242,6 +242,14 @@ const codemenu = [ name: 'cheliangtaizhang', meta: { title: '车辆台账', noCache: true } }, + // 车辆台账查询 + { + path: '/cheliang/cheliangtaizhangchaxun', + component: () => + import('@/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue'), + name: 'chaliangtaizhangselect', + meta: { title: '车辆台账查询', noCache: true } + }, { path: '/cheliang/chexingbaojia', component: () => diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue index 6676f2fbf9..b23edbde5b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue @@ -56,7 +56,7 @@ 车架号: - + @@ -495,7 +495,7 @@ export default { if (resp.success) { this.carBrand_list = resp.data if (this.carBrand_list.length > 0) { - this.temp.carBrandName = this.carBrand_list[0].barndName + this.temp.carBrandName = this.carBrand_list[0].brandName this.temp.carBrandSid = this.carBrand_list[0].sid } } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue index 0eafda7b42..2058f12f1e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue @@ -164,7 +164,7 @@ 买断状态: - {{ temp.settlementStatus }} + {{ temp.settlementStatusValue }} diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue new file mode 100644 index 0000000000..f746e2c4fc --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhangchaxun/chaliangtaizhangselect.vue @@ -0,0 +1,1084 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue index 95888226e7..32399489c5 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue @@ -16,7 +16,7 @@ - *厂商名称 + *供应商名称 @@ -38,7 +38,7 @@ - + @@ -64,7 +64,7 @@ - *厂商办公电话 + *供应商办公电话 @@ -214,6 +214,7 @@ export default { viewTitle: '', dialogStatus: '', sid: '', + isShow: true, supplierType_list: [], baseManufacturerDto: { manufacturerName: '', @@ -237,7 +238,7 @@ export default { rules: { manufacturerName: [{ required: true, - message: '请填写厂商名称', + message: '请填写供应商名称', trigger: 'blur' }], supplierTypeValue: [{ @@ -247,7 +248,7 @@ export default { }], manufacturerAddress: [{ required: true, - message: '请填写厂商通讯地址', + message: '请填写供应商通讯地址', trigger: 'blur' }], manufacturerTelePhone: [{ @@ -363,6 +364,7 @@ export default { this.$refs['form_obj'].clearValidate() }) this.dialogStatus = 'edit' + this.isShow = row.isShow req.fetchBySid(row.sid).then(resp => { this.sid = row.sid this.baseManufacturerDto = resp.data.baseManufacturerDto diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue index 00a3270723..cdf60686ae 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue @@ -16,7 +16,7 @@ - *厂商名称 + *供应商名称 @@ -62,7 +62,7 @@ - *厂商办公电话 + *供应商办公电话 diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue index 5793347a26..b44b7d6bdc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue @@ -14,7 +14,7 @@ - *厂商名称 + *供应商名称 @@ -60,7 +60,7 @@ - *厂商办公电话 + *供应商办公电话 diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue index 0d36fc5b76..8812f885fc 100644 --- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue @@ -39,7 +39,7 @@ @@ -82,7 +82,7 @@ - +