jg-waiwang-pro
XI_TENG\xixi_ 8 months ago
commit 0c607662f4

@ -5,7 +5,7 @@
<resultMap id="deliveryOrder" type="jnpf.entity.DeliveryOrderEntity"> <resultMap id="deliveryOrder" type="jnpf.entity.DeliveryOrderEntity">
<id column="id" property="id"></id> <id column="id" property="id"></id>
<result column="delivery_type" property="deliveryType"></result> <result column="delivery_type" property="deliveryType"></result>
<result column="delivery_status" property="deliveryStatus"></result> <result column="deliveryStatus" property="deliveryStatus"></result>
<result column="delivery_code" property="deliveryCode"></result> <result column="delivery_code" property="deliveryCode"></result>
<result column="preparation_time" property="preparationTime"></result> <result column="preparation_time" property="preparationTime"></result>
<result column="business_id" property="businessId"></result> <result column="business_id" property="businessId"></result>
@ -25,7 +25,18 @@
</resultMap> </resultMap>
<select id="queryDeliveryOrderList" resultMap="deliveryOrder"> <select id="queryDeliveryOrderList" resultMap="deliveryOrder">
select * from jg_delivery_order a select a.*,
case a.delivery_status
when '1' then '待校验'
when '2' then '待审核'
when '3' then '待处理'
when '4' then '待执行'
when '5' then '执行中'
when '6' then '已完成'
when '7' then '校验失败'
when '7' then '已取消'
end as deliveryStatus
from jg_delivery_order a
${ew.customSqlSegment} ${ew.customSqlSegment}
<if test="deliveryOrderPagination.sidx != null and deliveryOrderPagination.sidx != ''"> <if test="deliveryOrderPagination.sidx != null and deliveryOrderPagination.sidx != ''">
ORDER BY ${deliveryOrderPagination.sidx} ${deliveryOrderPagination.sort} ORDER BY ${deliveryOrderPagination.sidx} ${deliveryOrderPagination.sort}

