Browse Source

完善分公司调车调整

master
yunuo970428 3 years ago
parent
commit
e2c35fc86f
  1. 57
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList.vue
  2. 109
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue
  3. 92
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
  4. 61
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue
  5. 271
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/relation/tiaozhangcheliangList.vue
  6. 67
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue
  7. 63
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue
  8. 88
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
  9. 49
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingInfo.vue
  10. 62
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingOrgChange.vue

57
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList.vue

@ -15,9 +15,8 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="调车类型">
<el-select v-model="listQuery.params.shuntingType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in shuntingType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="listQuery.params.shuntingTypeKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in shuntingType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="车架号">
@ -25,19 +24,17 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handleReset">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="handleReset">重置</el-button>
</div>
</div>
</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">
<el-table ref="multipleTable" :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" fixed type="selection" align="center"/>
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车架号" fixed align="center">
@ -65,8 +62,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>
@ -99,20 +95,20 @@ export default {
tableKey: 0,
list: [],
sids: [],
total: 1,
FormLoading: false,
listLoading: false,
listQuery: {
current: 1,
size: 20,
size: 5,
params: {
shuntingType: '',
shuntingTypeKey: '',
vinNo: '',
accadjTypeKey: '',
callOutOrgSid: '',
callInOrgSid: '',
sids: []
}
},
total: 0
},
requiredPar: {},
selectDate: undefined,
@ -127,7 +123,7 @@ export default {
methods: {
//
init() {
//shuntingType
//shuntingType
},
getType() {
typeValues({
@ -176,15 +172,16 @@ export default {
handleReset() {
this.listQuery = {
current: 1,
size: 20,
size: 5,
params: {
shuntingType: '',
shuntingTypeKey: '',
vinNo: '',
accadjTypeKey: this.requiredPar.accadjTypeKey,
callOutOrgSid: this.requiredPar.callOutOrgSid,
callInOrgSid: this.requiredPar.callInOrgSid,
sids: this.requiredPar.sids
}
},
total: 0
}
this.getList()
},
@ -224,7 +221,7 @@ export default {
handleReturn() {
this.listQuery = {
current: 1,
size: 20,
size: 5,
params: {
shuntingType: '',
vinNo: '',
@ -254,10 +251,10 @@ export default {
response.data.total > 0
) {
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
}
})
},
@ -271,20 +268,4 @@ export default {
</script>
<style scoped>
.el-form-item .el-form-item__label {
width: 100% !important;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.el-form-item__content label {
padding: 0 5px;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
background: white;
}
</style>

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

@ -11,33 +11,28 @@
<el-form :inline="true" class="tab-header">
<el-form-item label="调帐类型">
<el-select v-model="listQuery.params.accadjTypeKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
<!-- <el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>-->
</el-form-item>
<el-form-item label="调出分公司">
<el-select v-model="listQuery.params.callOutOrgSid" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
<el-option v-for="item in useOrg_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.callInOrgSid" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="申请日期:">
<el-date-picker v-model="listQuery.params.applyStartDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
<el-date-picker v-model="listQuery.params.applyStartDate" class="filter-item" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
<label></label>
<el-date-picker v-model="listQuery.params.applyEndDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
<el-date-picker v-model="listQuery.params.applyEndDate" 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>
<el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</div>
</div>
@ -45,29 +40,25 @@
<!--Start 项目列表头部-->
<div class="listtop">
<div class="tit">调账申请列表</div>
<pageye v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
<pageye v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
</div>
<!--End 项目列表头部-->
<!--Start 项目列表-->
<div class="">
<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%" @selection-change="handleSelectionChange">
<el-table-column width="50px" fixed type="selection" align="center"/>
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!-- v-show="row.showInspectedBtn" -->
<el-button size="mini" type="primary"
:disabled="row.nodeState == '待提交' ? false:row.nodeState == '调账申请'?false : true"
@click="handleEdit(row)">办理</el-button>
<el-button size="mini" type="primary" :disabled="row.nodeState == '待提交' ? false:row.nodeState == '调账申请'?false : true" @click="handleEdit(row)">办理
</el-button>
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="140px" prop="nodeState" label="状态" align="left" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)"
style="color: #018ad2;cursor: pointer;">{{ scope.row.nodeState }}</span>
<span v-else @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column width="140px" prop="applyDate" label="申请日期" align="center"/>
@ -80,36 +71,18 @@
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="listQuery.total"
:page.sync="listQuery.current"
:limit.sync="listQuery.size"
class="pagination"
@pagination="loadList"
/>
<pagination v-show="dataList.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
<!--End 查询和其列表部分-->
<!--新增修改部分组件-->
<tiaozhangshenqingguanli-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState"
@reloadlist="getList"/>
<tiaozhangshenqingguanli-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"/>
<!-- 详情部分组件 -->
<tiaozhangshenqingguanli-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
<el-dialog
title=""
:visible.sync="centerDialogVisible"
width="78%"
height="1%"
:before-close="closeIt"
center>
<iframe frameborder="0" id="iframe"
style="width:100%;"
:src="this.centerDialogVisible === true ? url :''"
></iframe>
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
@ -119,12 +92,11 @@ import Pagination from '@/components/pagination'
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 { listPage, delBySids } from '@/api/supplychain/tiaozhangshenqing.js'
import { getPathSidByUserSid, getOrg } from '@/api/cheliang/basevehiclemodel'
import { typeValues } from '@/api/supplychain/yancheguanli'
import { getStorage } from '@/utils/auth'
export default {
name: 'tiaozhangshenqingguanli',
components: {
@ -159,7 +131,7 @@ export default {
callOutOrgSid: '',
callInOrgSid: '',
createOrgSid: '', // window.sessionStorage.getItem('orgSid'),
userSid:window.sessionStorage.getItem('userSid')
userSid: window.sessionStorage.getItem('userSid')
}
},
btnList: [
@ -199,14 +171,17 @@ export default {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
async handleMessage (event) {
var code= event.data.params.code;
if(code==1){
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.init()
this.centerDialogVisible=false
} else if (code==2){
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'));
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
@ -214,15 +189,14 @@ export default {
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight;
//iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight;
iframe.height = this.dialogHeight
},
flowRecord(row){
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token : getStorage()
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
@ -282,7 +256,6 @@ export default {
loading.close()
})
}).catch(() => {
loading.close()
})
},
handleEdit(row) {
@ -305,7 +278,7 @@ export default {
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
this.listQuery.params.createOrgSid = res.data
this.useOrg = res.data
@ -329,7 +302,7 @@ export default {
callOutOrgSid: '',
callInOrgSid: '',
createOrgSid: this.useOrg, // window.sessionStorage.getItem('orgSid'),
userSid:window.sessionStorage.getItem('userSid')
userSid: window.sessionStorage.getItem('userSid')
}
}
this.getPathSid()
@ -379,24 +352,4 @@ export default {
</script>
<style scoped>
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
background: white;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
</style>

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

@ -7,16 +7,9 @@
<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="info" size="small" @click="handleReturn()">返回</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>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
@ -30,31 +23,22 @@
<el-row>
<el-col :span="8">
<el-form-item prop="accadjTypeKey" label="调账类型">
<el-select v-model="temp.accadjTypeKey" placeholder="请选择" clearable class="addinputw"
@change="accadjTypeKeyChange"
:disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="temp.accadjTypeKey" placeholder="请选择" clearable class="addinputw" @change="accadjTypeKeyChange" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" -->
<el-form-item prop="callOutOrgSid" label="调出分公司">
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw"
:disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'"
@change="callOutOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgSid" label="调入分公司">
<el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw"
:disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'"
@change="callInOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
<el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
@ -73,8 +57,7 @@
<el-table-column align="center" fixed label="序号" type="index" width="50"/>
<el-table-column label="操作" fixed align="center" width="80" 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 size="mini" type="danger" @click="dataDelete(scope.row,scope.$index,list[scope.$index])">删除
</el-button>
</template>
</el-table-column>
@ -89,12 +72,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -103,13 +86,13 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="140">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"&ndash;&gt;-->
<!-- &lt;!&ndash; :readonly="vehicleList[scope.$index].inboundDate"/>&ndash;&gt;-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="140">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"&ndash;&gt;-->
<!-- &lt;!&ndash; :readonly="vehicleList[scope.$index].inboundDate"/>&ndash;&gt;-->
<!-- <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>
@ -132,8 +115,7 @@
</div>
<!--End 添加修改部分-->
</div>
<tiaozhangcheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle"
@doback="resetState"/>
<tiaozhangcheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle" @doback="resetState"/>
</div>
</template>
@ -145,7 +127,7 @@ import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'tiaozhangshenqingguanliAdd',
components:{
components: {
tiaozhangcheliangList
},
data() {
@ -184,7 +166,7 @@ export default {
],
callInOrgSid: [
{ required: true, message: '请选择调入公司', trigger: 'change' }
],
]
},
submitdisabled: false, //
disabled: false //
@ -193,12 +175,12 @@ export default {
methods: {
//
oninput(val, limit = 0) {
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') //0
val = val.replace(/^\./g, '0.') //0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' //0
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
@ -213,7 +195,7 @@ export default {
// sid
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
this.useOrg = res.data
this.temp.createOrgSid = res.data
@ -238,13 +220,13 @@ export default {
},
accadjTypeKeyChange(val) {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictKey == 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)
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
this.temp.callInOrgName = name[0].name
console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
this.temp.callOutOrgName = ''
@ -253,7 +235,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)
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
this.temp.callOutOrgName = name[0].name
console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
this.temp.callInOrgName = ''
@ -262,17 +244,17 @@ export default {
}
},
callOutOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid == val)
const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
this.temp.callOutOrgName = choosetItem[0].name
console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
},
callInOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid == val)
const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
this.temp.callInOrgName = choosetItem[0].name
console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid)
},
handletiaozhangcheliang() {
if (this.temp.accadjTypeKey == '') {
if (this.temp.accadjTypeKey === '') {
this.$message({
showClose: true,
message: '请选择调账类型',
@ -280,7 +262,7 @@ export default {
})
return
}
if (this.temp.callOutOrgSid == '') {
if (this.temp.callOutOrgSid === '') {
this.$message({
showClose: true,
message: '请选择调出分公司',
@ -288,7 +270,7 @@ export default {
})
return
}
if (this.temp.callInOrgSid == '') {
if (this.temp.callInOrgSid === '') {
this.$message({
showClose: true,
message: '请选择调入分公司',

61
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliInfo.vue

@ -7,7 +7,7 @@
<div>分公司间调账申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
@ -15,7 +15,7 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd"><!-- -->
<div class="title">分公司间调账申请</div> <!--:rules="rules"-->
<div class="title">分公司间调账申请</div>
<el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px" class="formadd">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
@ -24,14 +24,14 @@
<span>{{ temp.accadjTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="8"><!-- :readonly="depositVehicleList[scope.$index].inboundDate" -->
<el-col :span="8">
<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>
<span>{{ temp.callInOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
@ -56,12 +56,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -70,11 +70,11 @@
<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="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>
@ -116,18 +116,17 @@ export default {
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
sid: '',
applyDate: '', //
accadjTypeKey: '', // key
accadjTypeValue: '', // value
callOutOrgSid: '', // sid
callOutOrgName: '', //
callInOrgSid: '', // sid
callInOrgName: '', //
baseInternalPurchaseVehicles: [] //
},
rules: {},
submitdisabled: false, //
disabled: false //
}
@ -151,15 +150,15 @@ export default {
// ===
handleReturn() {
this.temp = {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
sid: '',
applyDate: '', //
accadjTypeKey: '', // key
accadjTypeValue: '', // value
callOutOrgSid: '', // sid
callOutOrgName: '', //
callInOrgSid: '', // sid
callInOrgName: '', //
baseInternalPurchaseVehicles: [] //
}
this.list = []
this.$refs['dataForm'].resetFields()

271
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/relation/tiaozhangcheliangList.vue

@ -0,0 +1,271 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>待调账车辆列表</div>
<div>
<el-button type="primary" size="small" @click="handleConfirm()">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="webcon">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="调车类型">
<el-select v-model="listQuery.params.shuntingTypeKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in shuntingType_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.vinNo" placeholder="请输入名称" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<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="">
<el-table ref="multipleTable" :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" fixed type="selection" align="center"/>
<el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车架号" fixed align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</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.buyerOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="调入分公司" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sellerOrgName }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { fetchVeh } from '@/api/supplychain/tiaozhangshenqing.js'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'tiaozhangcheliangList',
components: {
Pagination,
pageye
},
data() {
return {
createPage: '',
dialogVisible: false, //
isSearchShow: false,
searchxianshitit: '显示查询条件',
btndisabled: false,
viewState: 1, // 1 2- 3 4 5-
shuntingType_list: [],
// -----------
tableKey: 0,
list: [],
sids: [],
FormLoading: false,
listLoading: false,
listQuery: {
current: 1,
size: 5,
params: {
shuntingTypeKey: '',
vinNo: '',
accadjTypeKey: '',
callOutOrgSid: '',
callInOrgSid: '',
sids: []
},
total: 0
},
requiredPar: {},
selectDate: undefined,
temp: {}, //
vinNoList: [],
vehicleList: [],
visible: true,
hetongdanganguanliInfoShow: false
// ------------------------------------
}
},
methods: {
//
init() {
//shuntingType
},
getType() {
typeValues({
type: 'shuntingType'
}).then((response) => {
if (response.code === '200' && response.data) {
this.shuntingType_list = response.data
}
})
},
showCheList(accadjTypeKey, callOutOrgSid, callInOrgSid, vinNoList) {
this.listQuery.params.accadjTypeKey = accadjTypeKey
this.listQuery.params.callOutOrgSid = callOutOrgSid
this.listQuery.params.callInOrgSid = callInOrgSid
this.listQuery.params.sids = vinNoList
this.requiredPar = {
accadjTypeKey: accadjTypeKey,
callOutOrgSid: callOutOrgSid,
callInOrgSid: callInOrgSid,
sids: vinNoList
}
this.handleFilter()
this.getType()
},
//
handleSelectionChange(row) {
console.log('row', row)
this.vehicleList = row
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
console.log('选择sid', this.sids)
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
params: {
shuntingTypeKey: '',
vinNo: '',
accadjTypeKey: this.requiredPar.accadjTypeKey,
callOutOrgSid: this.requiredPar.callOutOrgSid,
callInOrgSid: this.requiredPar.callInOrgSid,
sids: this.requiredPar.sids
},
total: 0
}
this.getList()
},
//
handleConfirm() {
if (this.vehicleList.length > 0) {
// if (this.vinNoList.length > 0) {
// console.log('', this.vinNoList)
// for (var i = 0; i < this.vinNoList.length; i++) {
// for (var j = 0; j < this.vehicleList.length; j++) {
// if (this.vinNoList[i] == this.vehicleList[j].vinNo) {
// const index = this.vehicleList.findIndex(val => {
// return this.vehicleList[j].vinNo === this.vinNoList[i]
// })
// this.vehicleList.splice(index, 1)
// console.log('if', index)
// }
// }
// }
// }
this.$emit('handleVehicle', this.vehicleList)
this.$nextTick(() => {
this.$refs.multipleTable.clearSelection()
})
this.handleReturn()
} else {
this.$message({
showClose: true,
message: '请选择车辆!',
type: 'error'
})
return
}
},
//
handleReturn() {
this.listQuery = {
current: 1,
size: 5,
params: {
shuntingType: '',
vinNo: '',
accadjTypeKey: '',
callOutOrgSid: '',
callInOrgSid: '',
sids: []
}
}
this.$emit('doback') //
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
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
) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
}
}
}
</script>
<style scoped>
</style>

67
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue

@ -17,23 +17,23 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class=""><!-- -->
<div class="title">分公司间调账申请</div> <!--:rules="rules"-->
<div class="title">分公司间调账申请</div>
<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>
<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>
<span>{{ temp.callOutOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgName" label="调入分公司">
<span>{{temp.callInOrgName}}</span>
<span>{{ temp.callInOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
@ -58,12 +58,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -72,11 +72,11 @@
<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="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>
@ -112,8 +112,9 @@
<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-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -142,22 +143,21 @@ export default {
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
sid: '',
applyDate: '', //
accadjTypeKey: '', // key
accadjTypeValue: '', // value
callOutOrgSid: '', // sid
callOutOrgName: '', //
callInOrgSid: '', // sid
callInOrgName: '', //
baseInternalPurchaseVehicles: [] //
},
rules: {},
submitdisabled: false, //
disabled: false ,//
disabled: false, //
// ------------------------------------
currentLink:true, //
currentLink: true, //
dialogList: {
comment: ''
},
@ -178,7 +178,7 @@ export default {
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid:''
userSid: ''
},
//
regectList: {
@ -213,13 +213,13 @@ export default {
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)
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.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
@ -324,7 +324,7 @@ export default {
/** 同意任务 */
handleAgree() {
this.agreeList.comment = this.dialogList.comment
if (this.agreeList.comment == '') {
if (this.agreeList.comment === '') {
this.$message({
showClose: true,
message: '请填写同意意见!',
@ -354,7 +354,7 @@ export default {
/** 驳回任务 */
handleReject() {
this.regectList.comment = this.dialogList.comment
if (this.regectList.comment == '') {
if (this.regectList.comment === '') {
this.$message({
showClose: true,
message: '请填写驳回意见!',
@ -384,7 +384,7 @@ export default {
/** 终止任务 */
handleStop() {
this.stopList.comment = this.dialogList.comment
if (this.stopList.comment == '') {
if (this.stopList.comment === '') {
this.$message({
showClose: true,
message: '请填写终止意见!',
@ -410,8 +410,7 @@ export default {
}, '*')
}
})
},
}
}
}
</script>

63
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue

@ -23,17 +23,17 @@
<el-row>
<el-col :span="8">
<el-form-item prop="accadjTypeValue" label="调账类型">
<span>{{temp.accadjTypeValue}}</span>
<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>
<span>{{ temp.callOutOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgName" label="调入分公司">
<span>{{temp.callInOrgName}}</span>
<span>{{ temp.callInOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
@ -58,12 +58,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -72,11 +72,11 @@
<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="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>
@ -112,8 +112,7 @@
<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-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;">
@ -142,22 +141,21 @@ export default {
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
sid: '',
applyDate: '', //
accadjTypeKey: '', // key
accadjTypeValue: '', // value
callOutOrgSid: '', // sid
callOutOrgName: '', //
callInOrgSid: '', // sid
callInOrgName: '', //
baseInternalPurchaseVehicles: [] //
},
rules: {},
submitdisabled: false, //
disabled: false ,//
disabled: false, //
// ------------------------------------
currentLink:true, //
currentLink: true, //
dialogList: {
comment: ''
},
@ -178,7 +176,7 @@ export default {
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid:''
userSid: ''
},
//
regectList: {
@ -213,13 +211,13 @@ export default {
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)
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.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
@ -324,7 +322,7 @@ export default {
/** 同意任务 */
handleAgree() {
this.agreeList.comment = this.dialogList.comment
if (this.agreeList.comment == '') {
if (this.agreeList.comment === '') {
this.$message({
showClose: true,
message: '请填写同意意见!',
@ -354,7 +352,7 @@ export default {
/** 驳回任务 */
handleReject() {
this.regectList.comment = this.dialogList.comment
if (this.regectList.comment == '') {
if (this.regectList.comment === '') {
this.$message({
showClose: true,
message: '请填写驳回意见!',
@ -384,7 +382,7 @@ export default {
/** 终止任务 */
handleStop() {
this.stopList.comment = this.dialogList.comment
if (this.stopList.comment == '') {
if (this.stopList.comment === '') {
this.$message({
showClose: true,
message: '请填写终止意见!',
@ -410,8 +408,7 @@ export default {
}, '*')
}
})
},
}
}
}
</script>

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

@ -29,31 +29,22 @@
<el-row>
<el-col :span="8">
<el-form-item prop="reason" label="调账类型">
<el-select v-model="temp.accadjTypeKey" placeholder="请选择" clearable class="addinputw"
@change="accadjTypeKeyChange"
:disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
<el-select v-model="temp.accadjTypeKey" placeholder="请选择" clearable class="addinputw" @change="accadjTypeKeyChange" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" -->
<el-form-item prop="money" label="调出分公司">
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw"
:disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'"
@change="callOutOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="money" label="调入分公司">
<el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw"
:disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'"
@change="callInOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/>
<el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
@ -72,8 +63,7 @@
<el-table-column align="center" fixed label="序号" type="index" width="50"/>
<el-table-column label="操作" fixed align="center" width="80" 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 size="mini" type="danger" @click="dataDelete(scope.row,scope.$index,list[scope.$index])">删除
</el-button>
</template>
</el-table-column>
@ -88,12 +78,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -102,13 +92,13 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="140">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"&ndash;&gt;-->
<!-- &lt;!&ndash; :readonly="vehicleList[scope.$index].inboundDate"/>&ndash;&gt;-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="140">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <el-input v-model="scope.row.invoiceTypeValue" placeholder="请输入" class="addinputw"&ndash;&gt;-->
<!-- &lt;!&ndash; :readonly="vehicleList[scope.$index].inboundDate"/>&ndash;&gt;-->
<!-- <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>
@ -131,20 +121,19 @@
</div>
<!--End 添加修改部分-->
</div>
<tiaozhangcheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle"
@doback="resetState"/>
<tiaozhangcheliang-list ref="xuanChe" v-show="isXuanche === true" @handleVehicle="selectVehicle" @doback="resetState"/>
</div>
</template>
<script>
import tiaozhangcheliangList from '@/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList'
import tiaozhangcheliangList from './relation/tiaozhangcheliangList'
import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'tiaozhangshenqingEdit',
components:{
components: {
tiaozhangcheliangList
},
data() {
@ -174,9 +163,7 @@ export default {
nodeState: '', //
accSids: [] // sid
},
rules: {
},
rules: {},
submitdisabled: false, //
disabled: false //
}
@ -196,17 +183,17 @@ export default {
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showEdit(obj.businessSid,obj.instanceId,obj.taskId)
this.showEdit(obj.businessSid, obj.instanceId, obj.taskId)
},
methods: {
//
oninput(val, limit = 0) {
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') //0
val = val.replace(/^\./g, '0.') //0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' //0
val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
@ -221,7 +208,7 @@ export default {
// sid
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') {
this.useOrg = res.data
this.temp.createOrgSid = res.data
@ -246,13 +233,13 @@ export default {
},
accadjTypeKeyChange(val) {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictKey == 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)
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
this.temp.callInOrgName = name[0].name
console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
this.temp.callOutOrgName = ''
@ -261,7 +248,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)
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
this.temp.callOutOrgName = name[0].name
console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
this.temp.callInOrgName = ''
@ -270,17 +257,17 @@ export default {
}
},
callOutOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid == val)
const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
this.temp.callOutOrgName = choosetItem[0].name
console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
},
callInOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid == val)
const choosetItem = this.useOrg_list.filter((item) => item.sid === val)
this.temp.callInOrgName = choosetItem[0].name
console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid)
},
handletiaozhangcheliang() {
if (this.temp.accadjTypeKey == '') {
if (this.temp.accadjTypeKey === '') {
this.$message({
showClose: true,
message: '请选择调账类型',
@ -288,7 +275,7 @@ export default {
})
return
}
if (this.temp.callOutOrgSid == '') {
if (this.temp.callOutOrgSid === '') {
this.$message({
showClose: true,
message: '请选择调出分公司',
@ -296,7 +283,7 @@ export default {
})
return
}
if (this.temp.callInOrgSid == '') {
if (this.temp.callInOrgSid === '') {
this.$message({
showClose: true,
message: '请选择调入分公司',
@ -362,7 +349,7 @@ export default {
this.getListOrgAll()
},
showEdit(businessSid,instanceId,taskId) {
showEdit(businessSid, instanceId, taskId) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
@ -387,7 +374,6 @@ export default {
this.getListOrgAll()
},
handleCreate() {
const _this = this
this.$refs['dataForm'].validate(valid => {
if (valid) {
if (this.list.length > 0) {

49
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingInfo.vue

@ -21,17 +21,17 @@
<el-row>
<el-col :span="8">
<el-form-item prop="accadjTypeValue" label="调账类型">
<span>{{temp.accadjTypeValue}}</span>
<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>
<span>{{ temp.callOutOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgName" label="调入分公司">
<span>{{temp.callInOrgName}}</span>
<span>{{ temp.callInOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
@ -56,12 +56,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -70,11 +70,11 @@
<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="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>
@ -117,18 +117,17 @@ export default {
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
sid: '',
applyDate: '', //
accadjTypeKey: '', // key
accadjTypeValue: '', // value
callOutOrgSid: '', // sid
callOutOrgName: '', //
callInOrgSid: '', // sid
callInOrgName: '', //
baseInternalPurchaseVehicles: [] //
},
rules: {},
submitdisabled: false, //
disabled: false, //
//
@ -137,7 +136,7 @@ export default {
instanceId: '',
taskId: '',
userSid: ''
},
}
}
},
mounted() {
@ -156,7 +155,7 @@ export default {
// urlunescape()web,使
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('obj',obj)
console.log('obj', obj)
this.showInfo(obj.businessSid)
//
this.revokeList.businessSid = obj.businessSid
@ -209,7 +208,7 @@ export default {
showClose: true,
message: '执行成功',
type: 'success'
});
})
//
window.parent.postMessage({
cmd: 'returnHeight',
@ -220,7 +219,7 @@ export default {
}, '*')
}
})
},
}
}
}
</script>

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

@ -23,17 +23,17 @@
<el-row>
<el-col :span="8">
<el-form-item prop="accadjTypeValue" label="调账类型">
<span>{{temp.accadjTypeValue}}</span>
<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>
<span>{{ temp.callOutOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgName" label="调入分公司">
<span>{{temp.callInOrgName}}</span>
<span>{{ temp.callInOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
@ -58,12 +58,12 @@
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
@ -72,11 +72,11 @@
<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="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>
@ -126,7 +126,7 @@
</template>
<script>
import { fetchDetailsBySid } from '@/api/supplychain/tiaozhangshenqing.js'
import {fetchDetailsBySid} from '@/api/supplychain/tiaozhangshenqing.js'
import req from '@/api/flow/tiaozhangshenqing'
export default {
@ -142,22 +142,21 @@ export default {
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
sid: '',
applyDate: '', //
accadjTypeKey: '', // key
accadjTypeValue: '', // value
callOutOrgSid: '', // sid
callOutOrgName: '', //
callInOrgSid: '', // sid
callInOrgName: '', //
baseInternalPurchaseVehicles: [] //
},
rules: {},
submitdisabled: false, //
disabled: false ,//
disabled: false, //
// ------------------------------------
currentLink:true, //
currentLink: true, //
dialogList: {
comment: ''
},
@ -178,7 +177,7 @@ export default {
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid:''
userSid: ''
},
//
regectList: {
@ -213,13 +212,13 @@ export default {
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)
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.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
@ -324,7 +323,7 @@ export default {
/** 同意任务 */
handleAgree() {
this.agreeList.comment = this.dialogList.comment
if (this.agreeList.comment == '') {
if (this.agreeList.comment === '') {
this.$message({
showClose: true,
message: '请填写同意意见!',
@ -354,7 +353,7 @@ export default {
/** 驳回任务 */
handleReject() {
this.regectList.comment = this.dialogList.comment
if (this.regectList.comment == '') {
if (this.regectList.comment === '') {
this.$message({
showClose: true,
message: '请填写驳回意见!',
@ -384,7 +383,7 @@ export default {
/** 终止任务 */
handleStop() {
this.stopList.comment = this.dialogList.comment
if (this.stopList.comment == '') {
if (this.stopList.comment === '') {
this.$message({
showClose: true,
message: '请填写终止意见!',
@ -410,8 +409,7 @@ export default {
}, '*')
}
})
},
}
}
}
</script>

Loading…
Cancel
Save