Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 years ago
parent
commit
571a900677
  1. 36
      anrui-base/anrui-base-ui/src/api/business/intermediaryPerson.js
  2. 14
      anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue
  3. 10
      anrui-base/anrui-base-ui/src/components/tab-search/index.vue
  4. 14
      anrui-base/anrui-base-ui/src/styles/anrui-button.scss
  5. 1
      anrui-base/anrui-base-ui/src/styles/index.scss
  6. 194
      anrui-base/anrui-base-ui/src/styles/upload.vue
  7. 8
      anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue
  8. 235
      anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue
  9. 190
      anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanAdd.vue
  10. 66
      anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue
  11. 3
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
  12. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
  13. 1
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java
  14. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  15. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java
  16. 7
      anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js
  17. 16
      anrui-scm/anrui-scm-ui/src/api/supplychain/cheliangneigou.js
  18. 26
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  19. 58
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue
  20. 30
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue
  21. 47
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  22. 151
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  23. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
  24. 385
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
  25. 106
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue
  26. 56
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouguanli.vue
  27. 9
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
  28. 13
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue
  29. 13
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue
  30. 13
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue
  31. 4
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
  32. 334
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
  33. 174
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
  34. 135
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
  35. 388
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
  36. 132
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue
  37. 4
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  38. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
  39. 397
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue
  40. 19
      anrui-system-ui/src/views/flow/doneList.vue
  41. 19
      anrui-system-ui/src/views/flow/todoList.vue
  42. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java
  43. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java

36
anrui-base/anrui-base-ui/src/api/business/intermediaryPerson.js

@ -0,0 +1,36 @@
import request from '@/utils/request'
// 中介人员条件查询
export function listPage(data) {
return request({
url: '/base/v1/basemiddleman/listPage',
data,
method: 'post',
headers: {'Content-Type': 'application/json'}
})
}
// 添加
export function save(data) {
return request({
url: '/base/v1/basemiddleman/save',
data,
method: 'post',
headers: {'Content-Type': 'application/json'}
})
}
// 删除
export function deleteBySids(data) {
return request({
url: '/base/v1/basemiddleman/delBySids',
method: 'DELETE',
data: data,
headers: {'Content-Type': 'application/json'}
})
}
// 详情及修改回显
export function details(data) {
return request({
url: '/base/v1/basemiddleman/fetchDetailsBySid/' + data,
method: 'get'
})
}

14
anrui-base/anrui-base-ui/src/components/ButtonBar/index.vue

