yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
God 3 years ago
parent
650bcd2b18 8bbaba4592
commit
1fc68fe400
9 changed files with 29 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  2. 2
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
  3. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  4. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  5. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
  6. 24
      anrui-system-ui/src/views/Home/Home.vue
  7. 4
      anrui-system-ui/src/views/flow/doneList.vue
  8. 4
      anrui-system-ui/src/views/flow/todoList.vue
  9. 8
      anrui-system-ui/src/views/userManage/userManageList.vue

4
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
View File

@ -81,7 +81,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title"> <div class="title">
<div>政策详情(含签单折让、开票下浮等)</div> <div>政策详情(仅适用于陕汽品牌)</div>
<el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox> <el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div> </div>
<el-row> <el-row>
@ -768,7 +768,7 @@ export default {
return return
} }
if (this.formobj.departureDate === '') { if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!') alert('物流发车日期不能为空!')
return return
} }
if (this.freightChecked) { if (this.freightChecked) {

2
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
View File

@ -79,7 +79,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title"> <div class="title">
<div>政策详情(含签单折让、开票下浮等)</div> <div>政策详情(仅适用于陕汽品牌)</div>
<el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox> <el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div> </div>
<el-row> <el-row>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
View File

@ -81,7 +81,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title"> <div class="title">
<div>政策详情(含签单折让、开票下浮等)</div> <div>政策详情(仅适用于陕汽品牌)</div>
<el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox> <el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div> </div>
<el-row> <el-row>

4
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
View File

@ -80,7 +80,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title"> <div class="title">
<div>政策详情(含签单折让、开票下浮等)</div> <div>政策详情(仅适用于陕汽品牌)</div>
<el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox> <el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div> </div>
<el-row> <el-row>
@ -789,7 +789,7 @@ export default {
return return
} }
if (this.formobj.departureDate === '') { if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!') alert('物流发车日期不能为空!')
return return
} }
if (this.freightChecked) { if (this.freightChecked) {

2
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
View File

@ -79,7 +79,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div class="title"> <div class="title">
<div>政策详情(含签单折让、开票下浮等)</div> <div>政策详情(仅适用于陕汽品牌)</div>
<el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox> <el-checkbox v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div> </div>
<el-row> <el-row>

24
anrui-system-ui/src/views/Home/Home.vue
View File

@ -365,23 +365,23 @@ export default {
// this.$router.push({path: '/index'}) // this.$router.push({path: '/index'})
let myPopup = window.open('/#/index', '_blank') let myPopup = window.open('/#/index', '_blank')
} else if (index == '7') { } else if (index == '7') {
let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://anrui.yyundong.com/base/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.172.184/base/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '8') { } else if (index == '8') {
let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://anrui.yyundong.com/message/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.172.184/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '1') { } else if (index == '1') {
let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://anrui.yyundong.com/scm/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.172.184/scm/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '4') { } else if (index == '4') {
let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://anrui.yyundong.com/fin/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.172.184/fin/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '5') { } else if (index == '5') {
let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://anrui.yyundong.com/manage/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.172.184/manage/#/' + '?token=' + getStorage(), '_blank')
} else if (index == '0') { } else if (index == '0') {
let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank') // let myPopup = window.open('http://anrui.yyundong.com/buscenter/#/' + '?token=' + getStorage(), '_blank')
// let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank') let myPopup = window.open('http://120.46.172.184/buscenter/#/' + '?token=' + getStorage(), '_blank')
} }
// const page = this.$router.resolve({name: name}) // const page = this.$router.resolve({name: name})
// window.open(page.href,'_blank') // window.open(page.href,'_blank')

4
anrui-system-ui/src/views/flow/doneList.vue
View File

@ -255,8 +255,8 @@ import flowRecords from '@/components/flow/flowRecord'
selectUrl(this.selectUrl_list).then((response) => { selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') { if (response.code === '200') {
// this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
} else { } else {
this.$notify({ this.$notify({
title: '提示', title: '提示',

4
anrui-system-ui/src/views/flow/todoList.vue
View File

@ -286,8 +286,8 @@ export default {
selectUrl(this.selectUrl_list).then((response) => { selectUrl(this.selectUrl_list).then((response) => {
if (response.code === '200') { if (response.code === '200') {
// this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://127.0.0.1:9531' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) // this.url = 'http://anrui.yyundong.com' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
// this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list))) this.url = 'http://120.46.172.184' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
console.log('已办拼接url:',this.url) console.log('已办拼接url:',this.url)
} else { } else {
this.$notify({ this.$notify({

8
anrui-system-ui/src/views/userManage/userManageList.vue
View File

@ -7,9 +7,12 @@
<el-form-item label="用户名"> <el-form-item label="用户名">
<el-input v-model="search.userName" clearable></el-input> <el-input v-model="search.userName" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="姓名">
<el-input v-model="search.name" clearable></el-input>
</el-form-item>
<el-form-item label="角色"> <el-form-item label="角色">
<el-select v-model="search.roleSid" clearable placeholder="请选择"> <el-select v-model="search.roleSid" filterable clearable placeholder="请选择">
<el-option v-for="(item,i) in roleListAll" :key="i" :label="item.name" :value="item.sid"></el-option> <el-option v-for="item in roleListAll" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="部门"> <el-form-item label="部门">
@ -204,6 +207,7 @@ export default {
timer: null, timer: null,
roleListAll: [], roleListAll: [],
search: { search: {
name: '',
userName: '', userName: '',
roleSid: '' roleSid: ''
}, },

Write Preview
Loading…
Cancel
Save