Merge remote-tracking branch 'origin/master'

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"

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) {

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"

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) {

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"

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)
 }

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' }
+  })
+}

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: () =>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -56,7 +56,7 @@
           <el-col :span="8">
             <el-form-item prop="vinNo">
               <span slot="label">车架号：</span>
-              <el-input v-model="temp.vinNo" maxlength="17" placeholder="车架号位数与金蝶系统一致,且不能为空" class="addinputw" clearable/>
+              <el-input v-model="temp.vinNo" maxlength="17" placeholder="车架号位数与金蝶系统一致" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -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
               }
             }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@@ -164,7 +164,7 @@
           <el-col :span="8">
             <el-form-item>
               <span slot="label">买断状态：</span>
-              <span>{{ temp.settlementStatus }}</span>
+              <span>{{ temp.settlementStatusValue }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="8">

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue

@@ -16,7 +16,7 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商名称</span>
+              <span><span class="icon">*</span>供应商名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="manufacturerName">
@@ -38,7 +38,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item>
-                <el-input v-model="baseManufacturerDto.manufacturerCode" maxlength="20" placeholder="" class="addinputw" clearable/>
+                <el-input v-model="baseManufacturerDto.manufacturerCode" :disabled="!isShow" maxlength="20" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -64,7 +64,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商办公电话</span>
+              <span><span class="icon">*</span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="manufacturerTelePhone">
@@ -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

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue

@@ -16,7 +16,7 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商名称</span>
+              <span><span class="icon">*</span>供应商名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -62,7 +62,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商办公电话</span>
+              <span><span class="icon">*</span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue

@@ -14,7 +14,7 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商名称</span>
+              <span><span class="icon">*</span>供应商名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -60,7 +60,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商办公电话</span>
+              <span><span class="icon">*</span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue

@@ -39,7 +39,7 @@
             <el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="操作" fixed align="center" width="90px" class-name="small-padding fixed-width">
               <template slot-scope="{row}">
-                <el-button size="mini" type="primary" :disabled="!row.isShow" @click="handleEdit(row)">编辑</el-button>
+                <el-button size="mini" type="primary" :disabled="!row.isShow && (row.supplierTypeValue === '主机厂' || row.supplierTypeValue === '分公司')" @click="handleEdit(row)">编辑</el-button>
               </template>
             </el-table-column>
             <el-table-column prop="jc" label="供应商名称" width="220" header-align="center" align="left">
@@ -82,7 +82,7 @@
     </div>
     <gongyingshangAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="handleFilter"/>
     <gongyingshangInfo v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
-    <gongyingshangByHosts v-show="5" ref="divHosts" @doback="resetState" @reloadlist="handleFilter"/>
+    <gongyingshangByHosts v-show="viewState == 5" ref="divHosts" @doback="resetState" @reloadlist="handleFilter"/>
   </div>
 </template>