@ -30,49 +30,49 @@ export default {
btnList: [
{
type: 'primary',
size: 'small',
size: 'medium',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
size: 'medium',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'primary',
size: 'small',
size: 'medium',
icon: 'submit',
btnKey: 'doSubmit',
btnLabel: '提交'
},
{
type: 'danger',
size: 'small',
size: 'medium',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
size: 'medium',
icon: 'Import',
btnKey: 'doImport',
btnLabel: '导入'
},
{
type: 'success',
size: 'small',
size: 'medium',
icon: 'export',
btnKey: 'build',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
size: 'medium',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'

10
anrui-base/anrui-base-ui/src/components/tab-search/index.vue

@ -68,11 +68,11 @@
border-color: $border-color;
}
}
.el-button{
padding: 8px 20px;
// background-color: $color-primary;
// color: $text-color-inverse;
}
// .el-button{
// padding: 8px 20px;
// // background-color: $color-primary;
// // color: $text-color-inverse;
// }
.el-select{
width: 150px;
}

14
anrui-base/anrui-base-ui/src/styles/anrui-button.scss

@ -0,0 +1,14 @@
.el-button--medium {
padding: 10px 14px;
font-size: 16px;
}
.el-button--small {
padding: 7px 12px;
font-size: 14px;
}
.el-button--mini {
padding: 5px 10px;
font-size: 12px;
}

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

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

194
anrui-base/anrui-base-ui/src/styles/upload.vue

@ -1,194 +0,0 @@
<template>
<div>
<el-upload class="upload-demo" :data="datas" :accept="accept" :on-success="uploadImgSuccess" :on-change="handleChange" :on-remove="handleRemove" :file-list="fileList_FuJian" :http-request="uploadSectionFile">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">单个文件大小不允许超过100M,支持上传文件类型{{ accept }}</div>
</el-upload>
</div>
</template>
<script>
import { imgUploadz } from '@/api/jichuxinxi/baseaffiliatcompany'
import { mapGetters } from 'vuex'
export default {
props: {
placeholder: {
type: String,
default: '',
},
//
width: {
type: String,
default: '270px',
},
accept: {
type: String,
default:
'.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx',
},
//
files: {
type: String,
required: true,
},
//
name: {
type: String,
required: true,
},
types:{
type:String,
required: true,
},
linkChange: {
type: String,
default: '',
},
},
data() {
return {
datas: null,
types:types,
accessToken: {},
fileList_FuJian: [],
enclosure: '',
file_add: '',
idsz: '',
file_catch: '',
files_list: [],
}
},
computed: {
...mapGetters([
'id',
'departmentCode',
'departmentLevel',
'departmentType',
'token',
]),
},
watch: {
files: {
deep: true,
handler(val) {
this.pageLoad(val, '')
},
},
},
creatd() {
this.datas = { type: this.types }
// console.log(this.datas,7777777)
console.log(this.type, '船只被')
},
mounted() {
this.$nextTick(() => {
// this.Init()
})
},
methods: {
//
Init() {
// 1. token
// this.accessToken = {
// token: this.token,
// }
this.pageLoad(this.files)
},
handleChange(file, fileList) {
},
//
pageLoad(files) {
// console.log('' + files)
if (files !== null && files !== '') {
this.files_list = JSON.parse(files)
var ids = ''
this.fileList_FuJian = []
// 1.
for (var i = 0; i < this.files_list.length; i++) {
var body = {
name: this.files_list[i].name,
url: '',
status: 'finished',
}
this.fileList_FuJian.push(body)
ids = ids + this.files_list[i].id + ','
}
// 2. id
if (ids !== '') {
ids = ids.substring(0, ids.length - 1)
}
this.enclosure = ids
this.file_catch = ids
} else {
this.file_add = ''
this.file_catch = ''
this.enclosure = ''
this.files_list = []
this.fileList_FuJian = []
}
},
// --
uploadImgSuccess(response, file, fileList) {
// console.log('fileList:' + JSON.stringify(fileList))
// this.enclosure = ''
// 1. id(this.file_add)
// this.getNewFileId(fileList)
// 2. id
// this.getFileId()
// console.log('4. ' + this.enclosure)
// 3. id
this.$emit('change', this.enclosure)
},
handleRemove(file, fileList) {
// console.log('file:' + JSON.stringify(file))
// console.log('fileList:' + JSON.stringify(fileList))
// this.enclosure = ''
// 1. id(this.file_add)
// this.getNewFileId(fileList)
// 2. id(this.file_catch)
// this.getCatchFileId(file)
// 3. id
// this.getFileId()
// 4. id
if (this.idsz != '') {
this.$emit('handleRemove', this.idsz)
}
},
// FrontPhoto
uploadSectionFile(params) {
const file = params.file
//
const form = new FormData()
console.log('77777777777777',form)
//
form.append('file', file)
//
console.log('988888',form.append)
imgUploadz(form).then((res) => {
//
if (res.code === '200') {
res.data.attachType = this.types
let a = ''
a = res.data.filePath
this.idsz = a
this.$emit('handleSuccess', res)
}
// this.FrontPhoto = res.fullUrl
if (res.msg == '操作成功') {
this.$message({
message: '上传成功!',
type: 'success',
})
}
})
.catch((err) => {
console.log(err)
// ,
})
},
},
}
</script>
<style lang="scss" scoped></style>

8
anrui-base/anrui-base-ui/src/views/changshang/changshangguanli/changshangguanli.vue

@ -177,28 +177,28 @@ export default {
btnList: [
{
type: 'primary',
size: 'small',
size: 'medium',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
size: 'medium',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
size: 'medium',
icon: 'export',
btnKey: 'build',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
size: 'medium',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'

235
anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuan.vue

@ -1,24 +1,21 @@
<template>
<div class="app-container">
<div v-show="viewState ==1">
<div v-show="viewState == 1">
<button-bar view-title="中介人员管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="80px" class="tab-header">
<el-form-item label="姓名">
<el-input v-model="listQuery.params.name" placeholder="" clearable class="filter-item"/>
</el-form-item>
<el-form-item label="手机号码">
<el-input v-model="listQuery.params.phone" placeholder="" clearable class="filter-item"/>
</el-form-item>
<el-form-item label="所在单位">
<el-select v-model="listQuery.params.disLevelKey" class="filter-item" clearable placeholder="请选择">
<el-option v-for="item in disLevel_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="手机号码">-->
<!-- <el-input v-model="listQuery.params.mobile" placeholder="" clearable class="filter-item"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所在单位">-->
<!-- <el-input v-model="listQuery.params.company" placeholder="" clearable class="filter-item"/>-->
<!-- </el-form-item>-->
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="handleFilter">查询</el-button>
@ -44,32 +41,32 @@
</el-table-column>
<el-table-column width="130" label="姓名" align="center">
<template slot-scope="scope">
<!-- <span>{{ scope.row.disName }}</span>-->
<span>{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column width="130" label="手机号" align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.invoBank }}</span>
<span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.mobile }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="开户行" align="center">
<template slot-scope="scope">
<!-- <span>{{ scope.row.invoBank }}</span>-->
<span>{{ scope.row.bankName }}</span>
</template>
</el-table-column>
<el-table-column width="200" label="银行账号" align="center">
<template slot-scope="scope">
<!-- <span>{{ scope.row.invoBankNum }}</span>-->
<span>{{ scope.row.bankAccount }}</span>
</template>
</el-table-column>
<el-table-column width="220" label="所在单位" align="center">
<template slot-scope="scope">
<!-- <span>{{ scope.row.setUpTime }}</span>-->
<span>{{ scope.row.company }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="left" header-align="center">
<template slot-scope="scope">
<!-- <span>{{ scope.row.isGuarantee }}</span>-->
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
@ -90,14 +87,13 @@
</template>
<script>
import {setuser} from '@/utils/baocun'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar/index.vue'
import {getUseOrgByUserSid} from "@/api/jichuxinxi/brandManagement";
import {deleteBySids, getOneLevelList, pagerList, typeValues} from "@/api/jichuxinxi/baseaffiliatcompany";
import ZhongjierenyuanAdd from "@/views/zhongjierenyuan/zhongjierenyuanAdd";
import ZhongjierenyuanInfo from "@/views/zhongjierenyuan/zhongjierenyuanInfo";
import ZhongjierenyuanAdd from "@/views/zhongjierenyuan/zhongjierenyuanAdd"
import ZhongjierenyuanInfo from "@/views/zhongjierenyuan/zhongjierenyuanInfo"
import { listPage, deleteBySids } from '@/api/business/intermediaryPerson.js'
import {typeValues} from "@/api/jichuxinxi/dictcommons"
export default {
name: "zhongjierenyuan",
@ -163,15 +159,10 @@ export default {
}],
listQuery: {
params: {
createOrg: '',
disName: '', //
isGuarantee: '', // 0/1
legalName: '', //
registNum: '', //
disLevel: '', //
pdistributorSid: '',
setUpEndTime: '', //
setUpStartTime: '' //
name:'',
company:'',
mobile:'',
userSid:window.sessionStorage.getItem('userSid')
},
total: 0,
current: 1,
@ -181,7 +172,6 @@ export default {
sdies: '',
dialogFormVisible: false, //
dialogFormShowVisible: false, //
dialogStatus: '', //
disLevel_list: [] //
}
},
@ -192,7 +182,7 @@ export default {
//
this.init()
//
this.getListOrgAll()
this.getList()
},
methods: {
//
@ -223,22 +213,62 @@ export default {
break
}
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
//
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
getListOrgAll(state) {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({userSid: userSid}).then((res) => {
if (res.success) {
console.log('获取当前使用人分公司', res.data)
this.listQuery.params.relationState = state
this.listQuery.params.createOrg = res.data.sid
this.getList()
}
})
// ID
doDel() {
if (this.sids.length > 0) {
const _this = this
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
deleteBySids(this.sids)
.then(resp => {
if (resp.success && resp.code == '200') {
loading.close()
_this.$message({type: 'success', message: resp.msg, showClose: true})
_this.getList()
} else {
loading.close()
// _this.$message({ type: 'error', message: resp.msg, showClose: true })
}
})
.catch(e => {
loading.close()
})
})
.catch(() => {
})
} else {
this.$message({
showClose: true,
type: 'error',
message: '请选择至少一条记录进行删除操作'
})
return
}
},
handleEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row.sid)
},
//
handleCheck(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row.sid)
},
//
getType() {
@ -248,20 +278,16 @@ export default {
}
})
},
getLevelList(){
getOneLevelList({sid:''}).then((res) => {
if (res.code === '200') {
this.pDistributorSid_list = res.data
}
})
},
relationStateChange(val){
this.getListOrgAll(val)
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
pagerList(this.listQuery).then((response) => {
listPage(this.listQuery).then((response) => {
console.log('列表查询结果1:', response)
console.log('列表查询结果:' + JSON.stringify(response))
this.listLoading = false
@ -271,118 +297,39 @@ export default {
response.data.total > 0
) {
this.list = response.data.records
for (var i = 0; i < this.list.length; i++) {
if (this.list[i].isGuarantee == '1') {
this.list[i].isGuarantee = '是'
} else if (this.list[i].isGuarantee == '0') {
this.list[i].isGuarantee = '否'
}
}
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
this.getLevelList()
},
//
handleFilter() {
this.listQuery.current = 1
this.getListOrgAll()
this.getList()
},
handleReset() {
this.listQuery = {
params: {
disName: '', //
isGuarantee: '', // 0/1
legalName: '', //
registNum: '', //
disLevel: '', //
pdistributorSid: '',
setUpEndTime: '', //
setUpStartTime: '' //
name:'',
company:'',
mobile:'',
userSid:window.sessionStorage.getItem('userSid')
},
total: 0,
current: 1,
size: 10
}
this.getListOrgAll()
this.getList()
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
setuser(this.sids)
})
this.sids = aa
this.sdies = this.sids.join()
console.log('this.sids000000', this.sdies)
},
//
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
//
handleRenwu() {
this.$router.push({
path: '/guakaogongsi/renwu'
})
},
handleEdit(row) {
this.dialogStatus = 'update'
this.viewState = 3
this.$refs['divAdd'].showEdit(row.sid)
},
//
handleCheck(scope) {
this.viewState = 4
this.$refs['divInfo'].showInfo(scope.sid)
},
// ID
doDel() {
if (this.sdies.length > 0) {
const _this = this
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
deleteBySids({sids:this.sdies})
.then(resp => {
if (resp.success && resp.code == '200') {
loading.close()
_this.$message({type: 'success', message: resp.msg, showClose: true})
_this.getListOrgAll()
} else {
loading.close()
// _this.$message({ type: 'error', message: resp.msg, showClose: true })
}
})
.catch(e => {
loading.close()
})
})
.catch(() => {
})
} else {
this.$notify({
title: '提示',
message: '没有选择经销商信息!!',
type: 'error',
duration: 2000
})
return
}
console.log('this.sids', this.sids)
},
resetState() {
this.viewState = 1

190
anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanAdd.vue

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="handleCreate()">保存</el-button>
<el-button type="primary" size="small" :disabled="createBtn" @click="handleCreate()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
@ -22,8 +22,8 @@
<span>手机号码</span>
</el-col>
<el-col :span="9">
<el-form-item>
<el-input v-model="temp.phone" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-form-item prop="mobile">
<el-input v-model="temp.mobile" maxlength="11" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -33,7 +33,7 @@
</el-col>
<el-col :span="9">
<el-form-item>
<el-input v-model="temp.remarks" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.bankName" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="3">
@ -41,7 +41,8 @@
</el-col>
<el-col :span="9">
<el-form-item>
<el-input v-model="temp.disName" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.bankAccount" maxlength="20" placeholder="" class="addinputw" clearable
oninput="value=value.replace(/[^\d]/g,'')"/>
</el-form-item>
</el-col>
</el-row>
@ -51,10 +52,7 @@
</el-col>
<el-col :span="21">
<el-form-item>
<el-select v-model="temp.kuwei" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in kuwei_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
<el-input v-model="temp.company" placeholder="" clearable class="filter-item"/>
</el-form-item>
</el-col>
</el-row>
@ -64,7 +62,7 @@
</el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="temp.remarks" type="textarea" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.remarks" type="textarea" maxlength="125" placeholder="" class="filter-item" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -74,27 +72,44 @@
</template>
<script>
import { save, details } from '@/api/business/intermediaryPerson.js'
import {typeValues} from "@/api/jichuxinxi/dictcommons"
export default {
name: "zhongjierenyuanAdd",
data() {
var checkMobile = (rule, value, callback) => {
const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
if (value) {
//
if (!mobile.test(value)) {
callback(new Error("请输入正确的手机号码"));
}
callback();
} else {
callback();
}
}
return {
viewTitle: '',
// ---------
sid: '',
datas: null,
stateId: 0,
FormLoading: false,
listLoading: false,
kuwei_list: [],
imgList: [], //
createBtn:false,
temp: {
orderType: '01'
bankAccount:'', //
bankName:'', //
company:'', //
createBySid:'', // sid
mobile:'', //
name:'', //
remarks:'',
sid:''
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
dialogStatus: '', //
vehiclePhoto: [],
rules: {}
rules: {
mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
}
// ------------------------------------
}
},
@ -109,121 +124,67 @@ export default {
// }
// })
},
// kuweiChange(val) {
// const choosetItem = this.kuwei_list.filter((item) => item.dictKey == val)
// this.temp.dictValue = choosetItem[0].kuwei
// console.log('name:', , 'key:', )
// },
//
showAdd() {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'add'
this.viewTitle = '【新增】中介人'
this.viewTitle = '【新增】中介人员'
this.getType()
},
showEdit(sid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '【修改】车辆台账'
// this.temp.sid = sid
// console.log('sid', this.temp.sid)
// details(sid).then((response) => {
// if (response.code === '200') {
// if (response.data.createOrg) {
// console.log('1', response.data.useOrg)
// this.useOrgArry = response.data.createOrg
// console.log('2', this.useOrgArry)
// }
// this.temp = response.data
// this.getLocation()
// this.getModelConfig(this.temp.modelSid)
// }
// })
// this.getType()
// this.getZuZhi()
// this.getUseOrg()
},
// 使
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')
getUseOrgByUserSid({userSid: userSid}).then((res) => {
if (res.success) {
this.temp.useOrgName = res.data.name
this.temp.useOrg = res.data.sid
this.temp.createOrg = res.data.sid
this.temp.createOrgName = res.data.name
this.org_list = res.data
}
})
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
this.listQuery.params.createOrgSId = res.data
this.useOrg = res.data
this.viewTitle = '【修改】中介人员'
this.temp.sid = sid
console.log('修改页面sid', this.temp.sid)
details(sid).then((response) => {
if (response.success) {
this.temp = response.data
}
})
},
getUrl() {
if (this.imgList.length > 0) {
console.log('imgList', this.imgList)
} else {
}
},
// ------------------------------------------------------
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
orderType: '01'
}
this.$emit('doback')
this.getType()
},
//
handleCreate() {
console.log('this.temp.useOrg', this.useOrgArry)
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.FormLoading = true
this.createBtn = true
//
if (this.dialogStatus === 'add') {
// SaveList(this.temp).then((response) => {
// this.FormLoading = false
// if (response.code === '200') {
// setChe(response.data)
// this.dialogFormVisible = false
// this.handleReturn('true')
// } else {
// this.$message({
// showClose: true,
// message: '',
// type: 'error'
// });
// }
// })
} else {
// Update(this.temp).then((response) => {
// this.FormLoading = false
// if (response.code === '200') {
// this.dialogFormVisible = false
// this.handleReturn('true')
// } else {
// this.$message({
// showClose: true,
// message: '',
// type: 'error'
// });
// }
// })
}
save(this.temp).then((response) => {
this.createBtn = false
if (response.success) {
this.handleReturn('true')
} else {
this.$message({
showClose: true,
message: '添加失败!',
type: 'error'
});
}
})
}
})
},
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {
bankAccount:'', //
bankName:'', //
company:'', //
createBySid:'', // sid
mobile:'', //
name:'', //
remarks:'',
sid:''
},
this.$emit('doback')
}
}
}
</script>
@ -262,4 +223,7 @@ export default {
line-height: 40px !important;
font-weight: 600;
}
.filter-item{
width: 93%;
}
</style>