@ -403,8 +403,8 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
Field declaredField = businessOrderEntity.getClass().getDeclaredField(strs[0]); Field declaredField = businessOrderEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true); declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value(); String value = declaredField.getAnnotation(TableField.class).value();
// businessOrderQueryWrapper="asc".equals(businessOrderPagination.getSort().toLowerCase())?businessOrderQueryWrapper.orderByAsc(value):businessOrderQueryWrapper.orderByDesc(value); businessOrderQueryWrapper="asc".equals(businessOrderPagination.getSort().toLowerCase())?businessOrderQueryWrapper.orderByAsc(value):businessOrderQueryWrapper.orderByDesc(value);
businessOrderPagination.setSidx("a." + value); // businessOrderPagination.setSidx("a." + value);
} catch (NoSuchFieldException e) { } catch (NoSuchFieldException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -414,7 +414,7 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
if((total>0 && AllIdList.size()>0) || total==0){ if((total>0 && AllIdList.size()>0) || total==0){
Page<BusinessOrderEntity> page=new Page<>(businessOrderPagination.getCurrentPage(), businessOrderPagination.getPageSize()); Page<BusinessOrderEntity> page=new Page<>(businessOrderPagination.getCurrentPage(), businessOrderPagination.getPageSize());
// IPage<BusinessOrderEntity> userIPage=this.page(page, businessOrderQueryWrapper); // IPage<BusinessOrderEntity> userIPage=this.page(page, businessOrderQueryWrapper);
IPage<BusinessOrderEntity> userIPage=businessOrderMapper.queryPurchaseOrder(page,businessOrderPagination, businessOrderQueryWrapper); IPage<BusinessOrderEntity> userIPage=businessOrderMapper.querySaleOrder(page,businessOrderPagination, businessOrderQueryWrapper);
return businessOrderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); return businessOrderPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{ }else{
List<BusinessOrderEntity> list = new ArrayList(); List<BusinessOrderEntity> list = new ArrayList();

@ -5,8 +5,8 @@
v-on="$listeners" :border="border"> v-on="$listeners" :border="border">
<el-table-column prop="selection" type="selection" width="50" v-if="hasC" align="center" <el-table-column prop="selection" type="selection" width="50" v-if="hasC" align="center"
:selectable="checkSelectable" /> :selectable="checkSelectable" />
<el-table-column prop="index" type="index" width="50" label="序号" v-if="hasNO" <el-table-column prop="index" type="index" width="50" label="序号" v-if="hasNO" fixed="left"
:fixed="hasNOFixed" align="center" /> align="center" />
<jnpf-table-column :columns="columns" :columnList="columnList" v-if="customColumn" /> <jnpf-table-column :columns="columns" :columnList="columnList" v-if="customColumn" />
<template v-else> <template v-else>
<slot /> <slot />

@ -1,5 +1,5 @@
module.exports = { module.exports = {
title: 'JNPF快速开发平台', title: '智慧管家平台',
/** /**
* @type {boolean} true | false * @type {boolean} true | false
@ -32,13 +32,13 @@ module.exports = {
* If you want to also use it in dev, you can pass ['production', 'development'] * If you want to also use it in dev, you can pass ['production', 'development']
*/ */
sysConfig: { sysConfig: {
sysVersion: '3.4.7', sysVersion: '1.0.0',
copyright: 'Copyright @ 2023 引迈信息技术有限公司版权所有', copyright: 'Copyright @ 2023 上海长江云息数字科技有限公司',
navigationIcon: '', navigationIcon: '',
workLogoIcon: '', workLogoIcon: '',
logoIcon: '', logoIcon: '',
loginIcon: '', loginIcon: '',
sysName: 'JNPF快速开发平台' sysName: '智慧管家平台'
}, },
themeClass: 'blue', themeClass: 'blue',
layoutType: 'classic', layoutType: 'classic',

@ -5,7 +5,7 @@
<template> <template>
<div :style="{ margin: '0 auto', width: '100%' }"> <div :style="{ margin: '0 auto', width: '100%' }">
<el-row :gutter="15" class=""> <el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="130px" <el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="160px"
label-position="right" :disabled="setting.readonly"> label-position="right" :disabled="setting.readonly">
<template v-if="!loading && formOperates"> <template v-if="!loading && formOperates">
<!-- 具体表单 --> <!-- 具体表单 -->

@ -1,132 +1,126 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/> <div class="options">
<div class="options"> <el-button @click="goBack"> </el-button>
<el-button @click="goBack"> </el-button> </div>
</div>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24">
<jnpf-form-tip-item label="单位名称" prop="unitName">
<p>{{ dataForm.unitName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="描述" prop="remark">
<p>{{ dataForm.remark }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="状态" prop="status">
<p>{{ dataForm.status }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="单位类型" prop="unitType">
<p>{{ dataForm.unitType }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="来源" prop="source">
<p>{{ dataForm.source }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div> </div>
</div> </transition>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label="单位名称"
prop="unitName" >
<p>{{dataForm.unitName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="描述"
prop="remark" >
<p>{{dataForm.remark}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="状态"
prop="status" >
<p>{{dataForm.status}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="单位类型"
prop="unitType" >
<p>{{dataForm.unitType}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="来源"
prop="source" >
<p>{{dataForm.source}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
visible: false, visible: false,
detailVisible: false, detailVisible: false,
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
unitName : '', unitName: '',
remark : '', remark: '',
status : "1", status: "1",
unitType : "2", unitType: "2",
source : "2", source: "2",
creatorTime : "", creatorTime: "",
creatorUserId : "", creatorUserId: "",
lastModifyTime : "", lastModifyTime: "",
lastModifyUserId : "", lastModifyUserId: "",
}, },
statusProps:{"label":"fullName","value":"enCode" }, statusProps: { "label": "fullName", "value": "enCode" },
unitTypeProps:{"label":"fullName","value":"enCode" }, unitTypeProps: { "label": "fullName", "value": "enCode" },
sourceProps:{"label":"fullName","value":"enCode" }, sourceProps: { "label": "fullName", "value": "enCode" },
} }
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
}, },
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
}, },
mounted() {}, init(id) {
methods: { this.dataForm.id = id || 0;
toDetail(defaultValue, modelId) { this.visible = true;
if (!defaultValue) return this.$nextTick(() => {
getConfigData(modelId).then(res => { if (this.dataForm.id) {
if (!res.data || !res.data.formData) return this.loading = true
let formData = JSON.parse(res.data.formData) request({
formData.popupType = 'general' url: '/api/scm/ProductUnitwarehouse/detail/' + this.dataForm.id,
this.detailVisible = true method: 'get'
this.$nextTick(() => { }).then(res => {
this.$refs.Detail.init(formData, modelId, defaultValue) this.dataInfo(res.data)
this.loading = false
}) })
}) }
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/ProductUnitwarehouse/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}) })
},
}, },
} },
}
</script> </script>

@ -72,7 +72,7 @@
v-has="'btn_batchRemove'">批量删除 v-has="'btn_batchRemove'">批量删除
</el-button> </el-button>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'" <el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="createSaleOrder()">生成销售订单 @click="addSaleHandle()">生成销售订单
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -227,6 +227,7 @@
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
<SaleOrder v-if="saleOrderVisible" ref="SaleOrder" @refresh="initData" /> <SaleOrder v-if="saleOrderVisible" ref="SaleOrder" @refresh="initData" />
<SaleFlowBox v-if="saleFlowVisible" ref="SaleFlowBox" @close="colseFlow" />
</div> </div>
</template> </template>
@ -238,6 +239,7 @@ import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getFormById } from '@/api/workFlow/FormDesign' import { getFormById } from '@/api/workFlow/FormDesign'
import { getFlowList } from '@/api/workFlow/FlowEngine' import { getFlowList } from '@/api/workFlow/FlowEngine'
import FlowBox from '@/views/workFlow/components/FlowBox' import FlowBox from '@/views/workFlow/components/FlowBox'
import SaleFlowBox from '@/views/workFlow/components/SaleFlowBox'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
@ -254,6 +256,7 @@ import SaleOrder from '@/views/scm/saleCenter/saleOrder/form.vue'
export default { export default {
components: { components: {
FlowBox, FlowBox,
SaleFlowBox,
ExportBox, ToFormDetail, SuperQuery, SaleOrder ExportBox, ToFormDetail, SuperQuery, SaleOrder
}, },
data() { data() {
@ -306,7 +309,9 @@ export default {
formVisible: false, formVisible: false,
flowVisible: false, flowVisible: false,
flowListVisible: false, flowListVisible: false,
saleFlowVisible: false,
flowList: [], flowList: [],
saleFlowList: [],
exportBoxVisible: false, exportBoxVisible: false,
orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "合同销售", "id": "2" }], orderTypeOptions: [{ "fullName": "标准销售", "id": "1" }, { "fullName": "合同销售", "id": "2" }],
orderTypeProps: { "label": "fullName", "value": "id" }, orderTypeProps: { "label": "fullName", "value": "id" },
@ -375,9 +380,17 @@ export default {
this.$router.push('/404'); this.$router.push('/404');
}) })
}) })
getFormById("522690032352364805").then(res1 => {
let saleFlowId = res1.data && res1.data.id
getFlowList(saleFlowId, '1').then(res2 => {
this.saleFlowList = res2.data
}).catch((e) => {
this.$message({ type: 'error', message: e.message });
this.$router.push('/404');
})
})
}, },
methods: { methods: {
createSaleOrder() { createSaleOrder() {
if (!this.multipleSelectionItem.length) { if (!this.multipleSelectionItem.length) {
this.$message({ this.$message({
@ -740,6 +753,38 @@ export default {
this.$refs.FlowBox.init(data) this.$refs.FlowBox.init(data)
}) })
}, },
addSaleHandle() {
if (!this.multipleSelectionItem.length) {
this.$message({
type: 'error',
message: '请选择一条数据',
duration: 1500,
})
return
}
const selectData = this.multipleSelectionItem
if (!this.saleFlowList.length) {
this.$message({ type: 'error', message: '流程不存在' });
} else if (this.saleFlowList.length === 1) {
this.selectSaleFlow(this.saleFlowList[0], selectData)
} else {
this.flowListVisible = true
}
},
selectSaleFlow(item, selectData) {
let data = {
id: '',
formType: 1,
flowId: item.id,
opType: '-1',
selectData: selectData
}
this.flowListVisible = false
this.saleFlowVisible = true
this.$nextTick(() => {
this.$refs.SaleFlowBox.init(data)
})
},
refresh(isrRefresh) { refresh(isrRefresh) {
this.formVisible = false this.formVisible = false
if (isrRefresh) this.reset() if (isrRefresh) this.reset()
@ -750,6 +795,7 @@ export default {
}, },
colseFlow(isrRefresh) { colseFlow(isrRefresh) {
this.flowVisible = false this.flowVisible = false
this.saleFlowVisible = false
if (isrRefresh) this.reset() if (isrRefresh) this.reset()
}, },
} }

@ -61,16 +61,18 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="deliveryCode" label="单据编号" align="left"> <el-table-column prop="deliveryCode" label="单据编号" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="subjectId" label="客户名称" align="left"> <el-table-column prop="subjectId" label="客户名称" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="deliveryType" algin="left"> <el-table-column label="单据类型" prop="deliveryType" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.deliveryType}} {{ scope.row.deliveryType}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deliveryStatus" label="单据状态" align="left" fixed="left">
</el-table-column>
<el-table-column prop="businessId" label="关联单据号" align="left"> <el-table-column prop="businessId" label="关联单据号" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="deliveryAddress" label="发货数量" align="left"> <el-table-column prop="deliveryAddress" label="发货数量" align="left">

@ -78,20 +78,20 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="voucherCode" label="凭证编号" align="left"> <el-table-column prop="voucherCode" label="凭证编号" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="documentType" algin="left"> <el-table-column label="单据类型" prop="documentType" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.documentType}} {{ scope.row.documentType}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证类型" prop="voucherType" algin="left"> <el-table-column label="凭证类型" prop="voucherType" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherType}} {{ scope.row.voucherType}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="凭证状态" prop="voucherStatus" algin="left"> <el-table-column label="凭证状态" prop="voucherStatus" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.voucherStatus}} {{ scope.row.voucherStatus}}
</template> </template>

@ -72,7 +72,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="enterpriseId" label="机构名称" align="left"> <el-table-column prop="enterpriseId" label="机构名称" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="warehouseId" label="收货仓库" align="left"> <el-table-column prop="receiptWarehouse" label="收货仓库" align="left">
</el-table-column> </el-table-column>
<el-table-column prop="shippingAddress" label="发货地址" align="left"> <el-table-column prop="shippingAddress" label="发货地址" align="left">
</el-table-column> </el-table-column>

@ -1115,6 +1115,7 @@
</el-form> </el-form>
</el-row> </el-row>
<UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" /> <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
<FlowBox v-if="flowVisible" ref="FlowBox" />
</div> </div>
</template> </template>
@ -1468,7 +1469,9 @@ export default {
} }
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
}, },
mounted() { }, mounted() {
this.initPurchaseData();
},
methods: { methods: {
productInfo(val, val2) { productInfo(val, val2) {
// this.dataForm.businessOrderProductRelationalList = [] // this.dataForm.businessOrderProductRelationalList = []
@ -1538,19 +1541,22 @@ export default {
this.getsettlementinfosettlementMethodOptions(); this.getsettlementinfosettlementMethodOptions();
}, },
selfGetInfo(dataForm) { selfGetInfo(dataForm) {
debugger
this.dataInfo(dataForm) this.dataInfo(dataForm)
}, },
beforeSubmit() { beforeSubmit() {
const _data = this.dataList() const _data = this.dataList()
return _data return _data
}, },
initPurchaseData(){
console.log("55555555", this.setting)
},
selfInit() { selfInit() {
this.dataAll() this.dataAll()
}, },
getFormById() { getFormById() {
getFormById("522690032352364805").then(res => { getFormById("522690032352364805").then(res => {
// this.dataForm.flowId = res.data && res.data.flowId this.dataForm.flowId = res.data && res.data.flowId
this.dataForm.flowId = "523058114551875973"
// this.encode = res.data&&res.data.encode // this.encode = res.data&&res.data.encode
}) })
}, },
@ -1788,9 +1794,11 @@ export default {
}, },
dataList() { dataList() {
var _data = this.dataForm; var _data = this.dataForm;
debugger
return _data; return _data;
}, },
dataInfo(dataAll) { dataInfo(dataAll) {
debugger
let _dataAll = dataAll let _dataAll = dataAll
this.dataForm = _dataAll this.dataForm = _dataAll
this.isEdit = true this.isEdit = true

@ -92,18 +92,19 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
@selection-change="handleSelectionChange" :span-method="arraySpanMethod"> @selection-change="handleSelectionChange" :span-method="arraySpanMethod" border>
<el-table-column prop="code" label="单据编号" align="left">
<el-table-column prop="code" label="单据编号" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column prop="firstSubjectBasicId" label="客户名称" align="left"> <el-table-column prop="firstSubjectBasicId" label="客户名称" align="left" fixed="left">
</el-table-column> </el-table-column>
<el-table-column label="单据类型" prop="orderType" algin="left"> <el-table-column label="单据类型" prop="orderType" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.orderType}} {{ scope.row.orderType}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单据状态" prop="status" algin="left"> <el-table-column label="单据状态" prop="status" algin="left" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status}} {{ scope.row.status}}
</template> </template>

@ -679,7 +679,6 @@ export default {
this.dataForm.orderNum = data.length this.dataForm.orderNum = data.length
let list = [] let list = []
data.forEach((item, index) => { data.forEach((item, index) => {
console.log("2", item.businessOrderProductRelationalList);
this.dataForm.redeliveryoriginalorderrelationList.push(item) this.dataForm.redeliveryoriginalorderrelationList.push(item)
this.dataForm.redeliveryproductrelationList = [...item.businessOrderProductRelationalList, ...this.dataForm.redeliveryproductrelationList] this.dataForm.redeliveryproductrelationList = [...item.businessOrderProductRelationalList, ...this.dataForm.redeliveryproductrelationList]
}); });

Loading…
Cancel
Save