Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 years ago
parent
commit
fda23c79ac
  1. 19
      anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js
  2. 4
      anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js
  3. 33
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
  4. 43
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue
  5. 7
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue
  6. 7
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue
  7. 7
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue
  8. 7
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue
  9. 28
      anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
  10. 36
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
  11. 37
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
  12. 9
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
  13. 11
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
  14. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  15. 35
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
  16. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
  17. 27
      anrui-system-ui/src/views/organizationManage/organizationManage.vue

19
anrui-buscenter/anrui-buscenter-ui/src/api/flow/orderSalesTodo.js

@ -1,6 +1,6 @@
import request from '@/utils/request'
// 销售订单代办任务同意办理
// 销售订单代办任务同意办理 (8.9修改后)
export function businessAgree(params) {
return request({
url: "/buscenter/v1/bussalesorder/complete",
@ -47,3 +47,20 @@ export function revokeTask(params) {
}
})
}
// 销售订单审批流程(同意)获取下一环节 (8.9修改后)
export function getNextNodesForSubmit(params) {
return request({
url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit',
method: 'get',
params: params
})
}
// 审批流程(驳回、终止)获取上一环节(8.9修改后)
export function getPreviousNodesForReject(params) {
return request({
url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject',
method: 'get',
params: params
})
}

4
anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js

