Browse Source

Merge remote-tracking branch 'origin/master'

master
yxt_djz 3 years ago
parent
commit
ac6ab4bfa0
  1. 9
      anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
  2. 59
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  3. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
  4. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
  5. 49
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
  6. 10
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
  7. 7
      anrui-scm/anrui-scm-ui/src/api/gongyingshang/gongyingshang.js
  8. 57
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  9. 10
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  10. 18
      anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
  11. 2
      anrui-system-ui/.env.development
  12. 14
      anrui-system-ui/src/api/User/login.js
  13. 67
      anrui-system-ui/src/styles/el-form.scss
  14. 1
      anrui-system-ui/src/styles/index.scss
  15. 660
      anrui-system-ui/src/views/Home/Home.vue

9
anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@ -63,3 +63,12 @@ export function selectAccountByUseOrgSid(data) {
method: 'get' method: 'get'
}) })
} }
// 获取厂家回款通路
export function selectNameByOrg(data) {
return request({
url: '/base/v1/basemanufacturer/selectNameByOrg',
method: 'get',
params: data
})
}

59
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue

@ -95,10 +95,20 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<span>品牌</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span><span class="icon">*</span>是否涉及车辆</span> <span><span class="icon">*</span>是否涉及车辆</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="8">
<el-form-item> <el-form-item>
<el-radio v-model="formobj.isVeh" label="1"></el-radio> <el-radio v-model="formobj.isVeh" label="1"></el-radio>
<el-radio v-model="formobj.isVeh" label="0"></el-radio> <el-radio v-model="formobj.isVeh" label="0"></el-radio>
@ -126,7 +136,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家销售通路" align="center"> <el-table-column label="厂家回款通路" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)"> <el-select v-model="scope.row.actualPay" placeholder="请选择" filterable @change="changeActualPay($event, scope.row)">
<el-option v-for="item in actualPay_list" :key="item.bankAccount" :label="item.actualPay" :value="item.actualPay"/> <el-option v-for="item in actualPay_list" :key="item.bankAccount" :label="item.actualPay" :value="item.actualPay"/>
@ -196,7 +206,15 @@
<script> <script>
import req from '@/api/anruifinmanagement/payment' import req from '@/api/anruifinmanagement/payment'
import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg } from '@/api/jichuxinxi/dictcommons' import {
typeValues,
getPathSidByUserSid,
fetchBySid,
selectByOrgSid,
getListOrg,
brandDown,
selectNameByOrg
} from '@/api/jichuxinxi/dictcommons'
import vehcile from './relation/vehcile' import vehcile from './relation/vehcile'
export default { export default {
name: 'fukuanshenqingAdd', name: 'fukuanshenqingAdd',
@ -210,6 +228,7 @@ export default {
index: 0, index: 0,
vehicleKey: 1, vehicleKey: 1,
viewState: 1, viewState: 1,
carBrand_list: [],
costType_list: [], costType_list: [],
costTitle_list: [], costTitle_list: [],
payCompany_list: [], payCompany_list: [],
@ -234,6 +253,8 @@ export default {
sid: '', sid: '',
taskId: '', taskId: '',
isVeh: '', isVeh: '',
carBrandName: '',
carBrandSid: '',
detailsList: [], detailsList: [],
vehicleList: [] vehicleList: []
}, },
@ -301,9 +322,9 @@ export default {
this.formobj.payCompany = res.data.name this.formobj.payCompany = res.data.name
} }
}) })
req.actualList().then((resp) => { brandDown({ useOrg: response.data }).then((res) => {
if (resp.success) { if (res.success) {
this.actualPay_list = resp.data this.carBrand_list = res.data
} }
}) })
} }
@ -330,12 +351,21 @@ export default {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId this.formobj.instanceId = resp.data.procInstId
selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
if (res.success) {
this.actualPay_list = res.data
}
})
} }
}).catch((e) => { }).catch((e) => {
this.formobj = row this.formobj = row
}) })
}, },
handleAdd() { handleAdd() {
if (this.formobj.carBrandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.formobj.detailsList.push({ this.formobj.detailsList.push({
actualPay: '', actualPay: '',
bank: '', bank: '',
@ -372,6 +402,23 @@ export default {
}) })
} }
}, },
changeCarBrand(value) {
let bb = null
this.carBrand_list.forEach((e) => {
if (e.brandName === value) {
bb = {
name: e.brandName,
sid: e.sid
}
}
})
this.formobj.carBrandSid = bb.sid
selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
if (res.success) {
this.actualPay_list = res.data
}
})
},
changePaymentType(value, row) { changePaymentType(value, row) {
let bb = null let bb = null
this.payment_list.forEach((e) => { this.payment_list.forEach((e) => {

10
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue

@ -72,10 +72,16 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<span>品牌</span>
</el-col>
<el-col :span="8">
<el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>是否涉及车辆</span> <span>是否涉及车辆</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="8">
<el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item> <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -89,7 +95,7 @@
<span>{{ scope.row.paymentType }}</span> <span>{{ scope.row.paymentType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家销售通路" align="center"> <el-table-column label="厂家回款通路" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span> <span>{{ scope.row.actualPay }}</span>
</template> </template>

10
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@ -74,10 +74,16 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<span>品牌</span>
</el-col>
<el-col :span="8">
<el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>是否涉及车辆</span> <span>是否涉及车辆</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="8">
<el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item> <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -91,7 +97,7 @@
<span>{{ scope.row.paymentType }}</span> <span>{{ scope.row.paymentType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家销售通路" align="center"> <el-table-column label="厂家回款通路" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span> <span>{{ scope.row.actualPay }}</span>
</template> </template>

49
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@ -94,10 +94,20 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<span>品牌</span>
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="formobj.carBrandName" filterable placeholder="请选择" @change="changeCarBrand" clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span><span class="icon">*</span>是否涉及车辆</span> <span><span class="icon">*</span>是否涉及车辆</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="8">
<el-form-item> <el-form-item>
<el-radio v-model="formobj.isVeh" label="1"></el-radio> <el-radio v-model="formobj.isVeh" label="1"></el-radio>
<el-radio v-model="formobj.isVeh" label="0"></el-radio> <el-radio v-model="formobj.isVeh" label="0"></el-radio>
@ -195,7 +205,7 @@
<script> <script>
import req from '@/api/anruifinmanagement/payment' import req from '@/api/anruifinmanagement/payment'
import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg } from '@/api/jichuxinxi/dictcommons' import { typeValues, getPathSidByUserSid, fetchBySid, selectByOrgSid, getListOrg, brandDown, selectNameByOrg } from '@/api/jichuxinxi/dictcommons'
import vehcile from './relation/vehcile' import vehcile from './relation/vehcile'
export default { export default {
name: 'fukuanEdit', name: 'fukuanEdit',
@ -209,6 +219,7 @@ export default {
index: 0, index: 0,
vehicleKey: 1, vehicleKey: 1,
viewState: 1, viewState: 1,
carBrand_list: [],
costType_list: [], costType_list: [],
costTitle_list: [], costTitle_list: [],
payCompany_list: [], payCompany_list: [],
@ -233,6 +244,8 @@ export default {
sid: '', sid: '',
taskId: '', taskId: '',
isVeh: '', isVeh: '',
carBrandName: '',
carBrandSid: '',
detailsList: [], detailsList: [],
vehicleList: [] vehicleList: []
}, },
@ -304,9 +317,9 @@ export default {
this.formobj.payCompany = res.data.name this.formobj.payCompany = res.data.name
} }
}) })
req.actualList().then((resp) => { brandDown({ useOrg: response.data }).then((res) => {
if (resp.success) { if (res.success) {
this.actualPay_list = resp.data this.carBrand_list = res.data
} }
}) })
} }
@ -322,12 +335,21 @@ export default {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId this.formobj.instanceId = resp.data.procInstId
selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
if (res.success) {
this.actualPay_list = res.data
}
})
} }
}).catch((e) => { }).catch((e) => {
this.formobj = {} this.formobj = {}
}) })
}, },
handleAdd() { handleAdd() {
if (this.formobj.carBrandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.formobj.detailsList.push({ this.formobj.detailsList.push({
actualPay: '', actualPay: '',
bank: '', bank: '',
@ -364,6 +386,23 @@ export default {
}) })
} }
}, },
changeCarBrand(value) {
let bb = null
this.carBrand_list.forEach((e) => {
if (e.brandName === value) {
bb = {
name: e.brandName,
sid: e.sid
}
}
})
this.formobj.carBrandSid = bb.sid
selectNameByOrg({ carBrandSid: this.formobj.carBrandSid }).then((res) => {
if (res.success) {
this.actualPay_list = res.data
}
})
},
changePaymentType(value, row) { changePaymentType(value, row) {
let bb = null let bb = null
this.payment_list.forEach((e) => { this.payment_list.forEach((e) => {

10
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@ -72,10 +72,16 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<span>品牌</span>
</el-col>
<el-col :span="8">
<el-form-item><span>{{ formobj.carBrandName }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<span>是否涉及车辆</span> <span>是否涉及车辆</span>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="8">
<el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item> <el-form-item><span>{{ formobj.isVeh === '1' ? '是' : '否' }}</span></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -89,7 +95,7 @@
<span>{{ scope.row.paymentType }}</span> <span>{{ scope.row.paymentType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="厂家销售通路" align="center"> <el-table-column label="厂家回款通路" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span> <span>{{ scope.row.actualPay }}</span>
</template> </template>

7
anrui-scm/anrui-scm-ui/src/api/gongyingshang/gongyingshang.js

@ -44,6 +44,13 @@ export default {
params: data params: data
}) })
}, },
// 获取厂商按钮
saveGysByOrgSid: function(data) {
return request({
url: '/base/v1/basemanufacturer/saveGysByOrgSid/' + data,
method: 'get'
})
},
// 通过sid删除一条或多条记录 // 通过sid删除一条或多条记录
delBySids: function(data) { delBySids: function(data) {
return request({ return request({

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

@ -14,7 +14,7 @@
<el-col :span="24" class="tleftb">金额单位</el-col> <el-col :span="24" class="tleftb">金额单位</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item prop="purchaseSystemName"> <el-form-item prop="purchaseSystemName">
<span slot="label">采购系统</span> <span slot="label">采购系统</span>
<el-select v-model="temp.purchaseSystemName" class="addinputw" clearable placeholder="" filterable @change="orgDeptChange"> <el-select v-model="temp.purchaseSystemName" class="addinputw" clearable placeholder="" filterable @change="orgDeptChange">
@ -22,8 +22,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item> <el-form-item prop="carBrandName">
<span slot="label">品牌</span>
<el-select v-model="temp.carBrandName" class="addinputw" clearable placeholder="" @change="carBrandChange" filterable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="configNameStyle">
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center"> <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div> <div>
<span slot="label"><span class="icon">*</span>车型(配置简述)</span> <span slot="label"><span class="icon">*</span>车型(配置简述)</span>
@ -269,7 +277,7 @@
<script> <script>
import { SaveList, Update, selVehModelByUseOrgSidAll, details } from '@/api/cheliang/basevehicle' import { SaveList, Update, selVehModelByUseOrgSidAll, details } from '@/api/cheliang/basevehicle'
import { typeValues, selectOrgLists, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg } from '@/api/cheliang/dictcommons' import { typeValues, selectOrgLists, getPathSidByUserSid, fetchByUseOrgSid, fetchBySid, selectNameByOrg, brandDown } from '@/api/cheliang/dictcommons'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
export default { export default {
@ -293,10 +301,12 @@ export default {
useOrgSid: '', useOrgSid: '',
vehicleAlias: '', vehicleAlias: '',
configName: '', configName: '',
brandSid: ''
} }
}, },
FormLoading: false, FormLoading: false,
// //
carBrand_list: [],
orgDept_list: [], orgDept_list: [],
actualPay_list: [], actualPay_list: [],
vehicleState_list: [], // vehicleState_list: [], //
@ -344,12 +354,15 @@ export default {
manufSaleAccessSid: '', manufSaleAccessSid: '',
manufSaleAccessName: '', manufSaleAccessName: '',
rebate1: '', rebate1: '',
isProblemVeh: '' isProblemVeh: '',
carBrandSid: '',
carBrandName: ''
}, // }, //
dialogFormVisible: false, // dialogFormVisible: false, //
dialogStatus: '', // dialogStatus: '', //
rules: { rules: {
purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }], purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }],
carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
vinNo: [{ required: true, message: '车架号不能为空', trigger: 'blur' }], vinNo: [{ required: true, message: '车架号不能为空', trigger: 'blur' }],
manPurOrderTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }], manPurOrderTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }],
lockedStateValue: [{ required: true, message: '锁定状态不能为空', trigger: 'change' }], lockedStateValue: [{ required: true, message: '锁定状态不能为空', trigger: 'change' }],
@ -401,7 +414,12 @@ export default {
}) })
}, },
handSelect() { handSelect() {
if (this.temp.carBrandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
this.dialogVisible = true this.dialogVisible = true
this.listQuery.params.brandSid = this.temp.carBrandSid
this.getList() this.getList()
}, },
handleConfig() { handleConfig() {
@ -416,11 +434,6 @@ export default {
this.temp.modelConfigSid = row.configSid this.temp.modelConfigSid = row.configSid
this.temp.price = row.price this.temp.price = row.price
this.temp.insideCode = row.insideCode this.temp.insideCode = row.insideCode
selectNameByOrg({ carBrandSid: row.carBrand }).then((respsone) => {
if (respsone.success) {
this.actualPay_list = respsone.data
}
})
}, },
showAdd() { showAdd() {
this.$nextTick(() => { this.$nextTick(() => {
@ -451,7 +464,7 @@ export default {
details(sid).then((response) => { details(sid).then((response) => {
if (response.code === '200') { if (response.code === '200') {
this.temp = response.data this.temp = response.data
actualList({ modelSid: this.temp.modelSid }).then((respsone) => { selectNameByOrg({ carBrandSid: this.temp.carBrandSid }).then((respsone) => {
if (respsone.success) { if (respsone.success) {
this.actualPay_list = respsone.data this.actualPay_list = respsone.data
} }
@ -478,6 +491,11 @@ export default {
this.location_list = resp.data this.location_list = resp.data
} }
}) })
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
this.carBrand_list = resp.data
}
})
} }
}) })
}, },
@ -517,6 +535,15 @@ export default {
const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === val) const choosetItem = this.orgDept_list.filter((item) => item.orgDeptName === val)
this.temp.purchaseSystemSid = choosetItem[0].orgDeptSid this.temp.purchaseSystemSid = choosetItem[0].orgDeptSid
}, },
carBrandChange(val) {
const choosetItem = this.carBrand_list.filter((item) => item.brandName === val)
this.temp.carBrandSid = choosetItem[0].sid
selectNameByOrg({ carBrandSid: this.temp.carBrandSid }).then((respsone) => {
if (respsone.success) {
this.actualPay_list = respsone.data
}
})
},
vehicleStateValueChange(val) { vehicleStateValueChange(val) {
const choosetItem = this.vehicleState_list.filter((item) => item.dictKey === val) const choosetItem = this.vehicleState_list.filter((item) => item.dictKey === val)
this.temp.vehicleStateValue = choosetItem[0].dictValue this.temp.vehicleStateValue = choosetItem[0].dictValue
@ -585,7 +612,10 @@ export default {
purchaseSystemName: '', purchaseSystemName: '',
manufSaleAccessSid: '', manufSaleAccessSid: '',
manufSaleAccessName: '', manufSaleAccessName: '',
rebate1: '' rebate1: '',
carBrandSid: '',
carBrandName: '',
isProblemVeh: ''
} }
this.$emit('doback') this.$emit('doback')
}, },
@ -657,4 +687,7 @@ export default {
/deep/ .tlineheightb .el-form-item .el-form-item__label { /deep/ .tlineheightb .el-form-item .el-form-item__label {
line-height: 15px !important; line-height: 15px !important;
} }
/deep/ .configNameStyle .el-form-item__content {
margin-left: 1% !important;
}
</style> </style>

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

@ -13,13 +13,19 @@
<el-col :span="24" class="tleftb">金额单位</el-col> <el-col :span="24" class="tleftb">金额单位</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item> <el-form-item>
<span slot="label">采购系统</span> <span slot="label">采购系统</span>
<span>{{ temp.purchaseSystemName }}</span> <span>{{ temp.purchaseSystemName }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item>
<span slot="label">品牌</span>
<span>{{ temp.carBrandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item> <el-form-item>
<span slot="label">车型(配置简述)</span> <span slot="label">车型(配置简述)</span>
<span>{{ temp.modelName }}</span> <span>{{ temp.modelName }}</span>

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

@ -124,6 +124,13 @@ export default {
btnKey: 'doDel', btnKey: 'doDel',
btnLabel: '删除' btnLabel: '删除'
}, },
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toChangShang',
btnLabel: '获取厂商'
},
{ {
type: 'primary', type: 'primary',
size: 'small', size: 'small',
@ -191,6 +198,9 @@ export default {
case 'doDel': case 'doDel':
this.doDel() this.doDel()
break break
case 'toChangShang':
this.toChangShang()
break
case 'toGain': case 'toGain':
this.toGain() this.toGain()
break break
@ -317,6 +327,14 @@ export default {
return return
} }
}, },
toChangShang() {
req.saveGysByOrgSid(this.listQuery.params.createOrgSid).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '获取成功' })
this.getList()
}
})
},
toGain() { toGain() {
req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => { req.saveAllByOrgSid({ orgSid: this.listQuery.params.createOrgSid }).then((resp) => {
if (resp.success) { if (resp.success) {

2
anrui-system-ui/.env.development

@ -6,5 +6,5 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://26077a35f5.wicp.vip" ##VUE_APP_URL = "http://26077a35f5.wicp.vip"
VUE_APP_URL = "http://127.0.0.1:8111" VUE_APP_URL = "http://anrui.yyundong.com"
##VUE_APP_URL = "http://1mn7264414.qicp.vip" ##VUE_APP_URL = "http://1mn7264414.qicp.vip"

14
anrui-system-ui/src/api/User/login.js

@ -9,13 +9,15 @@ class user {
data data
}) })
} }
logout(data) { // 退出
logout(data) { // 退出
return request({ return request({
url: '/portal/v1/sysuser/signOut', url: '/portal/v1/sysuser/signOut',
method: 'post', method: 'post',
data: qs.stringify(data) data: qs.stringify(data)
}) })
} }
updatePassword(data) { // 退出修改密码 updatePassword(data) { // 退出修改密码
return request({ return request({
url: '/portal/v1/sysuser/updatePassword', url: '/portal/v1/sysuser/updatePassword',
@ -23,14 +25,20 @@ class user {
data: qs.stringify(data) data: qs.stringify(data)
}) })
} }
reGetPwd(data){
reGetPwd(data) {
return request({ return request({
url: `/system/user/reGetPwd/${data.userName}/${data.userPhone}`, url: `/system/user/reGetPwd/${data.userName}/${data.userPhone}`,
method: 'post', method: 'post',
data: qs.stringify(data) data: qs.stringify(data)
}) })
} }
selectPasswordByUserSid(data) {
return request({
url: '/portal/v1/sysuser/selectPasswordByUserSid/' + data,
method: 'get'
})
}
} }
export default new user() export default new user()