66
anrui-base/anrui-base-ui/src/views/zhongjierenyuan/zhongjierenyuanInfo.vue

@ -1,13 +1,13 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>中介人详情</div>
<div>中介人详情</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>姓名</span>
@ -22,7 +22,7 @@
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{temp.phone}}</span>
<span>{{temp.mobile}}</span>
</el-form-item>
</el-col>
</el-row>
@ -32,7 +32,7 @@
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{temp.phone}}</span>
<span>{{temp.bankName}}</span>
</el-form-item>
</el-col>
<el-col :span="3">
@ -40,7 +40,7 @@
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{temp.phone}}</span>
<span>{{temp.bankAccount}}</span>
</el-form-item>
</el-col>
</el-row>
@ -50,7 +50,7 @@
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{temp.phone}}</span>
<span>{{temp.company}}</span>
</el-form-item>
</el-col>
</el-row>
@ -70,28 +70,16 @@
</template>
<script>
import { details } from '@/api/business/intermediaryPerson.js'
export default {
name: "zhongjierenyuanInfo",
data() {
return {
viewTitle: '',
// ---------
sid: '',
datas: null,
stateId: 0,
FormLoading: false,
listLoading: false,
kuwei_list:[],
imgList: [], //
temp: {
orderType: '01'
}, //
dialogFormVisible: false, //
dialogFormShowVisible: false, //
dialogStatus: '', //
vehiclePhoto: [],
rules: {}
// ------------------------------------
}
},
methods: {
@ -99,29 +87,25 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'edit'
this.viewTitle = '【修改】车辆台账'
// this.temp.sid = sid
// console.log('sid', this.temp.sid)
// details(sid).then((response) => {
// if (response.code === '200') {
// if (response.data.createOrg) {
// console.log('1', response.data.useOrg)
// this.useOrgArry = response.data.createOrg
// console.log('2', this.useOrgArry)
// }
// this.temp = response.data
// this.getLocation()
// this.getModelConfig(this.temp.modelSid)
// }
// })
// this.getType()
// this.getZuZhi()
// this.getUseOrg()
console.log('修改页面sid', this.temp.sid)
details(sid).then((response) => {
if (response.success) {
this.temp = response.data
}
})
},
// ------------------------------------------------------
//
handleReturn() {
this.temp = {
bankAccount:'', //
bankName:'', //
company:'', //
createBySid:'', // sid
mobile:'', //
name:'', //
remarks:'',
sid:''
},
this.$emit('doback')
},
}

3
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue

@ -422,8 +422,7 @@ export default {
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route);
this.$router.go(-1)
this.$emit('handleReturn')
},
//
dataCreated() {

2
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue

@ -129,7 +129,7 @@ import Upload from '@/components/uploadFile/FileUpload' // 上传文件
export default {
name: 'KeHuDangAnZiLiao',
components: { pagerList, save, fetchFileListBySid, deleteFilesOss, Pagination, pageye, Upload },
components: { Pagination, pageye, Upload },
data() {
return {
btndisabled: false,

1
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@ -26,4 +26,5 @@ public interface FinKingDeeFeign {
@ApiOperation("入账保存应付单的接口")
@PostMapping("/draftEntryBill")
ResultBean draftEntryBill(@RequestBody EntryBillDto entryBillDto);
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@ -32,7 +32,7 @@
and concat(sve.vinNo,sve.modelName,sve.purchaseType) LIKE concat('%', #{names}, '%')
</if>
</where>
ORDER BY id DESC
ORDER BY inspectionDate DESC
</select>
<select id="getCarInspectedInfo"

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@ -154,6 +154,7 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
text = text + itemConten;
}
vo.setItemConten(text.substring(0, text.length() - 2));
List<AppImgUrlVo> imgUrlVoList = scmVehinspectItemimgService.getAppImgByMainSid(sid);
for (int i = 0; i < imgUrlVoList.size(); i++) {
List<String> files = new ArrayList<>();
@ -199,7 +200,7 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
for (AppImgUrlDto appImgUrlDto : imgUrl) {
List<String> files = appImgUrlDto.getFiles();
for (int i = 0; i < files.size(); i++) {
imgUrls = files.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
imgUrls = imgUrls + files.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
}
appImgUrlDto.setImgUrl(imgUrls);
scmVehinspectItemimgService.updateByMainSid(appImgUrlDto.getImgSid(), appImgUrlDto.getImgUrl(), appImgUrlDto.getTitle());

7
anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js

@ -16,6 +16,13 @@ export default {
data: params
})
},
agreeTaskOrgChange: function(params) {
return request({
url: '/base/v1/baseaccadjapply/InitiatorToAnswer',
method: 'post',
data: params
})
},
// 流程审批(驳回)
rejectTask: function(params) {
return request({

16
anrui-scm/anrui-scm-ui/src/api/supplychain/cheliangneigou.js

@ -37,6 +37,14 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
// 根据分公司sid获取存放地点
fetchByUseOrgSid: function(data) {
return request({
url: '/scm/v1/scmwarehouse/fetchByUseOrgSid',
method: 'get',
params: data
})
},
// 通过sid查询一条记录
fetchBySid: function(sid) {
return request({
@ -61,6 +69,14 @@ export default {
data: params
})
},
// 流程审批(同意)--申请方转应对方
InitiatorToAnswer: function(params) {
return request({
url: '/base/v1/baseinternalpurchase/InitiatorToAnswer',
method: 'post',
data: params
})
},
// 流程审批(驳回)
reject: function(params) {
return request({

26
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -318,14 +318,14 @@ const codemenu = [
component: Layout,
redirect: '/supplychain/cheliangneigou',
meta: {
title: '车辆内购'
title: '调车申请管理'
},
children: [
{
path: '/supplychain/cheliangneigou',
component: () => import('@/views/supplychain/cheliangneigou/cheliangneigouguanli.vue'),
name: 'cheliangneigouguanli',
meta: { title: '内购申请管理', noCache: true }
meta: { title: '调车申请管理', noCache: true }
}
]
},
@ -527,6 +527,21 @@ const codemenu = [
meta: { title: '调账申请管理', noCache: true }
}]
},
// 车辆检查
{
path: '/yanchejianchaxiangmu',
component: Layout,
redirect: '/yanchejianchaxiangmu/yanchejiancha',
meta: {
title: '验车检查项目管理'
},
children: [{
path: '/yanchejianchaxiangmu/yanchejiancha',
component: () => import('@/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue'),
name: 'yanchejiancha',
meta: { title: '验车检查项目管理', noCache: true }
}]
},
// 流程审批
// 入账管理编辑
@ -599,6 +614,13 @@ const codemenu = [
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue'),
name: 'neigouDaiBanInfo'
},
// 车辆内购待办详情(申请方转应对方)
{
path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo',
component: () =>
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue'),
name: 'neigouDaiBanInfo'
},
// 车辆内购待办详情
{
path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo',

58
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue

@ -18,57 +18,57 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<div class="wlInfo"><span>采购订单</span></div>
<el-row style="border-top: 1px solid #E0E3EB">
<el-row>
<el-col :span="4" class="tleftb">
<span>订单编号</span>
<span>订单类型</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<el-input v-model="formobj.orderNo" placeholder="" class="addinputw" clearable/>
<el-input v-model="formobj.orderType" placeholder="" class="addinputw" clearable readonly/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>订单日期</span>
<span>排产申请编号</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<el-date-picker v-model="formobj.orderDate" class="addinputw" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-input v-model="formobj.applicationCode" placeholder="" class="addinputw" clearable readonly/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>订单类</span>
<span></span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<el-input v-model="formobj.orderType" placeholder="" class="addinputw" clearable readonly/>
<el-input v-model="formobj.modelName" placeholder="" class="addinputw" clearable readonly/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>排产申请编号</span>
<span>台数</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<el-input v-model="formobj.applicationCode" placeholder="" class="addinputw" clearable readonly/>
<el-input v-model="formobj.platformNo" placeholder="" class="addinputw" clearable readonly/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>车型</span>
<span><span style="color: red;padding-right: 3px">*</span>订单编号</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<el-input v-model="formobj.modelName" placeholder="" class="addinputw" clearable readonly/>
<el-form-item prop="orderNo">
<el-input v-model="formobj.orderNo" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>台数</span>
<span><span style="color: red;padding-right: 3px">*</span>订单日期</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<el-input v-model="formobj.platformNo" placeholder="" class="addinputw" clearable readonly/>
<el-form-item prop="orderDate">
<el-date-picker v-model="formobj.orderDate" class="addinputw" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
</el-row>
@ -118,17 +118,19 @@
<el-col :span="4" class="tleftb">
<span>预计上线日期</span>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="20" class="trightb">
<el-form-item>
<el-date-picker v-model="formobj.expectLaunchDate" class="addinputw" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="formobj.expectLaunchDate" style="width: 20%" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>上线日期</span>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="20" class="trightb">
<el-form-item>
<el-date-picker v-model="formobj.launchDate" class="addinputw" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="formobj.launchDate" style="width: 20%" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
</el-row>
@ -136,15 +138,17 @@
<el-col :span="4" class="tleftb">
<span>下线日期</span>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="20" class="trightb">
<el-form-item>
<el-date-picker v-model="formobj.offlineDate" class="addinputw" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="formobj.offlineDate" style="width: 20%" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="8" class="trightb">
<el-col :span="20" class="trightb">
<el-form-item prop="warehouseContract">
<el-input v-model="formobj.remarks" placeholder="" class="addinputw" clearable/>
</el-form-item>
@ -187,7 +191,10 @@ export default {
staffSid: window.sessionStorage.getItem('staffSid'),
userSid: window.sessionStorage.getItem('userSid')
},
rules: {},
rules: {
orderNo: [{ required: true, message: '订单编号不能为空', trigger: 'blur' }],
orderDate: [{ required: true, message: '订单日期不能为空', trigger: 'blur' }]
},
submitdisabled: false
}
},
@ -264,14 +271,13 @@ export default {
}
.wlInfo {
width: 100%;
height: 100%;
padding: 60px 0;
padding: 30px 0;
font-size: 24px;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
border-bottom: 1px solid #E0E3EB;
}
.formadd {

30
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue

@ -16,12 +16,6 @@
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<div class="wlInfo"><span>采购订单</span></div>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="4" class="tleftb">订单编号</el-col>
<el-col :span="8" class="trightb">{{ formobj.orderNo }}</el-col>
<el-col :span="4" class="tleftb">订单日期</el-col>
<el-col :span="8" class="trightb">{{ formobj.orderDate }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">订单类型</el-col>
<el-col :span="8" class="trightb">{{ formobj.orderType }}</el-col>
@ -34,6 +28,12 @@
<el-col :span="4" class="tleftb">台数</el-col>
<el-col :span="8" class="trightb">{{ formobj.platformNo }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">订单编号</el-col>
<el-col :span="8" class="trightb">{{ formobj.orderNo }}</el-col>
<el-col :span="4" class="tleftb">订单日期</el-col>
<el-col :span="8" class="trightb">{{ formobj.orderDate }}</el-col>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="24" class="separate">车型价格信息</el-col>-->
<!-- </el-row>-->
@ -54,15 +54,20 @@
</el-row>
<el-row>
<el-col :span="4" class="tleftb">预计上线日期</el-col>
<el-col :span="8" class="trightb">{{ formobj.expectLaunchDate }}</el-col>
<el-col :span="20" class="trightb">{{ formobj.expectLaunchDate }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">上线日期</el-col>
<el-col :span="8" class="trightb">{{ formobj.launchDate }}</el-col>
<el-col :span="20" class="trightb">{{ formobj.launchDate }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">下线日期</el-col>
<el-col :span="8" class="trightb">{{ formobj.offlineDate }}</el-col>
<el-col :span="20" class="trightb">{{ formobj.offlineDate }}</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">备注</el-col>
<el-col :span="8" class="trightb">{{ formobj.remarks }}</el-col>
<el-col :span="20" class="trightb">{{ formobj.remarks }}</el-col>
</el-row>
</el-form>
</div>
@ -111,14 +116,13 @@ export default {
}
.wlInfo {
width: 100%;
height: 100%;
padding: 60px 0;
padding: 30px 0;
font-size: 24px;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
border-bottom: 1px solid #E0E3EB
}
.formadd {

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

@ -159,17 +159,17 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="priced">
<el-form-item prop="costPrice">
<span slot="label">厂家入库价</span>
<el-input v-model="temp.priced" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.costPrice" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="guidedPrice">
<el-form-item prop="salePrice">
<span slot="label">成交价</span>
<el-input v-model="temp.guidedPrice" maxlength="125" placeholder="" class="addinputw" clearable/>
<el-input v-model="temp.salePrice" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
<el-col :span="12">
@ -215,7 +215,7 @@
<el-col :span="12">
<el-form-item prop="">
<span slot="label">内部编码</span>
<el-input placeholder="" class="addinputw" v-model="temp.vehicleCode" clearable/>
<el-input placeholder="" class="addinputw" v-model="temp.insideCode" clearable/>
</el-form-item>
</el-col>
<el-col :span="12" />
@ -285,7 +285,8 @@ export default {
createOrgName: '',//()
departureDate: '',//
engineNo: '',///
guidedPrice: '',//
salePrice: '',//
costPrice: '', //
locationName: '',//
location: '',//
lockedState: '',//
@ -310,7 +311,8 @@ export default {
vehicleState: '',// key
vehicleStateValue: '',// value
vinNo: '',//(VIN)
warrantyCardNo: ''//
warrantyCardNo: '',//
insideCode: '' //
}, //
useOrgArry: [],
modelValue: [],
@ -354,13 +356,12 @@ export default {
message: '请选择常用配置',
trigger: 'change'
}],
priced: [{
costPrice: [{
required: true,
message: '请填写厂家入库价',
trigger: 'blur'
}],
guidedPrice: [{
salePrice: [{
required: true,
message: '请填写指导价',
trigger: 'blur'
@ -479,7 +480,6 @@ export default {
console.log('级联选择2:', this.useOrgArry)
}
this.temp = response.data
this.getLocation()
this.getModelConfig(this.temp.modelSid)
}
})
@ -723,7 +723,8 @@ export default {
createOrgName: '',//()
departureDate: '',//
engineNo: '',///
guidedPrice: '',//
salePrice: '',//
costPrice: '', //
locationName: '',//
location: '',//
lockedState: '',//
@ -748,7 +749,8 @@ export default {
vehicleState: '',// key
vehicleStateValue: '',// value
vinNo: '',//(VIN)
warrantyCardNo: ''//
warrantyCardNo: '',//
insideCode: '' //
}
this.useOrgArry = []
this.$emit('doback')
@ -781,15 +783,11 @@ export default {
duration: 2000
})
this.handleReturn('true')
} else {
this.$notify({
title: '提示',
message: '添加失败',
type: 'error',
duration: 2000
})
}
})
.catch(e => {
this.dialogFormVisible = false
})
} else {
Update(this.temp).then((response) => {
this.FormLoading = false
@ -802,14 +800,11 @@ export default {
duration: 2000
})
this.handleReturn('true')
} else {
this.$notify({
title: '失败',
message: '修改失败',
type: 'error'
})
}
})
.catch(e => {
this.dialogFormVisible = false
})
}
}
})

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

@ -7,77 +7,169 @@
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="forminfo">
<el-form ref="dataForm" :model="temp" label-position="right" class="forminfo">
<div class="title">车辆台账信息</div>
<el-row>
<el-col :span="4" class="trightb">车型名称</el-col>
<el-col :span="8"> {{ temp.modelName }}</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.modelName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">常用配置</el-col>
<el-col :span="8"> {{ temp.configName }}</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.configName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">库存状态</el-col>
<el-col :span="8" class="tleft"> {{ temp.vehicleStateValue }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.vehicleStateValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">车架号</el-col>
<el-col :span="8"> {{ temp.vinNo }}</el-col>
<el-col :span="8">
<el-form-item>
<span>{{ temp.vinNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">发动机号/许可证号</el-col>
<el-col :span="8" class="tleft"> {{ temp.engineNo }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.engineNo }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">厂家订单编码</el-col>
<el-col :span="8" class="tleft"> {{ temp.orderingNo }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.orderingNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">厂家采购订单类型</el-col>
<el-col :span="8" class="tleft"> {{ temp.manPurOrderTypeValue }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.manPurOrderTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">厂家入库日期</el-col>
<el-col :span="8" class="tleft"> {{ temp.priceDate }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.priceDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">发车日期</el-col>
<el-col :span="8" class="tleft"> {{ temp.departureDate }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.departureDate }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">到货日期</el-col>
<el-col :span="8" class="tleft"> {{ temp.arrivalDate }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.arrivalDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">销售日期</el-col>
<el-col :span="8" class="tleft"> {{ temp.salesDate }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.salesDate }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">买断日期</el-col>
<el-col :span="8" class="tleft"> {{ temp.solidDate }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.solidDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">结算状态</el-col>
<el-col :span="8" class="tleft"> {{ temp.settlementStatus }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.settlementStatus }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">采购退库日期</el-col>
<el-col :span="8" class="tleft"> {{ temp.returnDate }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.returnDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">存放地点</el-col>
<el-col :span="8" class="tleft"> {{ temp.locationName }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.locationName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">厂家入库价</el-col>
<el-col :span="8" class="tleft"> {{ temp.priced }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.costPriced }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">成交价</el-col>
<el-col :span="8" class="tleft"> {{ temp.guidedPrice }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.salePrice }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">保修卡号</el-col>
<el-col :span="8" class="tleft"> {{ temp.warrantyCardNo }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.warrantyCardNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">锁定状态</el-col>
<el-col :span="8" class="tleft"> {{ temp.lockedStateValue }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.lockedStateValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">使用组织</el-col>
<el-col :span="8" class="tleft"> {{ temp.useOrgName }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.useOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">创建组织</el-col>
<el-col :span="8" class="tleft"> {{ temp.createOrgName }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.createOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">特殊说明</el-col>
<el-col :span="8" class="tleft"> {{ temp.specialInstructions }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.specialInstructions }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">内部编码</el-col>
<el-col :span="8" class="tleft"> {{ temp.vehicleCode }}</el-col>
<el-col :span="8" class="tleft">
<el-form-item>
<span>{{ temp.insideCode }}</span>
</el-form-item>
</el-col>
<el-col :span="12" class="trightb"/>
</el-row>
</el-form>
@ -156,10 +248,19 @@ export default {
<style scoped>
/deep/ .lookimg .img{
width: 100px;
margin: 10px;
margin: 10px;
}
.listconadd {
width: 100%;
padding: 0 48px !important;
}
/deep/ .el-form-item{
padding-top: 5px;
margin-bottom: 0;
}
/deep/ .el-form-item__content {
line-height: 37px;
position: relative;
font-size: 14px;
}
</style>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@ -81,7 +81,7 @@
</el-table-column>
<el-table-column label="见证材料" align="center" width="180px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
<el-button size="mini" v-show="scope.row.witMatUrl !== ''" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
<div class="upload_img" v-show="scope.row.isShowAdopt == 1">
<upload ref="uploadMoreImg" v-model="imgList" :limit="1" bucket="map" @eett="getList" :upload-data="{type:'0001',sid: scope.row.sid}"></upload>
</div>

385
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue

@ -17,53 +17,40 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<div class="wlInfo"><span>分公司间调车申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调账类型</span></div>
<el-form-item>
<span style="margin-left: 5px">{{ formobj.buyerOrgName }}</span>
<el-select v-model="formobj.shuntingTypeValue" placeholder="请选择" clearable class="addinputw addinputwOne" @change="changeShuntingType" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<el-select v-model="formobj.sellerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '02' || dialogStatus == 'edit'" @change="changeSellerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
<el-select v-model="formobj.sellerOrgName" clearable filterable placeholder="请选择" @change="changeSellerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
<el-select v-model="formobj.buyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '01' || dialogStatus == 'edit'" @change="changeBuyerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
<div style="margin-left: 15px">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
<div style="margin-right: 5px">
<el-button type="primary" v-show="formobj.shuntingTypeKey == '01'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
<el-button type="primary" v-show="formobj.shuntingTypeKey == '02'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
@ -74,24 +61,48 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="250">
<el-table-column label="车型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.witPinMoney" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">
<el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.freight" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<el-select v-model="scope.row.freightUndertakerType" placeholder="请选择" clearable class="addinputw" @change="changeBuyer(scope.row, this)">
<el-option v-for="item in buyer_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
@ -104,19 +115,22 @@
</div>
<!--End 添加修改部分-->
<!--选择车型和常用配置-->
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="backData" @doback="closePage"/>
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="backConfiguration" @doback="closePage"/>
<vehicle v-show="viewState == 3" ref="divVehicle" @backData="backVehicle" @doback="closePage"/>
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
import { getListOrg, getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons.js'
import { getListOrg, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons.js'
import configuration from '@/views/supplychain/cheliangpaichan/chexingbyconfiguration'
import vehicle from '@/views/weishoumaiduan/weishoumaiduanguanli/vehicle'
export default {
name: 'cheliangneigouAdd',
components: {
configuration
configuration,
vehicle
},
data() {
return {
@ -125,61 +139,66 @@ export default {
index: 0,
tableKey: 0,
org_list: [],
accadjType_list: [],
invoiceType_list: [],
buyer_list: [
{
name: '调入分公司',
sid: 0
},
{
name: '调出分公司',
sid: 1
}
],
//
formobj: {
sid: '', // sid
applyNo: '',
applyPeoName: window.sessionStorage.getItem('name'),
createTime: '',
buyerOrgSid: '',
applyNo: '', // sid
applyPeoName: '',
buyerOrgName: '',
sellerOrgSid: '',
sellerOrgName: '',
useOrgSid: '',
createOrgSid: '',
instanceId: '', // ID
taskId: '', // ID
buyerOrgSid: '',
comment: '',
createBySid: '',
createOrgSid: '',
instanceId: '',
num: '',
sellerOrgName: '', // ID
sellerOrgSid: '', // ID
shuntingTypeKey: '',
shuntingTypeValue: '',
sid: '',
taskId: '',
useOrgSid: '',
baseInternalPurchaseVehicles: []
},
rules: {},
dialogStatus: '',
submitdisabled: false
}
},
methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
let day = date.getDate() //
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
this.formobj.createTime = year + '-' + month + '-' + day
},
getListOrg() {
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
init() {
typeValues({ type: 'accadjType' }).then((resp) => {
if (resp.success) {
this.accadjType_list = resp.data
}
})
typeValues({ type: 'invoiceType' }).then((resp) => {
if (resp.success) {
this.invoiceType_list = resp.data
}
})
},
getUseOrgByUserSid() {
getUserOrg() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.formobj.buyerOrgSid = res.data
this.formobj.useOrgSid = res.data
this.formobj.createOrgSid = res.data
fetchBySid(this.formobj.buyerOrgSid).then((resp) => {
if (resp.success) {
this.formobj.buyerOrgName = resp.data.name
console.log(this.formobj.buyerOrgName, 9999)
}
})
}
})
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
}
})
},
@ -194,78 +213,174 @@ export default {
e.target.value = parseFloat(e.target.value)
}
},
changeSellerOrg(value) {
changeInvoiceType(row) {
let bb = null
this.org_list.forEach((e) => {
if (e.sid === value) {
this.invoiceType_list.forEach((e) => {
if (e.dictValue === row.invoiceTypeValue) {
bb = {
sid: e.sid,
name: e.name
key: e.dictKey,
value: e.dictValue
}
}
})
this.formobj.sellerOrgName = bb.name
this.formobj.sellerOrgSid = bb.sid
row.invoiceTypeKey = bb.key
},
changeBuyer(row) {
if (row.freightUndertakerType === '调入分公司') {
row.freightUndertakerName = this.formobj.buyerOrgName
row.freightUndertakerSid = this.formobj.buyerOrgSid
} else {
row.freightUndertakerName = this.formobj.sellerOrgName
row.freightUndertakerSid = this.formobj.sellerOrgSid
}
},
changeShuntingType(val) {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictValue === val)
this.formobj.shuntingTypeKey = choosetItem[0].dictKey
//
if (this.formobj.shuntingTypeKey === '01') {
this.formobj.buyerOrgSid = this.formobj.createOrgSid
const name = this.org_list.filter((item) => item.sid === this.formobj.buyerOrgSid)
this.formobj.buyerOrgName = name[0].name
this.formobj.sellerOrgName = ''
this.formobj.sellerOrgSid = ''
}
//
if (this.formobj.shuntingTypeKey === '02') {
this.formobj.sellerOrgSid = this.formobj.createOrgSid
const name = this.org_list.filter((item) => item.sid === this.formobj.sellerOrgSid)
this.formobj.sellerOrgName = name[0].name
this.formobj.buyerOrgSid = ''
this.formobj.buyerOrgName = ''
}
}
},
changeSellerOrg(val) {
const choosetItem = this.org_list.filter((item) => item.name === val)
this.formobj.sellerOrgSid = choosetItem[0].sid
},
changeBuyerOrg(val) {
const choosetItem = this.org_list.filter((item) => item.name === val)
this.formobj.buyerOrgSid = choosetItem[0].sid
},
//
addCommodity() {
this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.buyerOrgSid)
if (this.formobj.shuntingTypeValue === '') {
this.$message({
showClose: true,
message: '请选择调账类型',
type: 'error'
})
return
}
if (this.formobj.sellerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调出分公司',
type: 'error'
})
return
}
if (this.formobj.buyerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调入分公司',
type: 'error'
})
return
}
if (this.formobj.shuntingTypeValue === '调入') {
this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles)
} else {
this.viewState = 3
this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles)
}
},
//
dataDelete(index, row) {
this.formobj.baseInternalPurchaseVehicles.splice(index, 1)
},
showAdd() {
this.newDate()
this.getListOrg()
this.getUseOrgByUserSid()
this.init()
this.getUserOrg()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.formobj.applyPeoName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.viewTitle = '【新增】内购申请'
this.viewTitle = '【新增】分公司间调车申请'
this.dialogStatus = 'add'
},
showEdit(row) {
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】内购申请'
this.viewTitle = '【编辑】分公司间调车申请'
this.dialogStatus = 'edit'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
if (resp.success) {
this.formobj.sid = resp.data.sid
this.formobj.applyNo = resp.data.applyNo
this.formobj.applyPeoName = resp.data.applyPeoName
this.formobj.createTime = resp.data.createTime
this.formobj.buyerOrgSid = resp.data.buyerOrgSid
this.formobj.buyerOrgName = resp.data.buyerOrgName
this.formobj.sellerOrgSid = resp.data.sellerOrgSid
this.formobj.sellerOrgName = resp.data.sellerOrgName
this.formobj.useOrgSid = resp.data.useOrgSid
this.formobj.createOrgSid = resp.data.createOrgSid
this.formobj.instanceId = resp.data.procInstId // ID
this.formobj.taskId = resp.data.taskId // ID
this.formobj.createBySid = resp.data.createBySid
this.formobj.baseInternalPurchaseVehicles = resp.data.baseInternalPurchaseVehicles
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
}
}).catch((e) => {
this.formobj = row
})
},
// --
backData(value) {
backVehicle(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseInternalPurchaseVehicles.push({
mainSid: '',
modelSid: e.modelSid,
vehicleAlias: e.vehicleAlias,
configSid: e.configSid,
configName: e.configName,
freight: '',
vinNo: ''
configName: e.configName, //
configSid: e.configSid, // sid
freight: '', //
freightUndertakerName: '', //
freightUndertakerSid: '', // sid
inventoryLocationName: e.location, //
inventoryLocationSid: e.locationSid, // sid
invoiceTypeKey: '', // key
invoiceTypeValue: '', // value
isAccadj: '', // 01
isInvoicing: '', // 01
mainSid: '', // sid
vehicleSid: e.modelSid, // sid
remarks: '', //
sid: '',
vehicleAlias: e.vehicleAlias, //
vinNo: e.vinNo, //
witPinMoney: '' //
})
})
}
},
// --
backConfiguration(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseInternalPurchaseVehicles.push({
configName: e.configName, //
configSid: e.configSid, // sid
freight: '', //
freightUndertakerName: '', //
freightUndertakerSid: '', // sid
inventoryLocationName: '', //
inventoryLocationSid: '', // sid
invoiceTypeKey: '', // key
invoiceTypeValue: '', // value
isAccadj: '', // 01
isInvoicing: '', // 01
mainSid: '', // sid
vehicleSid: e.modelSid, // sid
remarks: '', //
sid: '',
vehicleAlias: e.vehicleAlias, //
vinNo: '', //
witPinMoney: '' //
})
})
}
@ -316,7 +431,6 @@ export default {
this.formobj.sid = ''
this.formobj.applyNo = ''
this.formobj.applyPeoName = ''
this.formobj.createTime = ''
this.formobj.buyerOrgSid = ''
this.formobj.buyerOrgName = ''
this.formobj.sellerOrgSid = ''
@ -338,45 +452,28 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.icon {
color: #e84026;
margin-right: 4px;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
.spanOneWidth {
width: 100px !important;
}
.linetwo {
margin-top: 10px;
.addinputwOne {
margin-left: 110px !important;
}
</style>

106
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue

@ -4,7 +4,7 @@
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>内购详情</div>
<div>分公司间调车申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -13,70 +13,72 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<div class="wlInfo"><span>分公司间调车申请详情</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调账类型</span></div>
<el-form-item>
{{ formobj.buyerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.shuntingTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
{{ formobj.sellerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center" header-align="center" width="250">
<el-table-column label="车型" align="center" header-align="center" width="200">
<template slot-scope="scope" prop="vehicleName">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.freightUndertakerType }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
@ -122,10 +124,14 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
@ -135,27 +141,11 @@ export default {
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
.spanOneWidth {
width: 100px !important;
}
.linetwo {
margin-top: 10px;
.addinputwOne {
margin-left: 110px !important;
}
</style>

56
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouguanli.vue

@ -2,7 +2,7 @@
<div class="app-container">
<!-- Start 列表页面 -->
<div v-show="viewState == 1">
<button-bar view-title="内购申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="分公司间调车申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@ -20,9 +20,19 @@
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
</el-form-item>
<el-form-item label="售方机构">
<el-select v-model="listQuery.params.sellerOrgSid" clearable filterable placeholder="请选择">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
<el-form-item label="调车类型">
<el-select v-model="listQuery.params.shuntingTypeKey" clearable filterable placeholder="请选择">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
<el-form-item label="调出分公司">
<el-select v-model="listQuery.params.sellerOrgSid" placeholder="请选择" clearable filterable>
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="调入分公司">
<el-select v-model="listQuery.params.buyerOrgSid" placeholder="请选择" clearable filterable>
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-form>
@ -33,7 +43,7 @@
</div>
</div>
<div class="listtop">
<div class="tit">内购申请列表</div>
<div class="tit">调车申请列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
@ -51,11 +61,6 @@
<span>{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column label="申请编号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.applyNo }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center">
<template slot-scope="scope">
<span>{{ scope.row.applyPeoName }}</span>
@ -66,17 +71,22 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="调车类型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.shuntingTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
</el-table-column>
<el-table-column label="购方机构" align="center">
<el-table-column label="调入分公司" align="center">
<template slot-scope="scope">
<span>{{ scope.row.buyerOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="售方机构" align="center" width="130px">
<el-table-column label="调出分公司" align="center" width="130px">
<template slot-scope="scope">
<span>{{ scope.row.sellerOrgName }}</span>
</template>
@ -101,7 +111,7 @@ import ButtonBar from '@/components/ButtonBar'
import cheliangneigouAdd from './cheliangneigouAdd.vue'
import cheliangneigouInfo from './cheliangneigouInfo.vue'
import req from '@/api/supplychain/cheliangneigou'
import {getListOrg, getPathSidByUserSid} from '@/api/cheliang/dictcommons'
import { getPathSidByUserSid, typeValues, getListOrg } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangneigouguanli',
@ -139,6 +149,7 @@ export default {
}
],
org_list: [],
accadjType_list: [],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
@ -154,7 +165,9 @@ export default {
createEndTime: '',
createOrgSid: '',
nodeState: '',
sellerOrgName: ''
buyerOrgSid: '',
sellerOrgSid: '',
shuntingTypeKey: ''
},
current: 1,
size: 10,
@ -178,9 +191,14 @@ export default {
this.getList()
}
})
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
getListOrg().then((response) => {
if (response.success) {
this.org_list = response.data
}
})
typeValues({ type: 'accadjType' }).then((resp) => {
if (resp.success) {
this.accadjType_list = resp.data
}
})
},
@ -254,7 +272,9 @@ export default {
createEndTime: '',
createOrgSid: '',
nodeState: '',
sellerOrgName: ''
buyerOrgSid: '',
sellerOrgSid: '',
shuntingTypeKey: ''
},
current: 1,
size: 10,

9
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue

@ -8,17 +8,12 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item class="formItem" label="申请日期">
<el-form-item :model="queryParams" :inline="true" class="tab-header" label="申请日期">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
<div class="line"></div>
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
</el-form-item>
<el-form-item label="车型">
<!-- <el-select v-model="queryParams.params.billType" @change="changeBillType" style="width:200px"-->
<!-- filterable placeholder="请选择" clearable>-->
<!-- <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue"-->
<!-- :value="item.dictKey"></el-option>-->
<!-- </el-select>-->
<el-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
</el-form-item>
</el-form>
@ -37,7 +32,7 @@
<!--Start 项目列表-->
<div class="listcon">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%;" height="500" @selection-change="handleSelectionChange">
<el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="50" type="selection" align="center"/>
<el-table-column width="150" label="操作" align="center">

13
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue

@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: 'yanchejiancha'
}
</script>
<style scoped>
</style>

13
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue

@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: 'yanchejianchaAdd'
}
</script>
<style scoped>
</style>

13
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue

@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: 'yanchejianchaInfo'
}
</script>
<style scoped>
</style>

4
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@ -304,7 +304,11 @@ export default {
row.forEach((element) => {
aa.push({
vinNo: element.vinNo,
configName: element.configName,
location: element.location,
locationSid: element.locationSid,
vehicleAlias: element.vehicleAlias,
modelSid: element.modelSid,
priceDate: element.priceDate,
priced: element.priced
})

334
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue

@ -0,0 +1,334 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>分公司间调车申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
<el-button type="danger" @click="openReject('驳回')"> </el-button>
<el-button type="danger" @click="openStop('终止')"> </el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>分公司间调车申请详情</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.shuntingTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center" header-align="center" width="200">
<template slot-scope="scope" prop="vehicleName">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freightUndertakerType }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<!--End 添加修改部分-->
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
export default {
name: 'neigouDaiBanByShunTingTypeValueInfo',
data() {
return {
index: 0,
tableKey: 0,
//
formobj: {},
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
rules: {}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: document.body.scrollHeight + 100 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
} else if (this.operation === '终止') {
this.handleStop()
}
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.InitiatorToAnswer(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.spanOneWidth {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
}
</style>

174
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue

@ -4,7 +4,7 @@
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>内购详情</div>
<div>分公司间调车申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
@ -15,70 +15,84 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<div class="wlInfo"><span>分公司间调车申请详情</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
{{ formobj.buyerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.shuntingTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
{{ formobj.sellerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center" header-align="center" width="250">
<el-table-column label="车型" align="center" header-align="center" width="200">
<template slot-scope="scope" prop="vehicleName">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column v-if="shuntingTypeVisible" label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="shuntingTypeVisible" label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column v-if="shuntingVisible" label="车架号" align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.vinNo" clearable placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column v-if="shuntingVisible" label="库存地点" align="center" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.inventoryLocationName" placeholder="请选择" clearable @change="changeInventoryLocationName(scope.row, this)">
<el-option v-for="item in inventoryLocation_list" :key="item.sid" :label="item.warehouseName" :value="item.warehouseName"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.vinNo" placeholder="" clearable></el-input>
<span>{{ scope.row.freightUndertakerType }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
@ -91,9 +105,6 @@
</div>
<!--End 添加修改部分-->
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<!--End 添加修改部分-->
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
@ -120,25 +131,22 @@
<script>
import req from '@/api/supplychain/cheliangneigou'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'neigouDaiBanByVinNoInfo',
components: {
flow
},
name: 'neigouDaiBanByVinNOInfo',
data() {
return {
index: 0,
tableKey: 0,
//
formobj: {},
shuntingTypeVisible: false,
shuntingVisible: false,
operation: '', //
inventoryLocation_list: [],
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
@ -178,9 +186,6 @@ export default {
this.current.taskName = obj.taskName
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -188,7 +193,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 100 + 'px'
}
}, '*')
},
@ -197,27 +202,40 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.shuntingTypeValue == '调入') {
console.log(11)
this.shuntingVisible = true
this.shuntingTypeVisible = false
req.fetchByUseOrgSid({ sid: this.formobj.sellerOrgSid }).then((resp) => {
if (resp.success) {
this.inventoryLocation_list = resp.data
}
})
} else if (this.formobj.shuntingTypeValue == '调出') {
console.log(22)
this.shuntingTypeVisible = true
this.shuntingVisible = false
}
}
})
},
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
changeInventoryLocationName(row) {
let bb = null
this.inventoryLocation_list.forEach((e) => {
if (e.warehouseName === row.inventoryLocationName) {
bb = {
sid: e.sid,
name: e.warehouseName
}
}
})
row.inventoryLocationSid = bb.sid
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
@ -332,10 +350,14 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
@ -345,27 +367,11 @@ export default {
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
.spanOneWidth {
width: 100px !important;
}
.linetwo {
margin-top: 10px;
.addinputwOne {
margin-left: 110px !important;
}
</style>

135
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue

@ -4,7 +4,7 @@
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>内购详情</div>
<div>分公司间调车申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
@ -15,70 +15,72 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<div class="wlInfo"><span>分公司间调车申请详情</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
{{ formobj.buyerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.shuntingTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
{{ formobj.sellerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center" header-align="center" width="250">
<el-table-column label="车型" align="center" header-align="center" width="200">
<template slot-scope="scope" prop="vehicleName">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<span>{{ scope.row.freightUndertakerType }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
@ -91,9 +93,6 @@
</div>
<!--End 添加修改部分-->
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<!--End 添加修改部分-->
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
@ -120,13 +119,9 @@
<script>
import req from '@/api/supplychain/cheliangneigou'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'neigouDaiBanInfo',
components: {
flow
},
data() {
return {
index: 0,
@ -137,8 +132,6 @@ export default {
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
@ -177,9 +170,6 @@ export default {
this.current.taskName = obj.taskName
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -187,7 +177,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 100 + 'px'
}
}, '*')
},
@ -199,24 +189,11 @@ export default {
}
})
},
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
@ -330,10 +307,14 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
@ -343,27 +324,11 @@ export default {
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
.spanOneWidth {
width: 100px !important;
}
.linetwo {
margin-top: 10px;
.addinputwOne {
margin-left: 110px !important;
}
</style>

388
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue

@ -16,53 +16,40 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<div class="wlInfo"><span>分公司间调车申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调账类型</span></div>
<el-form-item>
<span style="margin-left: 5px">{{ formobj.buyerOrgName }}</span>
<el-select v-model="formobj.shuntingTypeValue" placeholder="请选择" clearable class="addinputw addinputwOne" @change="changeShuntingType" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<el-select v-model="formobj.sellerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '02' || dialogStatus == 'edit'" @change="changeSellerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
<el-select v-model="formobj.sellerOrgName" clearable filterable placeholder="请选择" @change="changeSellerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
<el-select v-model="formobj.buyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '01' || dialogStatus == 'edit'" @change="changeBuyerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
<div style="margin-left: 15px">
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
<div style="margin-right: 5px">
<el-button type="primary" v-show="formobj.shuntingTypeKey == '01'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
<el-button type="primary" v-show="formobj.shuntingTypeKey == '02'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
@ -73,24 +60,48 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="center" width="250">
<el-table-column label="车型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.witPinMoney" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">
<el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.freight" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
<el-select v-model="scope.row.freightUndertakerType" placeholder="请选择" clearable class="addinputw" @change="changeBuyer(scope.row, this)">
<el-option v-for="item in buyer_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
@ -103,19 +114,22 @@
</div>
<!--End 添加修改部分-->
<!--选择车型和常用配置-->
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="backData" @doback="closePage"/>
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="backConfiguration" @doback="closePage"/>
<vehicle v-show="viewState == 3" ref="divVehicle" @backData="backVehicle" @doback="closePage"/>
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
import { getListOrg, getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons.js'
import configuration from '@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration'
import { getListOrg, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons.js'
import configuration from '@/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration'
import vehicle from '@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle'
export default {
name: 'neigouEdit',
components: {
configuration
configuration,
vehicle
},
data() {
return {
@ -124,22 +138,40 @@ export default {
index: 0,
tableKey: 0,
org_list: [],
accadjType_list: [],
invoiceType_list: [],
buyer_list: [
{
name: '调入分公司',
sid: 0
},
{
name: '调出分公司',
sid: 1
}
],
//
formobj: {
sid: '', // sid
applyNo: '',
applyPeoName: window.sessionStorage.getItem('name'),
createTime: '',
buyerOrgSid: '',
applyNo: '', // sid
applyPeoName: '',
buyerOrgName: '',
sellerOrgSid: '',
sellerOrgName: '',
useOrgSid: '',
createOrgSid: '',
buyerOrgSid: '',
comment: '',
createBySid: '',
createOrgSid: '',
instanceId: '',
num: '',
sellerOrgName: '', // ID
sellerOrgSid: '', // ID
shuntingTypeKey: '',
shuntingTypeValue: '',
sid: '',
taskId: '',
useOrgSid: '',
baseInternalPurchaseVehicles: []
},
rules: {},
dialogStatus: '',
submitdisabled: false
}
},
@ -156,44 +188,33 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 100 + 'px'
}
}, '*')
},
methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
let day = date.getDate() //
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
this.formobj.createTime = year + '-' + month + '-' + day
},
getListOrg() {
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
init() {
typeValues({ type: 'accadjType' }).then((resp) => {
if (resp.success) {
this.accadjType_list = resp.data
}
})
typeValues({ type: 'invoiceType' }).then((resp) => {
if (resp.success) {
this.invoiceType_list = resp.data
}
})
},
getUseOrgByUserSid() {
getUserOrg() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.formobj.buyerOrgSid = res.data
this.formobj.useOrgSid = res.data
this.formobj.createOrgSid = res.data
fetchBySid(this.formobj.buyerOrgSid).then((resp) => {
if (resp.success) {
this.formobj.buyerOrgName = resp.data.name
console.log(this.formobj.buyerOrgName, 9999)
}
})
}
})
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
}
})
},
@ -208,68 +229,163 @@ export default {
e.target.value = parseFloat(e.target.value)
}
},
changeSellerOrg(value) {
changeInvoiceType(row) {
let bb = null
this.org_list.forEach((e) => {
if (e.sid === value) {
this.invoiceType_list.forEach((e) => {
if (e.dictValue === row.invoiceTypeValue) {
bb = {
sid: e.sid,
name: e.name
key: e.dictKey,
value: e.dictValue
}
}
})
this.formobj.sellerOrgName = bb.name
this.formobj.sellerOrgSid = bb.sid
row.invoiceTypeKey = bb.key
},
changeBuyer(row) {
if (row.freightUndertakerType === '调入分公司') {
row.freightUndertakerName = this.formobj.buyerOrgName
row.freightUndertakerSid = this.formobj.buyerOrgSid
} else {
row.freightUndertakerName = this.formobj.sellerOrgName
row.freightUndertakerSid = this.formobj.sellerOrgSid
}
},
changeShuntingType(val) {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictValue === val)
this.formobj.shuntingTypeKey = choosetItem[0].dictKey
//
if (this.formobj.shuntingTypeKey === '01') {
this.formobj.buyerOrgSid = this.formobj.createOrgSid
const name = this.org_list.filter((item) => item.sid === this.formobj.buyerOrgSid)
this.formobj.buyerOrgName = name[0].name
this.formobj.sellerOrgName = ''
this.formobj.sellerOrgSid = ''
}
//
if (this.formobj.shuntingTypeKey === '02') {
this.formobj.sellerOrgSid = this.formobj.createOrgSid
const name = this.org_list.filter((item) => item.sid === this.formobj.sellerOrgSid)
this.formobj.sellerOrgName = name[0].name
this.formobj.buyerOrgSid = ''
this.formobj.buyerOrgName = ''
}
}
},
changeSellerOrg(val) {
const choosetItem = this.org_list.filter((item) => item.name === val)
this.formobj.sellerOrgSid = choosetItem[0].sid
},
changeBuyerOrg(val) {
const choosetItem = this.org_list.filter((item) => item.name === val)
this.formobj.buyerOrgSid = choosetItem[0].sid
},
//
addCommodity() {
this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles)
if (this.formobj.shuntingTypeValue === '') {
this.$message({
showClose: true,
message: '请选择调账类型',
type: 'error'
})
return
}
if (this.formobj.sellerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调出分公司',
type: 'error'
})
return
}
if (this.formobj.buyerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调入分公司',
type: 'error'
})
return
}
if (this.formobj.shuntingTypeValue === '调入') {
this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles)
} else {
this.viewState = 3
this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles)
}
},
//
dataDelete(index, row) {
this.formobj.baseInternalPurchaseVehicles.splice(index, 1)
},
showInfo(sid) {
this.init()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】内购申请'
this.viewTitle = '【编辑】分公司间调车申请'
this.dialogStatus = 'edit'
console.log('编辑回显', sid)
req.fetchBySid(sid).then((resp) => {
if (resp.success) {
this.formobj.sid = resp.data.sid
this.formobj.applyNo = resp.data.applyNo
this.formobj.applyPeoName = resp.data.applyPeoName
this.formobj.createTime = resp.data.createTime
this.formobj.buyerOrgSid = resp.data.buyerOrgSid
this.formobj.buyerOrgName = resp.data.buyerOrgName
this.formobj.sellerOrgSid = resp.data.sellerOrgSid
this.formobj.sellerOrgName = resp.data.sellerOrgName
this.formobj.useOrgSid = resp.data.useOrgSid
this.formobj.createOrgSid = resp.data.createOrgSid
this.formobj.instanceId = resp.data.procInstId // ID
this.formobj.taskId = resp.data.taskId // ID
this.formobj.createBySid = resp.data.createBySid
this.formobj.baseInternalPurchaseVehicles = resp.data.baseInternalPurchaseVehicles
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
}
}).catch((e) => {
this.formobj = {}
})
},
// --
backData(value) {
backVehicle(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseInternalPurchaseVehicles.push({
configName: e.configName, //
configSid: e.configSid, // sid
freight: '', //
freightUndertakerName: '', //
freightUndertakerSid: '', // sid
inventoryLocationName: e.location, //
inventoryLocationSid: e.locationSid, // sid
invoiceTypeKey: '', // key
invoiceTypeValue: '', // value
isAccadj: '', // 01
isInvoicing: '', // 01
mainSid: '', // sid
vehicleSid: e.modelSid, // sid
remarks: '', //
sid: '',
vehicleAlias: e.vehicleAlias, //
vinNo: e.vinNo, //
witPinMoney: '' //
})
})
}
},
// --
backConfiguration(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseInternalPurchaseVehicles.push({
mainSid: '',
modelSid: e.modelSid,
vehicleAlias: e.vehicleAlias,
configSid: e.configSid,
configName: e.configName,
freight: '',
vinNo: ''
configName: e.configName, //
configSid: e.configSid, // sid
freight: '', //
freightUndertakerName: '', //
freightUndertakerSid: '', // sid
inventoryLocationName: '', //
inventoryLocationSid: '', // sid
invoiceTypeKey: '', // key
invoiceTypeValue: '', // value
isAccadj: '', // 01
isInvoicing: '', // 01
mainSid: '', // sid
vehicleSid: e.modelSid, // sid
remarks: '', //
sid: '',
vehicleAlias: e.vehicleAlias, //
vinNo: '', //
witPinMoney: '' //
})
})
}
@ -286,7 +402,7 @@ export default {
type: 'success',
message: resp.msg
})
// ()
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
@ -311,7 +427,7 @@ export default {
type: 'success',
message: '提交成功'
})
// ()
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
@ -319,6 +435,12 @@ export default {
code: 1
}
}, '*')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
})
}
})
},
@ -330,45 +452,27 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.spanOneWidth {
width: 100px !important;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.icon {
color: #e84026;
margin-right: 4px;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
}
.linetwo {
margin-top: 10px;
.addinputwOne {
margin-left: 110px !important;
}
</style>

132
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue

@ -4,7 +4,7 @@
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>内购详情</div>
<div>分公司间调车申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="danger" @click="openRevoke()"> </el-button>
@ -13,70 +13,72 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<div class="wlInfo"><span>分公司间调车申请详情</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调账类型</span></div>
<el-form-item>
{{ formobj.buyerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.shuntingTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<el-form-item>
{{ formobj.sellerOrgName }}
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center" header-align="center" width="250">
<el-table-column label="车型" align="center" header-align="center" width="200">
<template slot-scope="scope" prop="vehicleName">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<el-table-column label="常用配置" align="left" header-align="center" width="400">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<el-table-column label="运费承担方" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.vinNo" placeholder="" clearable></el-input>
<span>{{ scope.row.freightUndertakerType }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
@ -88,30 +90,20 @@
</div>
</div>
<!--End 添加修改部分-->
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<!--End 添加修改部分-->
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'neigouYiBanInfo',
components: {
flow
},
data() {
return {
index: 0,
tableKey: 0,
//
formobj: {},
xmlData: '', // xml
taskList: [],
//
linkByParameter: {
businessSid: '',
@ -141,9 +133,6 @@ export default {
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -163,19 +152,6 @@ export default {
}
})
},
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
@ -217,10 +193,14 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #FFFFFF;
@ -230,27 +210,11 @@ export default {
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
.spanOneWidth {
width: 100px !important;
}
.linetwo {
margin-top: 10px;
.addinputwOne {
margin-left: 110px !important;
}
</style>

4
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@ -264,7 +264,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 550 + 'px'
}
}, '*')
},
@ -307,7 +307,7 @@ export default {
openAgree(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data

2
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

@ -227,7 +227,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 550 + 'px'
}
}, '*')
},

397
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue

@ -0,0 +1,397 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>分公司间调账申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
<el-button type="danger" @click="openReject('驳回')"> </el-button>
<el-button type="danger" @click="openStop('终止')"> </el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class=""><!-- -->
<div class="title">分公司间调账申请</div> <!--:rules="rules"-->
<el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
<el-col :span="8">
<el-form-item prop="accadjTypeValue" label="调账类型">
<span>{{temp.accadjTypeValue}}</span>
</el-form-item>
</el-col>
<el-col :span="8"><!-- :readonly="depositVehicleList[scope.$index].inboundDate" -->
<el-form-item prop="callOutOrgName" label="调出分公司">
<span>{{temp.callOutOrgName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgName" label="调入分公司">
<span>{{temp.callInOrgName}}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="addtable">
<div class="tabletitle">
<div class="titlename">
申请车辆列表
</div>
</div>
<template class="tablelist">
<el-table :data="list" border style="width: 100%" :index="index">
<el-table-column align="center" fixed label="序号" type="index" width="50"/>
<el-table-column label="车型名称" align="center" width="190px">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center" width="360">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="运费承担方" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freightUndertakerName }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="left" header-align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</template>
</div>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd">
<el-row v-show="currentLink">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #e0e3eb;">
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
clearable></el-input>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { fetchDetailsBySid } from '@/api/supplychain/tiaozhangshenqing.js'
import req from '@/api/flow/tiaozhangshenqing'
export default {
name: 'tiaozhangshenqing',
data() {
return {
isXuanche: false,
viewTitle: '',
dialogStatus: '',
index: 0,
list: [],
depositVehicleList: [],
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
},
submitdisabled: false, //
disabled: false ,//
// ------------------------------------
currentLink:true, //
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
//
agreeList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid:''
},
//
regectList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
userSid: ''
},
//
stopList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
userSid: ''
}
}
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},
created() {
// ===
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('获取到的obj',obj)
//
this.agreeList.businessSid = obj.businessSid
this.agreeList.instanceId = obj.instanceId
this.agreeList.taskId = obj.taskId
this.agreeList.taskDefKey = obj.taskDefKey
this.agreeList.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.regectList.businessSid = obj.businessSid
this.regectList.instanceId = obj.instanceId
this.regectList.taskId = obj.taskId
this.regectList.userSid = window.sessionStorage.getItem('userSid')
//
this.stopList.businessSid = obj.businessSid
this.stopList.instanceId = obj.instanceId
this.stopList.taskId = obj.taskId
this.stopList.userSid = window.sessionStorage.getItem('userSid')
//
this.transactState = obj.transactState
//
this.showInfo(obj.businessSid)
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
methods: {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
fetchDetailsBySid(sid).then(resp => {
if (resp.success) {
const data = resp.data
this.temp = data
this.list = data.baseInternalPurchaseVehicles
console.log('编辑初始化', this.temp)
}
}).catch(e => {
this.submitdisabled = false
})
},
// ---------- ------------------------------
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true //
// const formVariables = {
// businessSid: this.agreeList.businessSid
// }
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true //
// const formVariables = {
// businessSid: this.regectList.businessSid
// }
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false //
this.nodeDialogVisible = true
},
/** 选择代办人确认 */
confirm() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
} else if (this.operation === '终止') {
this.handleStop()
}
},
/** 同意任务 */
handleAgree() {
this.agreeList.comment = this.dialogList.comment
req.agreeTaskOrgChange(this.agreeList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.regectList.comment = this.dialogList.comment
req.rejectTask(this.regectList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.stopList.comment = this.dialogList.comment
req.breakTask(this.stopList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
}
}
</script>
<style scoped>
.title {
padding: 28px 0;
text-align: center;
}
</style>

19
anrui-system-ui/src/views/flow/doneList.vue

@ -1,14 +1,13 @@
<template xmlns="">
<div class="app-container">
<div class="tab-header webtop">
<div>
<div style="text-align: right">
<!-- <router-link tag='a' :to="'/home'">&nbsp;返回首页</router-link>-->
<a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">关闭</a>
</div>
</div>
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{searchxianshitit}}</el-button>
<div v-show="isSearchShow" class="search">
<div class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="流程名称">
<el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
@ -138,8 +137,6 @@ import flowRecords from '@/components/flow/flowRecord'
editDialog: false,
flowRecordList: [],
listLoading: false,
searchxianshitit: "隐藏查询条件",
isSearchShow: false,
total: 0,
list: [],
tableKey: 0,
@ -257,8 +254,8 @@ import flowRecords from '@/components/flow/flowRecord'
}
selectUrl(this.selectUrl_list).then((response) => {
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://120.46.131.15' + 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://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
} else {
this.$notify({
title: '提示',
@ -349,14 +346,6 @@ import flowRecords from '@/components/flow/flowRecord'
this.getList();
})
},
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
getList() {
this.listLoading = true
getList({

19
anrui-system-ui/src/views/flow/todoList.vue

@ -1,14 +1,13 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>
<div style="text-align: right">
<!-- <router-link tag='a' :to="'/home'">&nbsp;返回首页</router-link>-->
<a href="javascript:window.opener=null;window.open('','_self');window.close();" class="text-center">关闭</a>
</div>
</div>
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{searchxianshitit}}</el-button>
<div v-show="isSearchShow" class="search">
<div class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="流程名称">
<el-input v-model="listQuery.params.proDefName" placeholder="流程名称" clearable></el-input>
@ -135,8 +134,6 @@ export default {
editDialog: false,
flowRecordList: [],
listLoading: false,
searchxianshitit: "隐藏查询条件",
isSearchShow: false,
total: 0,
dialogList: {},
list: [],
@ -288,8 +285,8 @@ export default {
}
selectUrl(this.selectUrl_list).then((response) => {
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://120.46.131.15' + 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://120.46.131.15' + response.data.url + '?token=' + getStorage() + '&data=' + encodeURI((JSON.stringify(parameter_list)))
console.log('已办拼接url:',this.url)
} else {
this.$notify({
@ -440,14 +437,6 @@ export default {
this.getList();
})
},
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
getList() {
this.listLoading = true
pagerList({

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlDto.java

@ -14,6 +14,8 @@ public class ImgUrlDto implements Dto {
private static final long serialVersionUID = -896072904271608090L;
@ApiModelProperty("照片名称")
private String title;
@ApiModelProperty("照片sid")
private String imgSid;
@ApiModelProperty("照片路径")
private List<String> files;
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/carInspected/ImgUrlVo.java

@ -13,6 +13,8 @@ public class ImgUrlVo implements Vo {
@ApiModelProperty("照片名称")
private String title;
@ApiModelProperty("照片sid")
private String imgSid;
@ApiModelProperty("照片路径")
private List<String> files;
}

Loading…
Cancel
Save