@ -36,7 +36,7 @@ export function saveOrderForm(data) {
});
}
// 编辑、详情初始化 已改
// 编辑、详情初始化 已改(8.9修改后)
export function fetchDetailsBySid(params) {
return request({
url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid,
@ -44,7 +44,7 @@ export function fetchDetailsBySid(params) {
params: params,
});
}
// 销售订单提交接口
// 销售订单提交接口 (8.9修改后)
export function submitOrderForm(params) {
return request({
url: "/buscenter/v1/bussalesorder/submit",

33
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@ -222,6 +222,13 @@ export default {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toQuickAdd',
btnLabel: '快速新增'
},
{
type: 'primary',
size: 'small',
@ -345,6 +352,9 @@ export default {
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toQuickAdd':
this.toQuickAdd()
break
case 'toAdd':
this.toAdd()
break
@ -558,6 +568,29 @@ export default {
this.sids = aa
console.log('sids', this.sids)
},
//
toQuickAdd() {
if (this.sids.length === 1) {
this.viewState = 2
const sid = this.sids[0]
this.$refs['divadd'].showQuickAdd(sid)
} else if (this.sids.length > 1) {
this.$notify({
title: '提示',
message: '不能选中多个车型进行快速新增操作!',
type: 'info',
duration: 2000
})
} else {
this.$notify({
title: '提示',
message: '没有选择车型进行快速新增操作!',
type: 'error',
duration: 2000
})
return
}
},
//
toAdd() {
this.viewState = 2

43
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexingAdd.vue

@ -191,8 +191,7 @@ import {
SaveList,
selectByOrgSid
} from '@/api/cheliang/basevehiclemodel'
import {fetchBySid} from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons'
import { fetchBySid, typeValues } from '@/api/cheliang/dictcommons'
import Upload from '@/components/uploadFile/uploadImg.vue'
export default {
@ -353,7 +352,41 @@ export default {
this.setDetaList()
this.getChang()
},
showQuickAdd(sid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.dialogStatus = 'add'
this.stateId = 0
this.viewTitle = '【新增】常用配置信息'
//
const userSid = window.sessionStorage.getItem('userSid')
getAll({ sid: sid, userSid: userSid }).then(resp => {
if (resp.success) {
const data = resp.data
this.temp = data
this.temp = JSON.parse(JSON.stringify(this.temp).replace(
/baseVehicleModelAppendixVos/g,
'baseVehicleModelAppendixDtos'
)
)
this.temp.sid = ''
if (this.temp.baseVehicleModelAppendixDtos.length > 0) {
for (var i = 0; i < this.temp.baseVehicleModelAppendixDtos.length; i++) {
var imgName = this.temp.baseVehicleModelAppendixDtos[i].filePath.split('/')
this.imgList.push({
name: imgName[imgName.length - 1],
url: this.temp.baseVehicleModelAppendixDtos[i].filePath
})
}
console.log('123123', this.imgList)
}
}
})
this.getPathSid()
this.setDetaList()
this.getChang()
},
showEdit(sid, row) {
console.log(sid)
console.log('imgList', this.imgList)
@ -426,13 +459,15 @@ export default {
},
getUrl() {
console.log('已有图片', this.imgList)
var img_file = []
for (var i = 0; i < this.imgList.length; i++) {
console.log(this.temp)
this.temp.baseVehicleModelAppendixDtos.push({
img_file.push({
modelSid: this.temp.sid,
filePath: this.imgList[i].url
})
}
this.temp.baseVehicleModelAppendixDtos = img_file
},
updateUrl() {
console.log('回显', this.imgList)

7
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexinglook.vue

@ -165,7 +165,12 @@
<span>{{ props.row.specification }}</span>
</template>
</el-table-column>
<el-table-column prop="netReceiptsNum" width="150" label="后桥速比" align="center">
<el-table-column prop="netReceiptsNum" width="150" label="后桥" align="center">
<template slot-scope="props">
<span>{{ props.row.rearAxleValue }}</span>
</template>
</el-table-column>
<el-table-column prop="netReceiptsNum" width="150" label="速比" align="center">
<template slot-scope="props">
<span>{{ props.row.rearAxleRatio }}</span>
</template>

7
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue

@ -166,7 +166,12 @@
<span>{{ scope.row.specification }}</span>
</template>
</el-table-column>
<el-table-column width="110px" label="后桥速比" align="center">
<el-table-column width="110px" label="后桥" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleValue }}</span>
</template>
</el-table-column>
<el-table-column width="110px" label="速比" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleRatio }}</span>
</template>

7
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@ -170,7 +170,12 @@
<span>{{ scope.row.specification }}</span>
</template>
</el-table-column>
<el-table-column width="110px" label="后桥速比" align="center">
<el-table-column width="110px" label="后桥" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleValue }}</span>
</template>
</el-table-column>
<el-table-column width="110px" label="速比" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleRatio }}</span>
</template>

7
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhi.vue

@ -183,7 +183,12 @@
<span>{{ scope.row.specification }}</span>
</template>
</el-table-column>
<el-table-column label="后桥速比" width="130px" align="center">
<el-table-column label="后桥" width="130px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleValue }}</span>
</template>
</el-table-column>
<el-table-column label="速比" width="130px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.rearAxleRatio }}</span>
</template>

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

@ -8,7 +8,7 @@
<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="110px" class="tab-header">
<el-form-item label="状态">
<el-form-item label="认款状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
@ -18,7 +18,7 @@
<el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="认款时间">
<el-form-item label="认款日期">
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
@ -27,9 +27,14 @@
<el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
</el-form-item>
<el-form-item label="排产申请编号">
<el-form-item label="申请编号">
<el-input v-model="listQuery.params.proSchAppNo" placeholder="请输入排产申请编号" clearable/>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@ -54,11 +59,16 @@
<span>{{ scope.row.state == '0' ? '未认款' : '已认款' }}</span>
</template>
</el-table-column>
<el-table-column label="排产申请编号" align="center" width="200px">
<el-table-column label="申请编号" align="center" width="200px">
<template slot-scope="scope">
<span>{{ scope.row.proSchAppNo }}</span>
</template>
</el-table-column>
<el-table-column label="采购类型" align="center" width="200px">
<template slot-scope="scope">
<span>{{ scope.row.applyType }}</span>
</template>
</el-table-column>
<el-table-column label="申请订金金额" header-align="center" align="left" width="150px">
<template slot-scope="scope">
<span>{{ scope.row.paymentMoney }}</span>
@ -110,7 +120,7 @@
<script>
import req from '@/api/supplychain/manufacturers'
import { getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
@ -168,6 +178,7 @@ export default {
dictValue: '无需打款'
}
],
applyType_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
@ -177,6 +188,7 @@ export default {
subscriptionStartDate: '',
subscriptionEndDate: '',
proSchAppNo: '',
applyTypeKey: '',
createOrgSid: ''
},
current: 1,
@ -217,6 +229,11 @@ export default {
}
},
init() {
typeValues({ type: 'applyType' }).then((resp) => {
if (resp.success) {
this.applyType_list = resp.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.listQuery.params.createOrgSid = res.data
@ -263,6 +280,7 @@ export default {
subscriptionStartDate: '',
subscriptionEndDate: '',
proSchAppNo: '',
applyTypeKey: '',
createOrgSid: ''
},
current: 1,

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

@ -13,8 +13,15 @@
<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-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
<el-form-item label="采购类型">
<el-select v-model="queryParams.params.applyTypeKey" placeholder="请选择" clearable filterable>
<el-option v-for="item in applyType_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="queryParams.params.schedulingTypeKey" placeholder="请选择" clearable filterable>
<el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -44,7 +51,7 @@
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column width="150" prop="schedulingType" label="排产类型" align="center"/>
<el-table-column width="150" prop="schedulingType" label="采购原因" align="center"/>
<el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
<el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
<el-table-column width="150" prop="createOrgName" label="分公司" align="center"/>
@ -127,6 +134,8 @@ export default {
// sid
sids: [], // SID
sides: '', // sid
schedulingType_list: [],
applyType_list: [],
queryParams: {
current: 1,
size: 10,
@ -134,7 +143,8 @@ export default {
params: {
applicationDateStart: '',
applicationDateEnd: '',
modelName: '', //
applyTypeKey: '',
schedulingTypeKey: '',
userSid: ''
}
},
@ -142,6 +152,7 @@ export default {
}
},
created() {
this.init()
this.loadList()
},
mounted() {
@ -179,6 +190,20 @@ export default {
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
init() {
req.pullDown({ type: 'schedulingType' }).then((res) => {
if (res.success) {
this.schedulingType_list = res.data
console.log('下拉框请求111', res.data)
}
})
req.pullDown({ type: 'applyType' }).then((res) => {
if (res.success) {
this.applyType_list = res.data
console.log('下拉框请求111', res.data)
}
})
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX' + btnKey)
switch (btnKey) {
@ -234,7 +259,8 @@ export default {
params: {
applicationDateStart: '',
applicationDateEnd: '',
modelName: '', //
applyTypeKey: '',
schedulingTypeKey: '',
userSid: ''
}
}

37
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@ -34,8 +34,16 @@
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>排产类型:</span></div>
<el-col :span="8" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购类型:</span></div>
<el-form-item>
<el-select v-model="formobj.applyType" placeholder="请选择" @change="changeApplyType" clearable class="addinputInfo addinputOne">
<el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购原因:</span></div>
<el-form-item>
<el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
<el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
@ -150,6 +158,7 @@ export default {
tableKey: 0,
//
schedulingType_list: [], // 使
applyType_list: [],
isRead: false,
//
formobj: {
@ -159,7 +168,9 @@ export default {
createByName: '', //
applicationCode: '', //
applicationDate: '', //
schedulingType: '', //
applyType: '', //
applyTypeKey: '',
schedulingType: '', //
schedulingTypeKey: '',
remarks: '', //
currentAmount: '', //
@ -179,7 +190,11 @@ export default {
req.pullDown({ type: 'schedulingType' }).then((res) => {
if (res.success) {
this.schedulingType_list = res.data
console.log('下拉框请求111', res.data)
}
})
req.pullDown({ type: 'applyType' }).then((res) => {
if (res.success) {
this.applyType_list = res.data
}
})
},
@ -285,6 +300,18 @@ export default {
})
}
},
changeApplyType(value) {
let bb = null
this.applyType_list.forEach((e) => {
if (e.dictValue === value) {
bb = {
key: e.dictKey,
value: e.dictValue
}
}
})
this.formobj.applyTypeKey = bb.key
},
changeSchedulingType(value) {
let bb = null
this.schedulingType_list.forEach((e) => {
@ -408,6 +435,8 @@ export default {
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj.applyType = ''
this.formobj.applyTypeKey = ''
this.formobj.schedulingType = '' //
this.formobj.schedulingTypeKey = ''
this.formobj.remarks = '' //

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

@ -30,8 +30,13 @@
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>排产类型:</span></div>
<el-col :span="8" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购类型:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
</el-form-item>
</el-col>
<el-col :span="16" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
</el-form-item>
</el-col>

11
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue

@ -29,6 +29,13 @@
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseContract" placeholder="请输入负责人" clearable/>-->
</el-form-item>
<el-form-item label="验车日期">
<el-date-picker v-model="listQuery.params.inspectedStartDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
<label></label>
<el-date-picker v-model="listQuery.params.inspectedEndDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
@ -126,6 +133,8 @@ export default {
vin: '',
model: '',
purchaseType: '',
inspectedStartDate:'',
inspectedEndDate:'',
userSid: window.sessionStorage.getItem('userSid')
}
},
@ -187,6 +196,8 @@ export default {
vin: '',
model: '',
purchaseType: '',
inspectedStartDate:'',
inspectedEndDate:'',
userSid: window.sessionStorage.getItem('userSid')
}
}

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

@ -32,8 +32,13 @@
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>排产类型:</span></div>
<el-col :span="8" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购类型:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
</el-form-item>
</el-col>
<el-col :span="16" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
</el-form-item>
</el-col>

35
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@ -33,8 +33,16 @@
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>排产类型:</span></div>
<el-col :span="8" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购类型:</span></div>
<el-form-item>
<el-select v-model="formobj.applyType" placeholder="请选择" @change="changeApplyType" clearable class="addinputInfo addinputOne">
<el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购原因:</span></div>
<el-form-item>
<el-select v-model="formobj.schedulingType" placeholder="请选择" @change="changeSchedulingType" clearable class="addinputInfo addinputOne">
<el-option v-for="item in schedulingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
@ -148,6 +156,7 @@ export default {
tableKey: 0,
//
schedulingType_list: [], // 使
applyType_list: [],
isRead: false,
//
formobj: {
@ -157,7 +166,9 @@ export default {
createByName: '', //
applicationCode: '', //
applicationDate: '', //
schedulingType: '', //
applyType: '', //
applyTypeKey: '',
schedulingType: '', //
schedulingTypeKey: '',
remarks: '', //
currentAmount: '', //
@ -196,7 +207,11 @@ export default {
req.pullDown({ type: 'schedulingType' }).then((res) => {
if (res.success) {
this.schedulingType_list = res.data
console.log('下拉框请求111', res.data)
}
})
req.pullDown({ type: 'applyType' }).then((res) => {
if (res.success) {
this.applyType_list = res.data
}
})
},
@ -263,6 +278,18 @@ export default {
})
}
},
changeApplyType(value) {
let bb = null
this.applyType_list.forEach((e) => {
if (e.dictValue === value) {
bb = {
key: e.dictKey,
value: e.dictValue
}
}
})
this.formobj.applyTypeKey = bb.key
},
changeSchedulingType(value) {
let bb = null
this.schedulingType_list.forEach((e) => {

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

@ -30,8 +30,13 @@
</el-col>
</el-row>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>排产类型:</span></div>
<el-col :span="8" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购类型:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyType }}</span>
</el-form-item>
</el-col>
<el-col :span="16" class="colStyle">
<div class="span-sty spanOneWidth"><span>采购原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.schedulingType }}</span>
</el-form-item>
</el-col>

27
anrui-system-ui/src/views/organizationManage/organizationManage.vue

@ -44,7 +44,7 @@
<tr>
<td>主管人员</td>
<td>
<el-select v-model="form.zgStaffSid" style="width:300px">
<el-select v-model="form.zgStaffSid" style="width:300px" clearable>
<el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
@ -52,7 +52,7 @@
<td>分管人员</td>
<td>
<el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
<el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
<el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
<!-- <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
@ -217,7 +217,7 @@
<tr>
<td>主管人员</td>
<td>
<el-select v-model="form.zgStaffSid" style="width:300px" @change="zgStaffSidChange">
<el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">
<el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
@ -225,7 +225,7 @@
<td>分管人员</td>
<td>
<el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
<el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
<el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</td>
@ -312,7 +312,7 @@ export default {
sort: '',
isDept: ''
},
fgStaffSid: [],
formBackup: Object.assign({}, this.form),
isshow: 'table',
page: {
@ -376,7 +376,12 @@ export default {
})
},
save() {
this.form.fgStaffSid = this.form.fgStaffSid.join()
if (this.fgStaffSid.length > 0) {
this.form.fgStaffSid = this.fgStaffSid.join()
} else {
this.form.fgStaffName = ''
this.form.fgStaffSid = ''
}
this.form.organizationSid = this.$store.getters.userInfo.orgSid
// this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
if (this.form.sid) {
@ -384,7 +389,7 @@ export default {
putOrgtree(this.form).then(res => {
this.isshow = 'table'
this.getOrgTree()
this.handleNodeClick({ sid: this.form.psid })
this.handleNodeClick({sid: this.form.psid})
this.$message({
message: res.msg,
type: 'success'
@ -423,10 +428,13 @@ export default {
if (response.success) {
this.form = response.data
this.form.fgStaffName = response.data.fgNames
this.form.fgStaffSid = response.data.fgStaffSid.split(',')
this.form.fgStaffSid = response.data.fgStaffSid
if (this.form.fgStaffSid) {
this.fgStaffSid = response.data.fgStaffSid.split(',')
}
this.form.zgStaffName = response.data.zgNames
this.form.zgStaffSid = response.data.zgStaffSid
console.log('112233445566', this.form)
console.log('编辑回显的数据', this.form)
}
})
// console.log('', row)
@ -465,6 +473,7 @@ export default {
this.form.fgStaffSid = data.fgSids.split(',')
},
nodeSave() { //
console.log('这是保存nodeSave(0')
this.form.fgStaffSid = this.form.fgStaffSid.join()
postOrgtree(this.form).then(res => {
this.getOrgTree()

Loading…
Cancel
Save