67
anrui-system-ui/src/styles/el-form.scss

@ -0,0 +1,67 @@
.listconadd .title {
text-align: center;
font-size: 28px;
//line-height: 90px;
}
.listaddtop {
padding: 0 212px;
border-bottom: 2px solid #e0e3eb;
display: flex;
justify-content: space-between;
align-items: center;
line-height: 34px;
span {
padding: 0 15px;
}
}
.listconadd .demo-ruleForm {
padding: 22px 28px;
}
.el-collapse-item__header {
.el-icon-arrow-right:before {
content: "";
font-size: 20px;
}
}
.demo-ruleForm table {
width: 100%;
border-collapse: collapse;
border: 2px solid #e0e3eb;
border-spacing: 0;
//text-align: right;
td {
border-right: 2px solid #e0e3eb;
border-bottom: 2px solid #e0e3eb;
border-top: 2px solid #e0e3eb;
}
tr {
height: 40px;
}
.el-form-item {
display: inline-block;
}
.el-input {
display: inline-block;
}
}
.tleftb {
text-align: right;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.icon {
color: #e84026;
margin-right: 4px;
}

1
anrui-system-ui/src/styles/index.scss

@ -7,6 +7,7 @@
@import './e-table.scss'; @import './e-table.scss';
@import './element-table.scss'; @import './element-table.scss';
@import './element-tabs.scss'; @import './element-tabs.scss';
@import './el-form.scss';
body { body {
height: 100%; height: 100%;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;

660
anrui-system-ui/src/views/Home/Home.vue

@ -3,9 +3,9 @@
<div class="header"> <div class="header">
<p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p> <p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
<div class="head_info"> <div class="head_info">
<!-- <p>{{Orgname}},</p>--> <!-- <p>{{Orgname}},</p>-->
<!--<p>{{$store.getters.userInfo.Orgname}}</p>--> <!--<p>{{$store.getters.userInfo.Orgname}}</p>-->
<p>欢迎您{{pNameAndDepartmentNameAndPostName}} {{ roleName }} {{name}}</p> <p>欢迎您{{ pNameAndDepartmentNameAndPostName }} {{ roleName }} {{ name }}</p>
<!--<img src="@/assets/images/info.png" />--> <!--<img src="@/assets/images/info.png" />-->
<p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p> <p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p>
</div> </div>
@ -16,7 +16,7 @@
<ul class="grid-content bg-ltop"> <ul class="grid-content bg-ltop">
<li @click="todowork"> <li @click="todowork">
<div style="position: relative"> <div style="position: relative">
<el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark" /> <el-badge v-if="shuliang.workCount !== 0" :value="shuliang.workCount" size="mini" class="mark"/>
<img src="@/assets/home/ltIcon1.png"> <img src="@/assets/home/ltIcon1.png">
</div> </div>
<p>待办工作</p> <p>待办工作</p>
@ -72,7 +72,7 @@
<ul class="bg-bottom"> <ul class="bg-bottom">
<li @click="toNav(index)" v-for="(item,index) in menus" :key='index'> <li @click="toNav(index)" v-for="(item,index) in menus" :key='index'>
<img :src="item.imgUrl"> <img :src="item.imgUrl">
<p>{{item.title}}</p> <p>{{ item.title }}</p>
</li> </li>
</ul> </ul>
<p class="copy">Copyright © {{ year }} 安瑞集团 All Rights Reserved</p> <p class="copy">Copyright © {{ year }} 安瑞集团 All Rights Reserved</p>
@ -162,342 +162,428 @@
<p>系统管理</p> <p>系统管理</p>
</li> --> </li> -->
<!--</ul>--> <!--</ul>-->
<el-dialog center :visible.sync="dialogVisible" width="40%" :show-close="false" :close-on-click-modal="false">
<el-form :model="form" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>原密码</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input v-model="form.original" type="password" show-password/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>新密码</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input v-model="form.password" type="password" show-password/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>确认密码</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input v-model="form.confirmPassword" type="password" show-password/></el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="handleConirm"> </el-button>
<el-button size="small" @click="handleQuXiao"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getToken, removeToken, getStorage, removeStorage} from '@/utils/auth' import { getToken, removeToken, getStorage, removeStorage } from '@/utils/auth'
import {sourcesofrole} from '@/api/system/Role/role.js' import {sourcesofrole} from '@/api/system/Role/role.js'
import User from '@/api/User/login.js' import User from '@/api/User/login.js'
import { getTodoNum } from '@/api/system/home/home' import { getTodoNum } from '@/api/system/home/home'
export default { export default {
data() { data() {
return { return {
menus: [{ menus: [{
imgUrl: require('@/assets/home/bIcon1.png'), imgUrl: require('@/assets/home/bIcon1.png'),
title: '业务管理' title: '业务管理'
}, { }, {
imgUrl: require('@/assets/home/scm.png'), imgUrl: require('@/assets/home/scm.png'),
title: '供应链管理' title: '供应链管理'
}, { }, {
imgUrl: require('@/assets/home/bIcon2.png'), imgUrl: require('@/assets/home/bIcon2.png'),
title: '风控管理' title: '风控管理'
}, { }, {
imgUrl: require('@/assets/home/bIcon3.png'), imgUrl: require('@/assets/home/bIcon3.png'),
title: '审计管理' title: '审计管理'
}, { }, {
imgUrl: require('@/assets/home/bIcon4.png'), imgUrl: require('@/assets/home/bIcon4.png'),
title: '财务管理' title: '财务管理'
}, { }, {
imgUrl: require('@/assets/home/bIcon5.png'), imgUrl: require('@/assets/home/bIcon5.png'),
title: '行政管理' title: '行政管理'
}, { }, {
imgUrl: require('@/assets/home/bIcon6.png'), imgUrl: require('@/assets/home/bIcon6.png'),
title: '报表中心' title: '报表中心'
}, { }, {
imgUrl: require('@/assets/home/bIcon7.png'), imgUrl: require('@/assets/home/bIcon7.png'),
title: '基础信息' title: '基础信息'
}, { }, {
imgUrl: require('@/assets/home/notice.png'), imgUrl: require('@/assets/home/notice.png'),
title: '消息中心' title: '消息中心'
}, { }, {
imgUrl: require('@/assets/home/bIcon8.png'), imgUrl: require('@/assets/home/bIcon8.png'),
title: '系统管理' title: '系统管理'
}], }],
userInfo: {}, userInfo: {},
shuliang: { shuliang: {
workCount: '' workCount: ''
}, },
timer: '', dialogVisible: false,
Orgname: '', form: {
departmentName: '', original: '',
name: '', password: '',
pNameAndDepartmentNameAndPostName: '', confirmPassword: '',
roleName: '', userSid: ''
year: '' },
} timer: '',
}, Orgname: '',
beforeCreate() { departmentName: '',
name: '',
pNameAndDepartmentNameAndPostName: '',
roleName: '',
year: ''
}
},
beforeCreate() {
}, },
created() { created() {
this.getNum() this.getsPasswordByUserSid()
this.timer = setInterval(this.getNum, 20000) },
}, mounted() {
mounted() { this.Orgname = window.sessionStorage.getItem('Orgname')
this.Orgname = window.sessionStorage.getItem('Orgname') this.departmentName = window.sessionStorage.getItem('departmentName')
this.departmentName = window.sessionStorage.getItem('departmentName') this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName')
this.pNameAndDepartmentNameAndPostName = window.sessionStorage.getItem('pNameAndDepartmentNameAndPostName') this.roleName = window.sessionStorage.getItem('roleName')
this.roleName = window.sessionStorage.getItem('roleName') this.name = window.sessionStorage.getItem('name')
this.name = window.sessionStorage.getItem('name') var nowDate = new Date()
var nowDate = new Date() this.year = nowDate.getFullYear()
this.year = nowDate.getFullYear()
// sourcesofrole({ psid: '0', roleSid: this.$store.getters.userInfo.roleSid }).then(res => { // sourcesofrole({ psid: '0', roleSid: this.$store.getters.userInfo.roleSid }).then(res => {
// this.menus = res.data // this.menus = res.data
// }) // })
},
methods: {
getsPasswordByUserSid() {
User.selectPasswordByUserSid(window.sessionStorage.getItem('userSid')).then((resp) => {
if (resp.success && resp.data) {
this.dialogVisible = true
} else {
this.getNum()
this.timer = setInterval(this.getNum, 20000)
}
})
}, },
methods: { getNum() {
getNum() { getTodoNum(window.sessionStorage.getItem('userSid')).then((resp) => {
getTodoNum(window.sessionStorage.getItem('userSid')).then((resp) => { if (resp.success) {
if (resp.success) { this.shuliang.workCount = resp.data
this.shuliang.workCount = resp.data }
} })
}) },
}, handleConirm() {
todowork() { if (this.form.original === '') {
window.open('/#/todo' + '?token=' + getStorage(), '_blank') this.$message({ showClose: true, type: 'error', message: '原密码不能为空' })
// this.$router.push({ path: '/todo' + '?token=' + getStorage() }) return
// window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank') }
}, if (this.form.password !== this.form.confirmPassword) {
donework() { this.$message({ showClose: true, type: 'error', message: '两次输入密码不一致' })
window.open('/#/done' + '?token=' + getStorage(), '_blank') return
// this.$router.push({ path: '/done' + '?token=' + getStorage() }) }
// window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank') this.form.userSid = window.sessionStorage.getItem('userSid')
}, User.updatePassword(this.form).then((resp) => {
logout() { if (resp.success) {
this.$confirm('确定要退出吗, 是否继续?', '提示', { this.$alert('密码修改成功!请重新登录点击确定后退出。', '修改成功', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', callback: action => {
type: 'warning' this.handleQuXiao()
}).then(() => { }
User.logout({ token: getStorage() }).then(res => {
removeStorage()
this.$store.commit('user/SET_UESRINFO', '')
this.$router.push({ path: '/login' })
}) })
})
},
xxzx() {
this.$alert('项目正在开发中', '提示', {
dangerouslyUseHTMLString: true
})
},
toNavbar(name) {
let myPopup = window.open(name + '?token=' + getStorage(), '_blank')
},
toNav(index, name, titleName) {
if (index == '9') {
// this.$router.push({path: '/index'})
let myPopup = window.open('/#/index', '_blank')
} else if (index == '7') {
let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '8') {
let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') {
let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') {
let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') {
let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '0') {
let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
} }
// const page = this.$router.resolve({name: name}) })
// window.open(page.href,'_blank') },
handleQuXiao() {
this.dialogVisible = false
this.form = {
original: '',
password: '',
confirmPassword: ''
} }
User.logout({ token: getStorage() }).then((res) => {
if (res.success) {
removeStorage()
this.$store.commit('user/SET_UESRINFO', '')
this.$router.push({ path: '/login' })
}
})
},
todowork() {
window.open('/#/todo' + '?token=' + getStorage(), '_blank')
// this.$router.push({ path: '/todo' + '?token=' + getStorage() })
// window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank')
},
donework() {
window.open('/#/done' + '?token=' + getStorage(), '_blank')
// this.$router.push({ path: '/done' + '?token=' + getStorage() })
// window.open('http://127.0.0.1/message'+'?token='+getStorage(),'_blank')
},
logout() {
this.$confirm('确定要退出吗, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
User.logout({token: getStorage()}).then(res => {
removeStorage()
this.$store.commit('user/SET_UESRINFO', '')
this.$router.push({ path: '/login' })
})
})
},
xxzx() {
this.$alert('项目正在开发中', '提示', {
dangerouslyUseHTMLString: true
})
},
toNavbar(name) {
let myPopup = window.open(name + '?token=' + getStorage(), '_blank')
}, },
beforeDestroy() { toNav(index, name, titleName) {
clearInterval(this.timer) if (index == '9') {
// this.$router.push({path: '/index'})
let myPopup = window.open('/#/index', '_blank')
} else if (index == '7') {
let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '8') {
let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') {
let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') {
let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') {
let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '0') {
let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
}
// const page = this.$router.resolve({name: name})
// window.open(page.href,'_blank')
} }
},
beforeDestroy() {
clearInterval(this.timer)
} }
}
</script> </script>
<style scoped="scoped"> <style scoped="scoped">
li:hover, li:hover,
p:hover { p:hover {
cursor: pointer cursor: pointer
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
p { p {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.header { .header {
background-color: #0294d7; background-color: #0294d7;
color: #fff; color: #fff;
overflow: hidden; overflow: hidden;
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
.title {
img {
width: 70px;
vertical-align: middle;
font-family: Adobe Heiti Std;
}
float: left; .title {
font-size: 34px; img {
margin-left: 35px; width: 70px;
height: 60px; vertical-align: middle;
line-height: 60px; font-family: Adobe Heiti Std;
} }
.head_info { float: left;
float: right; font-size: 34px;
margin-top: 0; margin-left: 35px;
font-size: 17px; height: 60px;
} line-height: 60px;
}
p { .head_info {
float: left; float: right;
} margin-top: 0;
font-size: 17px;
} }
.head_info img { p {
width: 25px;
margin-top: 20px;
margin-left: 30px;
margin-right: 10px;
float: left; float: left;
} }
}
.head_info .dy { .head_info img {
margin-left: 10px; width: 25px;
margin-right: 20px; margin-top: 20px;
} margin-left: 30px;
margin-right: 10px;
float: left;
}
.container1 { .head_info .dy {
background: #E9F1F7; margin-left: 10px;
padding: 20px; margin-right: 20px;
width: 100%; }
height: calc(100% - 60px);
margin: 0;
.bg-ltop { .container1 {
margin: 0; background: #E9F1F7;
padding: 0 20px; padding: 20px;
background-image: url(../../assets/home/ltBg.png); width: 100%;
border-radius: 10px; height: calc(100% - 60px);
overflow: hidden; margin: 0;
height: 190px;
li { .bg-ltop {
float: left; margin: 0;
list-style: none; padding: 0 20px;
width: 25%; background-image: url(../../assets/home/ltBg.png);
text-align: center; border-radius: 10px;
overflow: hidden;
height: 190px;
img { li {
width: 70px; float: left;
margin: 45px auto 10px auto; list-style: none;
} width: 25%;
text-align: center;
img {
width: 70px;
margin: 45px auto 10px auto;
} }
} }
}
.bg-rtop { .bg-rtop {
background-image: url(../../assets/home/rtBg.png); background-image: url(../../assets/home/rtBg.png);
border-radius: 10px; border-radius: 10px;
height: 190px; height: 190px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
.anrui { .anrui {
width: 100%; width: 100%;
height: 40px; height: 40px;
} }
.rt_title { .rt_title {
position: absolute; position: absolute;
top: 10px; top: 10px;
left: 15px; left: 15px;
font-size: 18px; font-size: 18px;
font-family: SourceHanSerifCN; font-family: SourceHanSerifCN;
font-weight: 600; font-weight: 600;
color: #191919; color: #191919;
} }
ul { ul {
margin: 0px auto; margin: 0px auto;
padding: 0; padding: 0;
height: 148px; height: 148px;
width: 100%; width: 100%;
li { li {
font-size: 14px; font-size: 14px;
height: 33px; height: 33px;
line-height: 28px; line-height: 28px;
list-style: none; list-style: none;
text-decoration: underline; text-decoration: underline;
border-bottom: 1px solid #666; border-bottom: 1px solid #666;
width: calc(100% - 70px); width: calc(100% - 70px);
margin-left: 40px; margin-left: 40px;
position: relative; position: relative;
padding-top: 10px; padding-top: 10px;
font-family: SimSun; font-family: SimSun;
img { img {
width: 16px; width: 16px;
margin: 5px 10px; margin: 5px 10px;
position: absolute; position: absolute;
left: -30px; left: -30px;
} }
.notice { .notice {
display: inline-block; display: inline-block;
width: 65%; width: 65%;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
} }
.anrui_time { .anrui_time {
float: right; float: right;
display: inline-block; display: inline-block;
margin-right: 5px; margin-right: 5px;
line-height: 30px; line-height: 30px;
}
} }
} }
} }
}
.bg-bottom { .bg-bottom {
background-image: url(../../assets/home/bottomBg.png); background-image: url(../../assets/home/bottomBg.png);
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
margin: 20px 0 0 0; margin: 20px 0 0 0;
padding: 10px 20px; padding: 10px 20px;
li { li {
float: left; float: left;
list-style: none; list-style: none;
width: 11.6%; width: 11.6%;
margin: 10px 2.5%; margin: 10px 2.5%;
background: #fff; background: #fff;
border-radius: 40px; border-radius: 40px;
text-align: center; text-align: center;
padding: 10px 25px 15px; padding: 10px 25px 15px;
img { img {
width: 80%; width: 80%;
margin: 10px auto; margin: 10px auto;
}
} }
} }
} }
}
.copy { .copy {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: calc(100% - 40px); width: calc(100% - 40px);
margin: auto; margin: auto;
text-align: center; text-align: center;
line-height: 40px; line-height: 40px;
border-top: 2px solid #4E74A6; border-top: 2px solid #4E74A6;
background: #E9F1F7; background: #E9F1F7;
font-size: 14px; font-size: 14px;
color: #666; color: #666;
} }
.mark {
position: absolute; .mark {
top: 38%; position: absolute;
margin-left: 58px; top: 38%;
} margin-left: 58px;
.mark { }
::v-deep .el-badge__content {
font-size: 14px !important; .mark {
} ::v-deep .el-badge__content {
font-size: 14px !important;
} }
}
</style> </style>

Loading…
Cancel
Save