Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
b9ff806a89
  1. 9
      anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js
  2. 42
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue
  3. 30
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
  4. 23
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList.vue
  5. 56
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue
  6. 20
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
  7. 61
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
  8. 14
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
  9. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java
  10. 14
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java
  11. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

9
anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js

@ -64,12 +64,3 @@ export function saveResultImage(data) {
headers: { 'Content-Type': 'application/json' }
})
}
// 数据字典
export function typeValues(data) {
return request({
url: '/portal/v1/dictcommons/typeValues',
method: 'get',
params: data
})
}

42
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue

@ -97,7 +97,7 @@ import pageye from '@/components/pagination/pageye'
import diaocheshenqingAdd from '@/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd'
import diaocheshenqingInfo from '@/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingInfo'
import { listPage, delBySids } from '@/api/supplychain/diaochekaipiaoshenqing'
import { getPathSidByUserSid, getOrg } from '@/api/cheliang/basevehiclemodel'
import { getOrgSidByPath, getListOrg } from '@/api/cheliang/dictcommons'
import { getStorage } from '@/utils/auth'
export default {
@ -122,8 +122,6 @@ export default {
useOrg_list: [],
modelName_list: [],
purchaseType_list: [],
useOrg: '', // 使
useOrgSid: '', // 使sid
listQuery: {
current: 1,
size: 5,
@ -133,7 +131,7 @@ export default {
applyEndDate: '', //
callOutOrgSid: '', // sid
createOrgSid: '', //
userSid: window.sessionStorage.getItem('userSid')
userSid: ''
}
},
btnList: [
@ -249,7 +247,7 @@ export default {
delBySids(this.sids).then(resp => {
if (resp.success) {
loading.close()
_this.$message({type: 'success', message: resp.msg, showClose: true})
_this.$message({ type: 'success', message: resp.msg, showClose: true })
_this.loadList()
} else {
loading.close()
@ -279,17 +277,15 @@ export default {
console.log('勾选的数据', this.sids)
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
this.useOrg = res.data
this.getList()
}
})
},
getListOrgAll() {
getOrg().then((res) => {
getListOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
}
@ -308,24 +304,26 @@ export default {
applyStartDate: '', //
applyEndDate: '', //
callOutOrgSid: '', // sid
createOrgSid: this.useOrg, //
userSid: window.sessionStorage.getItem('userSid')
createOrgSid: '', //
userSid: ''
}
}
this.getPathSid()
},
loadList() {
const _this = this
this.tableLoading = true
listPage(this.listQuery)
.then(resp => {
_this.tableLoading = false
const data = resp.data
_this.listQuery.total = data.total
_this.dataList = data.records
})
.catch(() => {
_this.tableLoading = false
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
listPage(this.listQuery).then((resp) => {
this.tableLoading = false
if (resp.success) {
this.listQuery.total = resp.data.total
this.dataList = resp.data.records
} else {
this.listQuery.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
//

30
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@ -145,9 +145,8 @@
<script>
import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
import upload_diaoche from '@/components/uploadFile/upload_diaoche'
import { getPathSidByUserSid, fetchBySid, getListOrgByBrand } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath, fetchBySid, getListOrgByBrand, typeValues } from '@/api/cheliang/dictcommons'
import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { typeValues } from '@/api/supplychain/yancheguanli'
import req from '@/api/kucunguanli/changjiachuku'
export default {
@ -163,8 +162,6 @@ export default {
dialogStatus: '',
dialogVisible: false,
dialogUrl: [],
useOrg: '',
useOrgName: '',
index: 0,
list: [],
vehicleList: [],
@ -187,6 +184,7 @@ export default {
nodeState: '',
shuntingTypeValue: '调入',
shuntingTypeKey: '01',
orgPath: '',
baseShuntingInvoicinApplyeVehs: []
},
rules: {
@ -219,16 +217,13 @@ export default {
return val
},
getType() {
typeValues({
type: 'invoiceType'
}).then((response) => {
if (response.code === '200' && response.data) {
typeValues({ type: 'invoiceType' }).then((response) => {
if (response.success) {
this.invoiceType_list = response.data
}
})
},
invoiceTypeChange(row, val) {
console.log('215545', row, val)
if (val) {
const choosetItem = this.invoiceType_list.filter((item) => item.dictKey === val)
row.invoiceTypeValue = choosetItem[0].dictValue
@ -242,19 +237,16 @@ export default {
},
// sid
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') {
this.useOrg = res.data
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.temp.createOrgSid = res.data
this.temp.callInOrgSid = res.data
fetchBySid(this.useOrg).then((resp) => {
fetchBySid(res.data).then((resp) => {
if (resp.success) {
this.useOrgName = resp.data.name
this.temp.callInOrgName = this.useOrgName
this.temp.callInOrgName = resp.data.name
}
})
getListOrgByBrand(this.useOrg).then((res) => {
getListOrgByBrand(res.data).then((res) => {
if (res.success) {
this.useOrg_list = res.data
}
@ -361,6 +353,7 @@ export default {
})
this.temp.name = window.sessionStorage.getItem('name')
this.temp.createBySid = window.sessionStorage.getItem('userSid')
this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.dialogStatus = 'add'
this.viewTitle = '【新增】调车开票申请'
this.getPathSid()
@ -438,11 +431,10 @@ export default {
nodeState: '',
shuntingTypeValue: '调入',
shuntingTypeKey: '01',
orgPath: '',
baseShuntingInvoicinApplyeVehs: []
}
this.list = []
this.useOrg = []
this.useOrgName = ''
this.submitdisabled = false
this.$refs['dataForm'].resetFields()
this.$emit('doback')

23
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList.vue

@ -25,7 +25,7 @@
</div>
<div class="listtop">
<div class="tit">现车库存列表</div>
<pageye v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table ref="multipleTable" :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
@ -56,7 +56,7 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="total>0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
@ -76,7 +76,6 @@ export default {
},
data() {
return {
createPage: '',
dialogVisible: false, //
isSearchShow: false,
searchxianshitit: '显示查询条件',
@ -86,12 +85,12 @@ export default {
tableKey: 0,
list: [],
sids: [],
total: 1,
FormLoading: false,
listLoading: false,
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
vinNo: '',
callOutOrgSid: '',
@ -101,7 +100,7 @@ export default {
},
vinNoList: [],
vehicle_list: [],
visible: true,
visible: true
// ------------------------------------
}
},
@ -129,7 +128,8 @@ export default {
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 20
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.vinNo = ''
},
//
@ -184,18 +184,13 @@ export default {
getList() {
this.listLoading = true
fetchVeh(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (
response.code === '200' &&
response.data &&
response.data.total > 0
) {
if (response.success) {
this.list = response.data.records
this.total = response.data.total
this.listQuery.total = response.data.total
} else {
this.list = []
this.total = 0
this.listQuery.total = 0
}
})
},

56
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue

@ -93,8 +93,7 @@ import pageye from '@/components/pagination/pageye'
import tiaozhangshenqingguanliAdd from '@/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd'
import tiaozhangshenqingguanliInfo from '@/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo'
import { listPage, delBySids } from '@/api/supplychain/tiaozhangshenqing.js'
import { getPathSidByUserSid, getOrg } from '@/api/cheliang/basevehiclemodel'
import { typeValues } from '@/api/supplychain/yancheguanli'
import { getOrgSidByPath, getListOrg, typeValues } from '@/api/cheliang/dictcommons'
import { getStorage } from '@/utils/auth'
export default {
@ -118,8 +117,6 @@ export default {
dataList: [],
useOrg_list: [],
accadjType_list: [],
useOrg: '', // 使
useOrgSid: '', // 使sid
listQuery: {
current: 1,
size: 10,
@ -130,8 +127,8 @@ export default {
accadjTypeKey: '',
callOutOrgSid: '',
callInOrgSid: '',
createOrgSid: '', // window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid')
createOrgSid: '',
userSid: ''
}
},
btnList: [
@ -230,7 +227,6 @@ export default {
})
return
}
const _this = this
const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
@ -247,8 +243,8 @@ export default {
delBySids(this.sids).then(resp => {
if (resp.success) {
loading.close()
_this.$message({ type: 'success', message: resp.msg, showClose: true })
_this.loadList()
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.loadList()
} else {
loading.close()
}
@ -277,11 +273,9 @@ export default {
console.log('勾选的数据', this.sids)
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
this.useOrg = res.data
this.getList()
}
})
@ -301,37 +295,37 @@ export default {
accadjTypeKey: '',
callOutOrgSid: '',
callInOrgSid: '',
createOrgSid: this.useOrg, // window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid')
createOrgSid: '',
userSid: ''
}
}
this.getPathSid()
},
loadList() {
const _this = this
this.tableLoading = true
listPage(this.listQuery)
.then(resp => {
_this.tableLoading = false
const data = resp.data
_this.listQuery.total = data.total
_this.dataList = data.records
})
.catch(() => {
_this.tableLoading = false
})
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
listPage(this.listQuery).then((resp) => {
this.tableLoading = false
if (resp.success) {
this.listQuery.total = resp.data.total
this.dataList = resp.data.records
} else {
this.listQuery.total = 0
this.dataList = []
}
}).catch(() => {
this.tableLoading = false
})
},
getType() {
typeValues({
type: 'accadjType'
}).then((response) => {
if (response.code === '200' && response.data) {
typeValues({ type: 'accadjType' }).then((response) => {
if (response.success) {
this.accadjType_list = response.data
}
})
},
getListOrgAll() {
getOrg().then((res) => {
getListOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
}

20
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue

@ -122,8 +122,7 @@
<script>
import tiaozhangcheliangList from '@/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList'
import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
import { getPathSidByUserSid, getListOrgByBrand, fetchBySid } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath, getListOrgByBrand, fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'tiaozhangshenqingguanliAdd',
@ -156,6 +155,7 @@ export default {
useOrgSid: '', // 使sid
createOrgSid: '', // sid
nodeState: '', //
orgPath: '',
accSids: [] // sid
},
rules: {
@ -195,8 +195,7 @@ export default {
},
// sid
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.useOrg = res.data
this.temp.createOrgSid = res.data
@ -209,10 +208,8 @@ export default {
})
},
getType() {
typeValues({
type: 'accadjType'
}).then((response) => {
if (response.code === '200' && response.data) {
typeValues({ type: 'accadjType' }).then((response) => {
if (response.success) {
this.accadjType_list = response.data
}
})
@ -221,13 +218,10 @@ export default {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val)
this.temp.accadjTypeValue = choosetItem[0].dictValue
console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey)
//
if (this.temp.accadjTypeKey === '01') {
this.temp.callInOrgSid = this.useOrg
// const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
this.temp.callInOrgName = this.useOrgName
console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
this.temp.callOutOrgName = ''
this.temp.callOutOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
@ -239,9 +233,7 @@ export default {
//
if (this.temp.accadjTypeKey === '02') {
this.temp.callOutOrgSid = this.useOrg
// const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
this.temp.callOutOrgName = this.useOrgName
console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
this.temp.callInOrgName = ''
this.temp.callInOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
@ -342,6 +334,7 @@ export default {
useOrgSid: '', // 使sid
createOrgSid: '', // sid
nodeState: '', //
orgPath: '',
accSids: [] // sid
}
this.list = []
@ -357,6 +350,7 @@ export default {
this.$refs['dataForm'].clearValidate()
})
this.temp.createBySid = window.sessionStorage.getItem('userSid')
this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.dialogStatus = 'add'
this.viewTitle = '【新增】分公司间调账申请'
this.getPathSid()

61
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue

@ -7,11 +7,8 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()"
>保存
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交
</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleCreate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSubmit()">提交</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
@ -35,11 +32,8 @@
</el-col>
<el-col :span="8">
<el-form-item prop="money" label="调出分公司">
<el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw"
@change="callOutOrgSidChange"
:disabled="dialogStatus == 'edit'">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.name"/>
<el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" @change="callOutOrgSidChange" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
@ -58,9 +52,7 @@
<el-table-column align="center" fixed label="序号" type="index" width="50"/>
<el-table-column label="操作" fixed align="center" width="90" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini"
type="danger"
@click="dataDelete(scope.row,scope.$index,list[scope.$index])">删除</el-button>
<el-button size="mini" type="danger" @click="dataDelete(scope.row,scope.$index,list[scope.$index])">删除</el-button>
</template>
</el-table-column>
<el-table-column width="190" label="车型" align="center">
@ -74,7 +66,7 @@
</template>
</el-table-column>
<el-table-column width="200" label="合格证信息" align="center">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<el-input v-model="scope.row.certificate" placeholder="请输入" class="addinputw"/>
</template>
</el-table-column>
@ -90,19 +82,14 @@
</el-table-column>
<el-table-column width="200" label="发票类型" align="center">
<template slot-scope="scope">
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<el-select v-model="scope.row.invoiceTypeKey" placeholder="请选择" clearable class="addinputw"
@change="invoiceTypeChange(scope.row,scope.row.invoiceTypeKey)"
:disabled="scope.row.isAvailable || dialogStatus == 'edit'">
<el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="scope.row.invoiceTypeKey" placeholder="请选择" clearable class="addinputw" @change="invoiceTypeChange(scope.row,scope.row.invoiceTypeKey)" :disabled="scope.row.isAvailable || dialogStatus == 'edit'">
<el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</template>
</el-table-column>
<el-table-column width="130" label="开票金额" align="center">
<template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票金额=内销价格 -->
<el-input
v-model="scope.row.invoiceTypeKey == '02' ? scope.row.witPinMoney :scope.row.invoicinMoney"
<el-input v-model="scope.row.invoiceTypeKey == '02' ? scope.row.witPinMoney :scope.row.invoicinMoney"
placeholder="请输入" class="addinputw"
:disabled="scope.row.invoiceTypeKey == '02'"
@keyup.native="scope.row.invoicinMoney = oninput(scope.row.invoicinMoney,2)"
@ -111,17 +98,13 @@
</el-table-column>
<el-table-column width="180" label="开票单位" align="center">
<template slot-scope="scope"><!-- 由发票类型决定,增值税票:开票单位=调入公司 -->
<el-input
v-model="scope.row.invoiceTypeKey == '02' ? temp.callInOrgName :scope.row.invoicinCompanyName"
placeholder="请输入" class="addinputw"
:disabled="scope.row.invoiceTypeKey == '02'"/>
<el-input v-model="scope.row.invoiceTypeKey == '02' ? temp.callInOrgName :scope.row.invoicinCompanyName" placeholder="请输入" class="addinputw" :disabled="scope.row.invoiceTypeKey == '02'"/>
</template>
</el-table-column>
<el-table-column width="180" label="开票信息图片" align="center">
<template slot-scope="scope">
<div class="upload_img">
<upload_diaoche ref="uploadMoreImg" v-model="imgList" bucket="map"
:upload-data="{type:'0001',sid: scope.row.purchaseSid}"/>
<upload_diaoche ref="uploadMoreImg" v-model="imgList" bucket="map" :upload-data="{type:'0001',sid: scope.row.purchaseSid}"/>
</div>
<el-button size="mini" type="primary" @click="open(scope.row)">查看</el-button>
</template>
@ -152,17 +135,15 @@
</div>
</div>
</el-dialog>
<diaochecheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle"
@doback="resetState"/>
<diaochecheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle" @doback="resetState"/>
</div>
</template>
<script>
import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
import upload_diaoche from '@/components/uploadFile/upload_diaoche'
import { getPathSidByUserSid, fetchBySid, getListOrgByBrand } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath, fetchBySid, getListOrgByBrand, typeValues } from '@/api/cheliang/dictcommons'
import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { typeValues } from '@/api/supplychain/yancheguanli'
import req from '@/api/kucunguanli/changjiachuku'
export default {
@ -178,8 +159,6 @@ export default {
dialogStatus: '',
dialogVisible: false,
dialogUrl: [],
useOrg: '',
useOrgName: '',
index: 0,
list: [],
vehicleList: [],
@ -200,6 +179,7 @@ export default {
useOrgSid: '',
createOrgSid: '',
nodeState: '',
orgPath: '',
baseShuntingInvoicinApplyeVehs: []
},
rules: {
@ -270,19 +250,16 @@ export default {
},
// sid
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') {
this.useOrg = res.data
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.temp.createOrgSid = res.data
this.temp.callInOrgSid = res.data
fetchBySid(this.useOrg).then((resp) => {
fetchBySid(res.data).then((resp) => {
if (resp.success) {
this.useOrgName = resp.data.name
this.temp.callInOrgName = this.useOrgName
this.temp.callInOrgName = resp.data.name
}
})
getListOrgByBrand(this.useOrg).then((respsone) => {
getListOrgByBrand(res.data).then((respsone) => {
if (respsone.success) {
this.useOrg_list = respsone.data
}

14
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue

@ -123,8 +123,7 @@
<script>
import tiaozhangcheliangList from './relation/tiaozhangcheliangList'
import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
import { getPathSidByUserSid, getListOrgByBrand, fetchBySid } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
import { getOrgSidByPath, getListOrgByBrand, fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'tiaozhangshenqingEdit',
@ -157,6 +156,7 @@ export default {
useOrgSid: '', // 使sid
createOrgSid: '', // sid
nodeState: '', //
orgPath: '',
accSids: [] // sid
},
rules: {},
@ -203,9 +203,8 @@ export default {
},
// sid
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.useOrg = res.data
this.temp.createOrgSid = res.data
fetchBySid(this.useOrg).then((resp) => {
@ -229,13 +228,10 @@ export default {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val)
this.temp.accadjTypeValue = choosetItem[0].dictValue
console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey)
//
if (this.temp.accadjTypeKey === '01') {
this.temp.callInOrgSid = this.useOrg
// const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
this.temp.callInOrgName = this.useOrgName
console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
this.temp.callOutOrgName = ''
this.temp.callOutOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
@ -247,9 +243,7 @@ export default {
//
if (this.temp.accadjTypeKey === '02') {
this.temp.callOutOrgSid = this.useOrg
// const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
this.temp.callOutOrgName = this.useOrgName
console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
this.temp.callInOrgName = ''
this.temp.callInOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/ProcessComment.java

@ -55,7 +55,6 @@ import java.util.Date;
public class ProcessComment implements Vo {
@ApiModelProperty("评论人")
@NotBlank(message = "reviewer不能为空")
private String reviewer; // 评论人
@ApiModelProperty("评论人")
@NotBlank(message = "reviewerSid不能为空")
@ -64,8 +63,8 @@ public class ProcessComment implements Vo {
@NotBlank(message = "content不能为空")
private String content; // 评论内容
@ApiModelProperty("评论的流程id")
@NotBlank(message = "processId不能为空")
private String processId; // 评论的流程id
@NotBlank(message = "procInsId不能为空")
private String procInsId; // 评论的流程id
@ApiModelProperty("评论的流程实列的sid")
private String processInstSid; // 评论的流程实列的sid

14
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppRest.java

@ -1,5 +1,7 @@
package com.yxt.anrui.terminal.biz.app;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.app.AppFeign;
import com.yxt.anrui.terminal.api.app.flowable.*;
import com.yxt.common.core.result.ResultBean;
@ -23,6 +25,8 @@ public class AppRest implements AppFeign {
@Autowired
private AppService appService;
@Autowired
private SysUserFeign sysUserFeign;
@Override
public ResultBean<List<AppFlowableRecordVo>> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) {
@ -36,16 +40,18 @@ public class AppRest implements AppFeign {
*/
@Override
public ResultBean<List<AppFlowableRecordAndCommentVo>> getProgressCommentList(AppFlowableRecordQuery appFlowableRecordQuery) {
ResultBean<List<AppFlowableRecordAndCommentVo>> rb = ResultBean.fireFail();
ResultBean<List<AppFlowableRecordAndCommentVo>> list = appService.getProgressAndCommentList(appFlowableRecordQuery);
/* List<AppFlowableRecordAndCommentVo> newList = list.stream().
sorted(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime, Comparator.reverseOrder())).
collect(Collectors.toList());*/
return list;
}
@Override
public ResultBean addProgressComment(ProcessComment processComment) {
String reviewerSid = processComment.getReviewerSid();
ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(reviewerSid);
if(!sysUserVoResultBean.getSuccess()){
return ResultBean.fireFail().setMsg("用户不存在!");
}
processComment.setReviewer(sysUserVoResultBean.getData().getName());
return appService.addProgressComment(processComment);
}
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@ -99,6 +99,8 @@ public class AppService {
public ResultBean addProgressComment(ProcessComment processComment) {
ProcessCommentDto dto=new ProcessCommentDto();
BeanUtil.copyProperties(processComment,dto);
String procInsId = processComment.getProcInsId();
dto.setProcessId(procInsId);
return processCommentFeign.save(dto);
}
}

Loading…
Cancel
Save