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

完善调拨(集团内)

zhanglei
yunuo970428 3 days ago
parent
b94e193a7e
commit
99b55e3230
7 changed files with 1155 additions and 1570 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      yxt-as-ui/src/api/storage/allocationByGroup.js
  2. 366
      yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue
  3. 2
      yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue
  4. 237
      yxt-as-ui/src/views/storage/allocationByGroup/index.vue
  5. 17
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue
  6. 225
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue
  7. 2
      yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue

72
yxt-as-ui/src/api/storage/allocationByGroup.js
View File

@ -1,11 +1,9 @@
import request from '@/utils/request' import request from '@/utils/request'
export default { export default {
// 查询分页列表 // 查询分页列表
listPage: function(params) { listPage: function(params) {
return request({ return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
method: 'post', method: 'post',
data: params, data: params,
@ -14,10 +12,8 @@ export default {
} }
}) })
}, },
deleteBySids: function(data) { deleteBySids: function(data) {
return request({ return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
method: 'DELETE', method: 'DELETE',
data: data, data: data,
@ -26,99 +22,50 @@ export default {
} }
}) })
}, },
// 保存物流信息 // 保存物流信息
saveLogisticsInfo: function(data) { saveLogisticsInfo: function(data) {
return request({ return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/v1/wmsinventoryallocatebilllogistics/saveLogisticsInfo', url: '/wms/v1/wmsinventoryallocatebilllogistics/saveLogisticsInfo',
method: 'post', method: 'post',
data: data, data: data,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
}); })
}, },
// 新增、保存 // 新增、保存
save: function(data) { save: function(data) {
return request({ return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
method: 'post', method: 'post',
data: data, data: data,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
}); })
}, },
// 初始化 // 初始化
init: function(data) { init: function(data) {
return request({ return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data, url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data,
method: 'get' method: 'get'
}); })
}, },
// 调拨 // 调拨
allocation: function(data) { allocation: function(data) {
return request({ return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default", url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply2',
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply',
method: 'post', method: 'post',
data: data, data: data,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
} }
});
},
// 查询所有商品
getGoods: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
},
// 查询所有仓库
getWarehouses: function(params) {
return request({
url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
}) })
}, },
// 根据仓库查询库位
getWarehouseareas: function(data) {
return request({
url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
method: 'get',
params: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 流程审批（同意） // 流程审批（同意）
complete: function(params) { complete: function(params) {
return request({ return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/complete', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/complete2',
method: 'post', method: 'post',
data: params, data: params,
headers: { headers: {
@ -151,7 +98,7 @@ export default {
// 流程审批（驳回） // 流程审批（驳回）
reject: function(params) { reject: function(params) {
return request({ return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject2',
method: 'post', method: 'post',
data: params, data: params,
headers: { headers: {
@ -184,7 +131,7 @@ export default {
// 审批流程（同意）获取下一环节 // 审批流程（同意）获取下一环节
getNextNodesForSubmit: function(data) { getNextNodesForSubmit: function(data) {
return request({ return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit2',
method: 'get', method: 'get',
params: data params: data
}) })
@ -192,10 +139,9 @@ export default {
// 审批流程（驳回）获取上一环节 // 审批流程（驳回）获取上一环节
getPreviousNodesForReject: function(data) { getPreviousNodesForReject: function(data) {
return request({ return request({
url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject', url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject2',
method: 'get', method: 'get',
params: data params: data
}) })
}, }
} }

366
yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue
View File

@ -10,29 +10,8 @@
</div> </div>
</div> </div>
<div class="listconadd"> <div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div style="display: flex;flex-direction: row;align-items: center;padding: 10px;">
<div>
<span>调出门店：</span>
<el-select v-model="commodityQuery.params.inOrg" placeholder="请选择" @change="selectOutOrg">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</div>
<div style="margin-left: 30px;">
<span>调入门店：</span>
<el-select v-model="commodityQuery.params.outOrg" placeholder="请选择" @change="selectInOrg">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</div>
</div> -->
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -43,21 +22,18 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<span class="addinputInfo">{{ formobj.createTime }}</span> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="span-sty2"><span class="must">*</span> 调入分公司</div> <div class="span-sty2"><span class="must">*</span> 调入分公司</div>
<el-form-item prop="inOrgName"> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" <el-form-item prop="inOrgName">
@change="selectInOrg" class="addinputInfo2 addinputw2"> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" @change="selectInOrg" class="addinputInfo2 addinputw2">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
@ -66,8 +42,7 @@
<el-col :span="5"> <el-col :span="5">
<div class="span-sty2"><span class="must">*</span> 调入站点</div> <div class="span-sty2"><span class="must">*</span> 调入站点</div>
<el-form-item prop="inPlatName"> <el-form-item prop="inPlatName">
<el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName" <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName" class="addinputInfo addinputw">
class="addinputInfo addinputw">
<el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
@ -75,60 +50,28 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 经办人</div> <div class="span-sty"><span class="must">*</span> 经办人</div>
<el-form-item prop="confirmName"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable <el-form-item prop="confirmName">
@change="selectOperatorName" class="addinputInfo addinputw"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable @change="selectOperatorName" class="addinputInfo addinputw">
<el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
type="textarea" :rows="4" clearable /></el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne"> <div class="title titleOne">
<div>调拨商品列表</div> <div>调拨商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button> <el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button>
</div> </div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<!-- <el-table-column align="center" width="70" :render-header="commodityHeader">
<template slot-scope="scope">
<i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" min-width="200">
<template slot-scope="scope">
<el-popover placement="right" width="900" trigger="click">
<div>
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
@current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="warehouseName" label="仓库" align="center" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" />
<el-table-column prop="count" label="库存数量" align="center" />
</el-table>
<pagination v-show="commodityData.length > 0" :total="commodityQuery.total"
:limit.sync="commodityQuery.size" class="pagination"
@pagination="commodityInput(scope.row.goodsSpuName)" />
</div>
<el-input slot="reference" v-model="scope.row.goodsSpuName"
@input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称" />
</el-popover>
</template>
</el-table-column> -->
<el-table-column fixed label="操作" wid align="center" width="100"> <el-table-column fixed label="操作" wid align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="deleteGoods(scope.$index)">删除</el-button> <el-button type="primary" size="mini" @click="deleteGoods(scope.$index)">删除</el-button>
@ -144,37 +87,15 @@
<el-table-column prop="warehouseArea" label="库区" width="150" align="center"/> <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
<el-table-column prop="warehouseRackCode" label="库位" align="center"/> <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
<el-table-column prop="stockCount" label="库存数量" width="100" align="center"/> <el-table-column prop="stockCount" label="库存数量" width="100" align="center"/>
<!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> -->
<el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center"> <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.markUpRatio" clearable placeholder="" <el-input v-model="scope.row.markUpRatio" clearable placeholder="" oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')" @input="commodityComputeYHAndXSJE(scope.row)"/>
oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')"
@input="commodityComputeYHAndXSJE(scope.row)" />
</template>
</el-table-column>
<!-- <el-table-column label="调入仓库" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.inWarehouseName" placeholder="请选择"
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="调入库位" align="center" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择"
@change="selectWarehouseAreaCode(scope.row,$event)">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column> -->
<el-table-column prop="requAmount" label="调拨单价" align="center" width="100"/> <el-table-column prop="requAmount" label="调拨单价" align="center" width="100"/>
<el-table-column prop="count" label="调拨数量" width="120" align="center"> <el-table-column prop="count" label="调拨数量" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable <el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" label="调拨金额" align="center" width="100"/> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
@ -188,11 +109,9 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocationByGroup'
import chooseproducts from './relation/chooseproducts' import chooseproducts from './relation/chooseproducts'
import { import { getCurrentDate } from '@/utils/index.js'
getCurrentDate
} from '@/utils/index.js'
import { import {
selectOrgSidList, selectOrgSidList,
getOrgSidByPath, getOrgSidByPath,
@ -200,9 +119,10 @@
fetchBySid, fetchBySid,
tranThree tranThree
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
export default { export default {
components: { components: {
chooseproducts, chooseproducts
}, },
data() { data() {
return { return {
@ -212,70 +132,49 @@
activeNames: '1', activeNames: '1',
index: 0, index: 0,
formobj: { formobj: {
"sid": "", sid: '',
"billNo": "", billNo: '',
"useOrgSid": "", useOrgSid: '',
"createBySid": window.sessionStorage.getItem('userSid'), createBySid: window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'), createByName: window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage createTime: getCurrentDate(),
.getItem('defaultOrgPath').lastIndexOf('/') + 1), outOrgName: '',
"createTime": getCurrentDate(), outOrgSid: '',
"outOrgName": '', outPlatName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outOrgSid": '', outPlatSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window inOrgName: '',
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), inOrgSid: '',
"outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage inPlatName: '',
.getItem('defaultOrgPath').lastIndexOf('/') + 1), inPlatSid: '',
"inOrgName": '', inOrgAttributeKey: '',
"inOrgSid": '', inOrgAttributeValue: '',
"inPlatName": "", confirmName: '',
"inPlatSid": "", confirmSid: '',
"inOrgAttributeKey": "", remarks: '',
"inOrgAttributeValue": "", grade: '3',
"confirmName": "", createOrgSid: '',
"confirmSid": "", procDefId: '',
"remarks": "", nodeId: '',
"grade": "3", procInstId: '',
"createOrgSid": "", nodeState: '待提交',
"procDefId": "", taskId: '',
"nodeId": "", wmsInventoryAllocateBillDetailNewList: []
"procInstId": "",
"nodeState": "待提交",
"taskId": "",
"wmsInventoryAllocateBillDetailNewList": []
}, },
rules: { rules: {
inOrgName: [{ inOrgName: [{ required: true, message: '调入分公司不能为空', trigger: 'change' }],
required: true, inPlatName: [{ required: true, message: '调入站点不能为空', trigger: 'change' }],
message: '调入分公司不能为空', confirmName: [{ required: true, message: '经办人不能为空', trigger: 'change' }]
trigger: 'change'
}],
inPlatName: [{
required: true,
message: '调入站点不能为空',
trigger: 'change'
}],
confirmName: [{
required: true,
message: '经办人不能为空',
trigger: 'change'
}],
}, },
orgList: [], orgList: [],
deptList: [], deptList: [],
operatorNameList: [], operatorNameList: []
warehouseList: [],
warehouseRackList: []
} }
}, },
methods: { methods: {
init() { init() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((resp) => {
if (resp.success) { if (resp.success) {
this.formobj.createOrgSid = resp.data this.formobj.createOrgSid = resp.data
this.formobj.outOrgSid = resp.data this.formobj.outOrgSid = resp.data
@ -286,23 +185,16 @@
}) })
} }
}) })
selectOrgSidList().then((res) => { selectOrgSidList().then((res) => {
if (res.success) { if (res.success) {
console.log("selectOrgSidList", res);
this.orgList = res.data this.orgList = res.data
} }
}) })
selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
selAllByOrgSidPath({
orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) { if (res.success) {
console.log("selAllByOrgSidPath", res);
this.operatorNameList = res.data this.operatorNameList = res.data
} }
}) })
}, },
// 合计 // 合计
getSummaries(param) { getSummaries(param) {
@ -343,98 +235,43 @@
}, },
selectInOrg(val) { selectInOrg(val) {
console.log("selectInOrg", val); const choose = this.orgList.filter((item) => item.sid === val)
const choose = this.orgList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
this.formobj.inOrgSid = choose[0].sid this.formobj.inOrgSid = choose[0].sid
this.formobj.inOrgName = choose[0].name this.formobj.inOrgName = choose[0].name
tranThree({ tranThree({
sid: choose[0].sid, sid: choose[0].sid,
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
this.formobj.inDeptSid = '' this.formobj.inDeptSid = ''
this.formobj.inDeptName = '' this.formobj.inDeptName = ''
this.formobj.inOrgAttributeKey = '' this.formobj.inOrgAttributeKey = ''
this.formobj.inOrgAttributeValue = '' this.formobj.inOrgAttributeValue = ''
console.log("getListDeptByOrgSid", res);
this.deptList = res.data this.deptList = res.data
} }
}) })
}, },
selectInDeptName(val) { selectInDeptName(val) {
console.log("selectInDeptName", val); const choose = this.deptList.filter((item) => item.sid === val)
const choose = this.deptList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInDeptName', choose)
this.formobj.inPlatSid = choose[0].sid this.formobj.inPlatSid = choose[0].sid
this.formobj.inPlatName = choose[0].name this.formobj.inPlatName = choose[0].name
this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
}, },
selectOperatorName(val) { selectOperatorName(val) {
console.log("selectOperatorName", val); const choose = this.operatorNameList.filter((item) => item.sid === val)
const choose = this.operatorNameList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectOutOrg', choose)
this.formobj.confirmSid = choose[0].sid this.formobj.confirmSid = choose[0].sid
this.formobj.confirmName = choose[0].name this.formobj.confirmName = choose[0].name
}, },
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
}
req.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
console.log("aaaaaa", this.warehouseRackList);
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
row.inWarehouseSid = choose[0].sid
row.inWarehouseName = choose[0].warehouseName
row.inWarehouseRackSid = ''
row.inWarehouseRackCode = ''
this.getWarehouseAreaList(val)
},
selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", row);
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
row.inWarehouseRackSid = choose[0].sid
row.inWarehouseRackCode = choose[0].areaCode
},
showAdd() { showAdd() {
this.init()
this.init(),
this.viewTitle = '【新增】商品调拨申请' this.viewTitle = '【新增】商品调拨申请'
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
}, },
showEdit(sid) { showEdit(sid) {
this.init() this.init()
this.viewTitle = '【修改】商品调拨申请' this.viewTitle = '【修改】商品调拨申请'
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
@ -445,7 +282,6 @@
} }
}) })
}, },
backData(value) { backData(value) {
this.viewState = 1 this.viewState = 1
if (value.length > 0) { if (value.length > 0) {
@ -496,26 +332,20 @@
const aa = [] const aa = []
this.$refs['divSp'].showData(aa, this.formobj.deptSid) this.$refs['divSp'].showData(aa, this.formobj.deptSid)
}, },
// 计算调拨单、调拨金额 // 计算调拨单、调拨金额
commodityComputeYHAndXSJE(row) { commodityComputeYHAndXSJE(row) {
console.log("commodityComputeYHAndXSJE", row);
row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2) row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2)
row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2) row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
}, },
// 计算调拨金额 // 计算调拨金额
commodityComputeYHAndXSJE2(row) { commodityComputeYHAndXSJE2(row) {
if (Number(row.stockCount) < Number(row.count)) { if (Number(row.stockCount) < Number(row.count)) {
row.count = Number(row.stockCount) row.count = Number(row.stockCount)
} else { } else {
row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2) row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
} }
}, },
saveOrUpdate() { saveOrUpdate() {
console.log("saveOrUpdate", this.formobj);
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
@ -537,33 +367,27 @@
}) })
}, },
confirm() { confirm() {
console.log("saveOrUpdate", this.formobj);
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length === 0) {
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
this.$message({ this.$message({
type: "warning", type: 'warning',
showClose: true, showClose: true,
message: '调拨商品不能为空' message: '调拨商品不能为空'
}) })
return return
} }
for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) { for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i] var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
if (Number(item.count) === 0) {
if (Number(item.count) == 0) {
this.$message({ this.$message({
type: "warning", type: 'warning',
showClose: true, showClose: true,
message: '调拨数量不能为空或0' message: '调拨数量不能为空或0'
}) })
return return
} }
} }
this.submitdisabled = true this.submitdisabled = true
req.allocation(this.formobj).then((res) => { req.allocation(this.formobj).then((res) => {
if (res.success) { if (res.success) {
@ -585,39 +409,35 @@
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj = { this.formobj = {
"sid": "", sid: '',
"billNo": "", billNo: '',
"useOrgSid": "", useOrgSid: '',
"createBySid": window.sessionStorage.getItem('userSid'), createBySid: window.sessionStorage.getItem('userSid'),
"createByName": window.sessionStorage.getItem('name'), createByName: window.sessionStorage.getItem('name'),
"deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage createTime: getCurrentDate(),
.getItem('defaultOrgPath').lastIndexOf('/') + 1), outOrgName: '',
"createTime": getCurrentDate(), outOrgSid: '',
"outOrgName": '', outPlatName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
"outOrgSid": '', outPlatSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
"outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window inOrgName: '',
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), inOrgSid: '',
"outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage inPlatName: '',
.getItem('defaultOrgPath').lastIndexOf('/') + 1), inPlatSid: '',
"inOrgName": '', inOrgAttributeKey: '',
"inOrgSid": '', inOrgAttributeValue: '',
"inPlatName": "", confirmName: '',
"inPlatSid": "", confirmSid: '',
"inOrgAttributeKey": "", remarks: '',
"inOrgAttributeValue": "", grade: '3',
"confirmName": "", createOrgSid: '',
"confirmSid": "", procDefId: '',
"remarks": "", nodeId: '',
"grade": "3", procInstId: '',
"createOrgSid": "", nodeState: '待提交',
"procDefId": "", taskId: '',
"nodeId": "", wmsInventoryAllocateBillDetailNewList: []
"procInstId": "",
"nodeState": "待提交",
"taskId": "",
"wmsInventoryAllocateBillDetailNewList": []
} }
this.submitdisabled = false this.submitdisabled = false
this.$emit('doback') this.$emit('doback')
@ -664,8 +484,6 @@
width: calc(100% - 105px); width: calc(100% - 105px);
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
@ -686,10 +504,4 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

2
yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue
View File

@ -69,7 +69,7 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocationByGroup'
export default { export default {
data() { data() {

237
yxt-as-ui/src/views/storage/allocationByGroup/index.vue
View File

@ -9,7 +9,6 @@
</el-button> </el-button>
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="申请部门"> <el-form-item label="申请部门">
<el-input v-model="queryParams.params.deptName" placeholder="" clearable/> <el-input v-model="queryParams.params.deptName" placeholder="" clearable/>
</el-form-item> </el-form-item>
@ -20,22 +19,14 @@
<el-input v-model="queryParams.params.billNo" placeholder="" clearable/> <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="单据日期"> <el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px">至</span>
</el-date-picker> <el-date-picker v-model="queryParams.params.createDateStart" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
至
<el-date-picker v-model="queryParams.params.createDateStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="办结日期"> <el-form-item label="办结日期">
<el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> <span style="padding: 0 8px">至</span>
</el-date-picker> <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
至
<el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="调出分公司"> <el-form-item label="调出分公司">
<el-input v-model="queryParams.params.outOrgName" placeholder="" clearable/> <el-input v-model="queryParams.params.outOrgName" placeholder="" clearable/>
@ -66,14 +57,13 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/> <el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="150"> <el-table-column fixed label="操作" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'" <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'" @click="toRelevancy(scope.row)">办理
@click="toRelevancy(scope.row)">办理</el-button> </el-button>
<el-button type="primary" size="mini" @click="toDetails(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="toDetails(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -81,12 +71,6 @@
<el-table-column prop="billNo" label="单据编号" align="center"/> <el-table-column prop="billNo" label="单据编号" align="center"/>
<el-table-column prop="createByName" label="申请人" align="center"/> <el-table-column prop="createByName" label="申请人" align="center"/>
<el-table-column prop="createTime" label="申请日期" align="center"/> <el-table-column prop="createTime" label="申请日期" align="center"/>
<!-- <el-table-column prop="state" label="完成标志" align="center" /> -->
<!-- <el-table-column label="完成标志" align="center" width="180">
<template slot-scope="scope">
<span>{{scope.row.state=='1'?'未完成':'已完成'}}</span>
</template>
</el-table-column> -->
<el-table-column prop="finishTime" label="办结日期" align="center"/> <el-table-column prop="finishTime" label="办结日期" align="center"/>
<el-table-column prop="createOrgName" label="调出分公司" align="center"/> <el-table-column prop="createOrgName" label="调出分公司" align="center"/>
<el-table-column prop="outPlatName" label="调出站" align="center"/> <el-table-column prop="outPlatName" label="调出站" align="center"/>
@ -101,8 +85,7 @@
<div class="pages"> <div class="pages">
<div class="tit"/> <div class="tit"/>
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> </div>
</div> </div>
</div> </div>
@ -111,88 +94,87 @@
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/> <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/> <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
<el-dialog title="补充物流信息" :visible.sync="dialogVisible" :before-close="handleClose" <el-dialog title="补充物流信息" :visible.sync="dialogVisible" :before-close="handleClose" style="width:120%;margin-left: -10%;">
style="width:120%;margin-left: -10%;">
<el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj"> <el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj">
<el-row class="first_row"> <el-row class="first_row">
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">送货方式</div> <div class="span-sty">送货方式</div>
<el-form-item> <el-select v-model="formobj.deliveryKey" placeholder="请选择送货方式" @change="selectDeliveryKey" <el-form-item>
class="addinputInfo"> <el-select v-model="formobj.deliveryKey" placeholder="请选择送货方式" @change="selectDeliveryKey" class="addinputInfo">
<el-option v-for="(item,i) in deliveryKeyList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in deliveryKeyList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.deliveryKey==1"> <el-row v-show="formobj.deliveryKey==1">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">快递单号</div> <div class="span-sty">快递单号</div>
<el-form-item><el-input v-model="formobj.expressBillNo" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.expressBillNo" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">快递公司</div> <div class="span-sty">快递公司</div>
<el-form-item><el-input v-model="formobj.expressCompany" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.expressCompany" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.deliveryKey==2"> <el-row v-show="formobj.deliveryKey==2">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">取货人</div> <div class="span-sty">取货人</div>
<el-form-item><el-input v-model="formobj.pickUpName" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.pickUpName" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">取货日期</div> <div class="span-sty">取货日期</div>
<el-form-item> <el-date-picker v-model="formobj.pickUpDate" type="date" class="addinputw addinputInfo" <el-form-item>
value-format="yyyy-MM-dd" placeholder="选择日期"> <el-date-picker v-model="formobj.pickUpDate" type="date" class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="formobj.deliveryKey==3"> <el-row v-show="formobj.deliveryKey==3">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">送货人</div> <div class="span-sty">送货人</div>
<el-form-item><el-input v-model="formobj.deliveryPerson" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.deliveryPerson" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">送达日期</div> <div class="span-sty">送达日期</div>
<el-form-item> <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputw addinputInfo" <el-form-item>
value-format="yyyy-MM-dd" placeholder="选择日期"> <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
clearable /></el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;"> <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveData">确 定</el-button> <el-button type="primary" style="margin-top: 20px;" @click="saveData">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -200,14 +182,13 @@
import req from '@/api/storage/allocationByGroup.js' import req from '@/api/storage/allocationByGroup.js'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination' import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './allocationByGroupAdd.vue' import divAdd from './allocationByGroupAdd.vue'
import divInfo from './allocationByGroupInfo.vue' import divInfo from './allocationByGroupInfo.vue'
export default { export default {
components: { components: {
ButtonBar, ButtonBar,
Pagination, Pagination,
pageye,
divAdd, divAdd,
divInfo divInfo
}, },
@ -220,7 +201,8 @@
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
tableLoading: false, tableLoading: false,
dataList: [], dataList: [],
btnList: [{ btnList: [
{
type: 'primary', type: 'primary',
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
@ -255,24 +237,28 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"outOrgName": "", outOrgName: '',
"deptName": "", deptName: '',
"createByName": "", createByName: '',
"billNo": "", billNo: '',
"createStartTime": "", createStartTime: '',
"createEndTime": "", createEndTime: '',
"finishStartTime": "", finishStartTime: '',
"finishEndTime": "", finishEndTime: '',
"outPlatName": "", outPlatName: '',
"inOrgName": "", inOrgName: '',
"inPlatName": "", inPlatName: '',
"confirmName": "", confirmName: '',
"grade": "3", grade: '3',
userSid: '',
orgPath: '',
menuUrl: ''
} }
}, },
sids: [], sids: [],
selectionList: [], selectionList: [],
deliveryKeyList: [{ deliveryKeyList: [
{
name: '快递', name: '快递',
sid: 1 sid: 1
}, },
@ -286,16 +272,16 @@
} }
], ],
formobj: { formobj: {
"sids": [], sids: [],
"remarks": "", remarks: '',
"deliveryKey": "", deliveryKey: '',
"deliveryName": "", deliveryName: '',
"expressBillNo": "", expressBillNo: '',
"expressCompany": "", expressCompany: '',
"pickUpName": "", pickUpName: '',
"pickUpDate": "", pickUpDate: '',
"deliveryPerson": "", deliveryPerson: '',
"deliveryDate": "" deliveryDate: ''
} }
} }
}, },
@ -353,20 +339,12 @@
this.tableLoading = false this.tableLoading = false
}) })
}, },
// 序号 // 序号
indexMethod(index) { indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart var pageindex = index + 1 + pagestart
return pageindex return pageindex
}, },
selectTime1() {
},
selectTime2() {
},
dosearch() { dosearch() {
this.queryParams.current = 1 this.queryParams.current = 1
this.loadList() this.loadList()
@ -377,19 +355,22 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
"outOrgName": "", outOrgName: '',
"deptName": "", deptName: '',
"createByName": "", createByName: '',
"billNo": "", billNo: '',
"createStartTime": "", createStartTime: '',
"createEndTime": "", createEndTime: '',
"finishStartTime": "", finishStartTime: '',
"finishEndTime": "", finishEndTime: '',
"outPlatName": "", outPlatName: '',
"inOrgName": "", inOrgName: '',
"inPlatName": "", inPlatName: '',
"confirmName": "", confirmName: '',
"grade": "3", grade: '3',
userSid: '',
orgPath: '',
menuUrl: ''
} }
} }
this.loadList() this.loadList()
@ -399,7 +380,6 @@
this.$refs['divadd'].showAdd() this.$refs['divadd'].showAdd()
}, },
doDel() { doDel() {
if (this.sids.length > 0) { if (this.sids.length > 0) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', { this.$confirm(tip, '提示', {
@ -429,19 +409,17 @@
}).catch(e => { }).catch(e => {
loading.close() loading.close()
}) })
}).catch(() => {}) }).catch(() => {
})
} else { } else {
this.$message({ this.$message({
type: "warning", type: 'warning',
showClose: true, showClose: true,
message: '请至少选择一条记录进行删除操作' message: '请至少选择一条记录进行删除操作'
}) })
} }
}, },
selectionLineChangeHandle(val) { selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val this.selectionList = val
const aa = [] const aa = []
val.forEach(element => { val.forEach(element => {
@ -461,21 +439,16 @@
toSupplement() { toSupplement() {
if (this.sids.length > 0) { if (this.sids.length > 0) {
this.dialogVisible = true this.dialogVisible = true
console.log("toSupplement", this.sids);
} else { } else {
this.$message({ this.$message({
type: "warning", type: 'warning',
showClose: true, showClose: true,
message: '请至少选择一条记录进行操作' message: '请至少选择一条记录进行操作'
}) })
} }
}, },
saveData() { saveData() {
this.formobj.sids = this.sids this.formobj.sids = this.sids
req.saveLogisticsInfo(this.formobj).then((resp) => { req.saveLogisticsInfo(this.formobj).then((resp) => {
if (resp.success) { if (resp.success) {
this.dialogVisible = false this.dialogVisible = false
@ -488,30 +461,25 @@
} else { } else {
// 根据resp.code进行异常情况处理 // 根据resp.code进行异常情况处理
} }
}).catch(e => {}) }).catch(e => {
})
}, },
handleClose() { handleClose() {
this.dialogVisible = false this.dialogVisible = false
}, },
selectDeliveryKey(val) { selectDeliveryKey(val) {
console.log("selectDeliveryKey", val); const choose = this.deliveryKeyList.filter((item) => item.sid === val)
const choose = this.deliveryKeyList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectDeliveryKey', choose) console.log('>>>>>>>>>selectDeliveryKey', choose)
this.formobj.deliveryName = choose[0].name this.formobj.deliveryName = choose[0].name
this.formobj.deliveryKey = choose[0].sid this.formobj.deliveryKey = choose[0].sid
}, },
doClose() { doClose() {
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
}, }
} }
} }
</script> </script>
@ -537,26 +505,7 @@
width: calc(100% - 70px); width: calc(100% - 70px);
} }
.first_row { .first_row {
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

17
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue
View File

@ -112,7 +112,7 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocationByGroup'
import { import {
selectStaffListss selectStaffListss
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
@ -247,10 +247,7 @@ export default {
this.currentLink = true this.currentLink = true
this.countersignLink = true this.countersignLink = true
this.dialogList.comment = '' this.dialogList.comment = ''
req.getNextNodesForSubmit({ req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) { if (resp.success) {
var arr = resp.data var arr = resp.data
this.nextNode = arr[0] this.nextNode = arr[0]
@ -265,10 +262,7 @@ export default {
this.currentLink = true this.currentLink = true
this.countersignLink = false this.countersignLink = false
this.dialogList.comment = '同意' this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) { if (resp.success) {
var arr = resp.data var arr = resp.data
this.nextNode = arr[0] this.nextNode = arr[0]
@ -283,10 +277,7 @@ export default {
this.currentLink = true this.currentLink = true
this.countersignLink = false this.countersignLink = false
this.dialogList.comment = '' this.dialogList.comment = ''
req.getPreviousNodesForReject({ req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
taskDefKey: this.current.taskDefKey,
businessSid: this.linkByParameter.businessSid
}).then((resp) => {
if (resp.success) { if (resp.success) {
var arr = resp.data var arr = resp.data
this.nextNode = arr[0] this.nextNode = arr[0]

225
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue
View File

@ -9,11 +9,8 @@
</div> </div>
</div> </div>
<div class=""> <div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请人</div> <div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -24,21 +21,18 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">申请日期</div> <div class="span-sty">申请日期</div>
<span class="addinputInfo">{{ formobj.createTime }}</span> <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<div class="span-sty">调出站</div> <div class="span-sty">调出站</div>
<el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item> <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<div class="span-sty2"><span class="must">*</span> 调入分公司</div> <div class="span-sty2"><span class="must">*</span> 调入分公司</div>
<el-form-item prop="inOrgName"> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" <el-form-item prop="inOrgName">
@change="selectInOrg" class="addinputInfo2 addinputw2"> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司" @change="selectInOrg" class="addinputInfo2 addinputw2">
<el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
@ -47,8 +41,7 @@
<el-col :span="5"> <el-col :span="5">
<div class="span-sty2"><span class="must">*</span> 调入站点</div> <div class="span-sty2"><span class="must">*</span> 调入站点</div>
<el-form-item prop="inPlatName"> <el-form-item prop="inPlatName">
<el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName" <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName" class="addinputInfo addinputw">
class="addinputInfo addinputw">
<el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
@ -56,31 +49,27 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty"><span class="must">*</span> 经办人</div> <div class="span-sty"><span class="must">*</span> 经办人</div>
<el-form-item prop="confirmName"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable <el-form-item prop="confirmName">
@change="selectOperatorName" class="addinputInfo addinputw"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable @change="selectOperatorName" class="addinputInfo addinputw">
<el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid"> <el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="span-sty">备注</div> <div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" <el-form-item>
type="textarea" :rows="4" clearable /></el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="title titleOne"> <div class="title titleOne">
<div>调拨商品列表</div> <div>调拨商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button> <el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button>
</div> </div>
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
<el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" wid align="center" width="100"> <el-table-column fixed label="操作" wid align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -99,16 +88,13 @@
<el-table-column prop="stockCount" label="库存数量" width="100" align="center"/> <el-table-column prop="stockCount" label="库存数量" width="100" align="center"/>
<el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center"> <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.markUpRatio" clearable placeholder="" <el-input v-model="scope.row.markUpRatio" clearable placeholder="" oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')" @input="commodityComputeYHAndXSJE(scope.row)"/>
oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')"
@input="commodityComputeYHAndXSJE(scope.row)" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="requAmount" label="调拨单价" align="center" width="100"/> <el-table-column prop="requAmount" label="调拨单价" align="center" width="100"/>
<el-table-column prop="count" label="调拨数量" width="120" align="center"> <el-table-column prop="count" label="调拨数量" width="120" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable <el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="amount" label="调拨金额" align="center" width="100"/> <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
@ -122,21 +108,17 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocationByGroup'
import chooseproducts from './relation/chooseproducts' import chooseproducts from './relation/chooseproducts'
import {
getCurrentDate
} from '@/utils/index.js'
import { import {
selectOrgSidList, selectOrgSidList,
getOrgSidByPath,
selAllByOrgSidPath, selAllByOrgSidPath,
fetchBySid,
tranThree tranThree
} from '@/api/Common/dictcommons' } from '@/api/Common/dictcommons'
export default { export default {
components: { components: {
chooseproducts, chooseproducts
}, },
data() { data() {
return { return {
@ -146,58 +128,44 @@
activeNames: '1', activeNames: '1',
index: 0, index: 0,
formobj: { formobj: {
"sid": "", sid: '',
"billNo": "", billNo: '',
"useOrgSid": "", useOrgSid: '',
"createBySid": '', createBySid: '',
"createByName": '', createByName: '',
"deptName": '', deptName: '',
"deptSid": '', deptSid: '',
"createTime": getCurrentDate(), createTime: '',
"outOrgName": '', outOrgName: '',
"outOrgSid": '', outOrgSid: '',
"outPlatName": '', outPlatName: '',
"outPlatSid": '', outPlatSid: '',
"inOrgName": '', inOrgName: '',
"inOrgSid": '', inOrgSid: '',
"inPlatName": "", inPlatName: '',
"inPlatSid": "", inPlatSid: '',
"inOrgAttributeKey": "", inOrgAttributeKey: '',
"inOrgAttributeValue": "", inOrgAttributeValue: '',
"confirmName": "", confirmName: '',
"confirmSid": "", confirmSid: '',
"remarks": "", remarks: '',
"grade": "3", grade: '3',
"createOrgSid": "", createOrgSid: '',
"procDefId": "", procDefId: '',
"nodeId": "", nodeId: '',
"procInstId": "", procInstId: '',
"nodeState": "待提交", nodeState: '待提交',
"taskId": "", taskId: '',
"wmsInventoryAllocateBillDetailNewList": [] wmsInventoryAllocateBillDetailNewList: []
}, },
rules: { rules: {
inOrgName: [{ inOrgName: [{ required: true, message: '调入分公司不能为空', trigger: 'change' }],
required: true, inPlatName: [{ required: true, message: '调入站点不能为空', trigger: 'change' }],
message: '调入分公司不能为空', confirmName: [{ required: true, message: '经办人不能为空', trigger: 'change' }]
trigger: 'change'
}],
inPlatName: [{
required: true,
message: '调入站点不能为空',
trigger: 'change'
}],
confirmName: [{
required: true,
message: '经办人不能为空',
trigger: 'change'
}],
}, },
orgList: [], orgList: [],
deptList: [], deptList: [],
operatorNameList: [], operatorNameList: []
warehouseList: [],
warehouseRackList: []
} }
}, },
created() { created() {
@ -257,13 +225,9 @@
}, },
selectInOrg(val) { selectInOrg(val) {
console.log("selectInOrg", val); const choose = this.orgList.filter((item) => item.sid === val)
const choose = this.orgList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
this.formobj.inOrgSid = choose[0].sid this.formobj.inOrgSid = choose[0].sid
this.formobj.inOrgName = choose[0].name this.formobj.inOrgName = choose[0].name
tranThree({ tranThree({
sid: choose[0].sid, sid: choose[0].sid,
deptSid: this.formobj.deptSid deptSid: this.formobj.deptSid
@ -273,78 +237,29 @@
this.formobj.inDeptName = '' this.formobj.inDeptName = ''
this.formobj.inOrgAttributeKey = '' this.formobj.inOrgAttributeKey = ''
this.formobj.inOrgAttributeValue = '' this.formobj.inOrgAttributeValue = ''
console.log("getListDeptByOrgSid", res);
this.deptList = res.data this.deptList = res.data
} }
}) })
}, },
selectInDeptName(val) { selectInDeptName(val) {
console.log("selectInDeptName", val); const choose = this.deptList.filter((item) => item.sid === val)
const choose = this.deptList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInDeptName', choose)
this.formobj.inPlatSid = choose[0].sid this.formobj.inPlatSid = choose[0].sid
this.formobj.inPlatName = choose[0].name this.formobj.inPlatName = choose[0].name
this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
}, },
selectOperatorName(val) { selectOperatorName(val) {
console.log("selectOperatorName", val); const choose = this.operatorNameList.filter((item) => item.sid === val)
const choose = this.operatorNameList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectOutOrg', choose)
this.formobj.confirmSid = choose[0].sid this.formobj.confirmSid = choose[0].sid
this.formobj.confirmName = choose[0].name this.formobj.confirmName = choose[0].name
}, },
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
}
req.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
console.log("aaaaaa", this.warehouseRackList);
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
row.inWarehouseSid = choose[0].sid
row.inWarehouseName = choose[0].warehouseName
row.inWarehouseRackSid = ''
row.inWarehouseRackCode = ''
this.getWarehouseAreaList(val)
},
selectWarehouseAreaCode(row, val) {
console.log("selectWarehouseAreaCode", row);
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectInOrg', choose)
row.inWarehouseRackSid = choose[0].sid
row.inWarehouseRackCode = choose[0].areaCode
},
showAdd() { showAdd() {
this.viewTitle = '【新增】商品调拨申请' this.viewTitle = '【新增】商品调拨申请'
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
}) })
}, },
showInfo(sid) { showInfo(sid) {
this.viewTitle = '【修改】商品调拨申请' this.viewTitle = '【修改】商品调拨申请'
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['form_obj'].clearValidate() this.$refs['form_obj'].clearValidate()
@ -356,20 +271,16 @@
selectOrgSidList().then((res) => { selectOrgSidList().then((res) => {
if (res.success) { if (res.success) {
console.log("selectOrgSidList", res);
this.orgList = res.data this.orgList = res.data
} }
}) })
selAllByOrgSidPath({ selAllByOrgSidPath({
orgSidPath: this.formobj.orgPath orgSidPath: this.formobj.orgPath
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
console.log("selAllByOrgSidPath", res);
this.operatorNameList = res.data this.operatorNameList = res.data
} }
}) })
} }
}) })
}, },
@ -424,26 +335,20 @@
const aa = [] const aa = []
this.$refs['divSp'].showData(aa, this.formobj.deptSid) this.$refs['divSp'].showData(aa, this.formobj.deptSid)
}, },
// 计算调拨单、调拨金额 // 计算调拨单、调拨金额
commodityComputeYHAndXSJE(row) { commodityComputeYHAndXSJE(row) {
console.log("commodityComputeYHAndXSJE", row);
row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2) row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2)
row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2) row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
}, },
// 计算调拨金额 // 计算调拨金额
commodityComputeYHAndXSJE2(row) { commodityComputeYHAndXSJE2(row) {
if (Number(row.stockCount) < Number(row.count)) { if (Number(row.stockCount) < Number(row.count)) {
row.count = Number(row.stockCount) row.count = Number(row.stockCount)
} else { } else {
row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2) row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
} }
}, },
saveOrUpdate() { saveOrUpdate() {
console.log("saveOrUpdate", this.formobj);
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
this.submitdisabled = true this.submitdisabled = true
@ -472,33 +377,28 @@
}) })
}, },
submit() { submit() {
console.log("saveOrUpdate", this.formobj);
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length === 0) {
if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
this.$message({ this.$message({
type: "warning", type: 'warning',
showClose: true, showClose: true,
message: '调拨商品不能为空' message: '调拨商品不能为空'
}) })
return return
} }
for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) { for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i] var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
if (Number(item.count) == 0) { if (Number(item.count) === 0) {
this.$message({ this.$message({
type: "warning", type: 'warning',
showClose: true, showClose: true,
message: '调拨数量不能为空或0' message: '调拨数量不能为空或0'
}) })
return return
} }
} }
this.submitdisabled = true this.submitdisabled = true
req.allocation(this.formobj).then((res) => { req.allocation(this.formobj).then((res) => {
if (res.success) { if (res.success) {
@ -523,8 +423,7 @@
}) })
} }
}) })
}, }
} }
} }
</script> </script>
@ -567,8 +466,6 @@
width: calc(100% - 105px); width: calc(100% - 105px);
} }
.addinputInfo { .addinputInfo {
margin-left: 120px !important; margin-left: 120px !important;
} }
@ -578,10 +475,6 @@
width: calc(100% - 115px); width: calc(100% - 115px);
} }
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne { .titleOne {
padding: 7px; padding: 7px;
display: flex; display: flex;
@ -589,10 +482,4 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style> </style>

2
yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupYiBan.vue
View File

@ -69,7 +69,7 @@
</template> </template>
<script> <script>
import req from '@/api/storage/allocation.js' import req from '@/api/storage/allocationByGroup'
export default { export default {
data() { data() {

Write Preview
Loading…
Cancel
Save