|
@@ -21,7 +21,7 @@
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="item in outputSceneState"
|
|
v-for="item in outputSceneState"
|
|
|
:key="item.code"
|
|
:key="item.code"
|
|
|
- :value="item.code + ''"
|
|
|
|
|
|
|
+ :value="item.code"
|
|
|
:label="item.label"
|
|
:label="item.label"
|
|
|
></el-option>
|
|
></el-option>
|
|
|
</el-select> </el-form-item
|
|
</el-select> </el-form-item
|
|
@@ -283,8 +283,12 @@
|
|
|
>
|
|
>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- <el-table-column label="单价" prop="price" align="center" v-if="isPrice == 1">
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="单价"
|
|
|
|
|
+ prop="price"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ v-if="isPrice == 1"
|
|
|
|
|
+ >
|
|
|
<template slot-scope="{ row }">
|
|
<template slot-scope="{ row }">
|
|
|
<template>
|
|
<template>
|
|
|
{{ row.price ? row.price : '-' + '元' }}/{{
|
|
{{ row.price ? row.price : '-' + '元' }}/{{
|
|
@@ -574,12 +578,13 @@
|
|
|
pickingPageNum: 1,
|
|
pickingPageNum: 1,
|
|
|
materielPageNum: 1,
|
|
materielPageNum: 1,
|
|
|
dimension: '3',
|
|
dimension: '3',
|
|
|
- outputSceneState: outputSceneState.filter(
|
|
|
|
|
- (item) => item.code != '4' && item.code != '11'
|
|
|
|
|
- ), // 出库场景状态
|
|
|
|
|
|
|
+ // outputSceneState: outputSceneState.filter(
|
|
|
|
|
+ // (item) => item.code != '4' && item.code != '11'
|
|
|
|
|
+ // ), // 出库场景状态
|
|
|
|
|
+ outputSceneState,
|
|
|
saveLoading: false,
|
|
saveLoading: false,
|
|
|
treeList: [],
|
|
treeList: [],
|
|
|
- isPrice:1,
|
|
|
|
|
|
|
+ isPrice: 1,
|
|
|
formData: {
|
|
formData: {
|
|
|
extInfo: {
|
|
extInfo: {
|
|
|
assetType: [], //物品类型id
|
|
assetType: [], //物品类型id
|
|
@@ -602,7 +607,7 @@
|
|
|
verifyId: '', //审核人Id
|
|
verifyId: '', //审核人Id
|
|
|
verifyName: '', //审核人名称
|
|
verifyName: '', //审核人名称
|
|
|
createUserId: '',
|
|
createUserId: '',
|
|
|
- remark: '',
|
|
|
|
|
|
|
+ remark: ''
|
|
|
},
|
|
},
|
|
|
rules: {
|
|
rules: {
|
|
|
bizType: {
|
|
bizType: {
|
|
@@ -671,7 +676,7 @@
|
|
|
outboundRequisitionSelection(data, dimension, query) {
|
|
outboundRequisitionSelection(data, dimension, query) {
|
|
|
console.log(data, dimension, query);
|
|
console.log(data, dimension, query);
|
|
|
this.formData.sourceBizNo = query.sourceBizNo;
|
|
this.formData.sourceBizNo = query.sourceBizNo;
|
|
|
- this.formData.bizType = query.bizType;
|
|
|
|
|
|
|
+ this.formData.bizType = Number(query.bizType);
|
|
|
this.formData.extInfo.assetType = query.assetType.split(',');
|
|
this.formData.extInfo.assetType = query.assetType.split(',');
|
|
|
this.detailData(data, dimension);
|
|
this.detailData(data, dimension);
|
|
|
},
|
|
},
|
|
@@ -760,7 +765,7 @@
|
|
|
|
|
|
|
|
this.formData = res;
|
|
this.formData = res;
|
|
|
this.formData.extInfo.assetType = res.extInfo?.assetType?.split(',');
|
|
this.formData.extInfo.assetType = res.extInfo?.assetType?.split(',');
|
|
|
- this.formData.bizType = res.bizType + '';
|
|
|
|
|
|
|
+ this.formData.bizType = res.bizType;
|
|
|
console.log(this.formData.extInfo, '');
|
|
console.log(this.formData.extInfo, '');
|
|
|
this.auditorDeptClick({
|
|
this.auditorDeptClick({
|
|
|
id: this.formData.extInfo?.verifyDeptCode,
|
|
id: this.formData.extInfo?.verifyDeptCode,
|