Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
W
wly-APP
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘川
wly-APP
Commits
0a5a68b7
Commit
0a5a68b7
authored
May 25, 2022
by
chuan.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
材料计划联调
parent
8962c2c3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
315 additions
and
70 deletions
+315
-70
order-list.nvue
pages/produce-material/order-list.nvue
+5
-8
produce-material.nvue
pages/produce-material/produce-material.nvue
+5
-12
produce-plan.nvue
pages/produce-material/produce-plan.nvue
+209
-38
order-list.nvue
pages/produce-order/order-list.nvue
+1
-1
produce-plan.nvue
pages/produce-order/produce-plan.nvue
+22
-10
produceMaterial.js
servers/produceMaterial.js
+62
-0
produceOrder.js
servers/produceOrder.js
+11
-1
No files found.
pages/produce-material/order-list.nvue
View file @
0a5a68b7
...
@@ -4,12 +4,12 @@
...
@@ -4,12 +4,12 @@
<view class="cell-list">
<view class="cell-list">
<view class="middle view planout-block-item">
<view class="middle view planout-block-item">
<view class="item-block item-block-code">
<view class="item-block item-block-code">
<text class="item-block-label">单号:{{itemHead.P
ROD
PL_ID}}</text>
<text class="item-block-label">单号:{{itemHead.P
ACK
PL_ID}}</text>
<button class="item-block-btn" type="default"><text
<button class="item-block-btn" type="default"><text
class="item-block-btn__text">{{itemHead.STATUS}}</text></button>
class="item-block-btn__text">{{itemHead.STATUS}}</text></button>
</view>
</view>
<view class="item-block item-block-name">
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">
高端总经销材料计划
</text>
<text class="item-block-label item-block__label">
{{itemHead.PACKTYPE}}
</text>
</view>
</view>
<view class="item-block">
<view class="item-block">
<text class="item-block-label-des">{{itemHead.DATUM}}</text>
<text class="item-block-label-des">{{itemHead.DATUM}}</text>
...
@@ -30,12 +30,12 @@
...
@@ -30,12 +30,12 @@
</view>
</view>
<view class="block-detal-item block-detal-item-last">
<view class="block-detal-item block-detal-item-last">
<text class="detal-item-label">吨数</text>
<text class="detal-item-label">吨数</text>
<text class="detal-item-value">
7
</text>
<text class="detal-item-value">
{{item.PLANQTY_TON}}
</text>
</view>
</view>
</view>
</view>
<view class="item-block">
<view class="item-block">
<text class="item-block-label-des">
尽快发货
</text>
<text class="item-block-label-des">
{{itemHead.REMARK}}
</text>
</view>
</view>
<view class="item-block item-block-date">
<view class="item-block item-block-date">
<text class="detal-item-label">备注</text>
<text class="detal-item-label">备注</text>
...
@@ -196,13 +196,10 @@
...
@@ -196,13 +196,10 @@
}
}
.item-block-btn {
.item-block-btn {
width: 120rpx;
height: 48rpx;
height: 48rpx;
line-height: 4
8
rpx;
line-height: 4
4
rpx;
background: #f61d30;
background: #f61d30;
border-radius: 80rpx 200rpx 200rpx 80rpx;
border-radius: 80rpx 200rpx 200rpx 80rpx;
font-size: 12px;
color: #fff;
text-align: center;
text-align: center;
}
}
...
...
pages/produce-material/produce-material.nvue
View file @
0a5a68b7
...
@@ -57,8 +57,8 @@
...
@@ -57,8 +57,8 @@
} from 'vuex'
} from 'vuex'
import {
import {
apiGetProduceOrder
apiGetProduce
Material
Order
} from '@/servers/produce
Order
.js'
} from '@/servers/produce
Material
.js'
export default {
export default {
components: {
components: {
...
@@ -77,15 +77,7 @@
...
@@ -77,15 +77,7 @@
},
},
data() {
data() {
return {
return {
dataList: [{
dataList: [],
id: "tab01",
name: '最新',
newsid: 0
}, {
id: "tab02",
name: '大公司',
newsid: 23
}],
navigateFlag: false,
navigateFlag: false,
pulling: false,
pulling: false,
refreshing: false,
refreshing: false,
...
@@ -163,7 +155,7 @@
...
@@ -163,7 +155,7 @@
...this.page
...this.page
}
}
apiGetProduceOrder(params).then((res) => {
apiGetProduce
Material
Order(params).then((res) => {
console.log('loadData', res)
console.log('loadData', res)
const {
const {
DATA,
DATA,
...
@@ -204,6 +196,7 @@
...
@@ -204,6 +196,7 @@
})
})
},
},
loadMore(e) {
loadMore(e) {
console.log('loadMore')
this.page.PAGE++
this.page.PAGE++
this.loadData();
this.loadData();
},
},
...
...
pages/produce-material/produce-plan.nvue
View file @
0a5a68b7
This diff is collapsed.
Click to expand it.
pages/produce-order/order-list.nvue
View file @
0a5a68b7
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
class="item-block-btn__text">{{itemHead.STATUS}}</text></button>
class="item-block-btn__text">{{itemHead.STATUS}}</text></button>
</view>
</view>
<view class="item-block item-block-name">
<view class="item-block item-block-name">
<text class="item-block-label item-block__label">
配额生产计划
</text>
<text class="item-block-label item-block__label">
{{itemHead.PRODPLTYPE}}
</text>
</view>
</view>
<view class="item-block">
<view class="item-block">
<text class="item-block-label-des">{{itemHead.DATUM}}</text>
<text class="item-block-label-des">{{itemHead.DATUM}}</text>
...
...
pages/produce-order/produce-plan.nvue
View file @
0a5a68b7
...
@@ -105,7 +105,8 @@
...
@@ -105,7 +105,8 @@
import {
import {
apiProducePlanInit,
apiProducePlanInit,
apiUpdateProducePlanData,
apiUpdateProducePlanData,
apiUpdateProduceOrder
apiUpdateProduceOrder,
apiSubmitProduceOrder
} from '@/servers/produceOrder.js'
} from '@/servers/produceOrder.js'
export default {
export default {
...
@@ -113,7 +114,6 @@
...
@@ -113,7 +114,6 @@
return {
return {
isChecked: false,
isChecked: false,
scrollTop: 0,
scrollTop: 0,
orderNo: '',
selectedSalesCenterArr: [{
selectedSalesCenterArr: [{
KEY: -1,
KEY: -1,
VALUE: ''
VALUE: ''
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
}
}
const res = await apiProducePlanInit(params)
const res = await apiProducePlanInit(params)
const {
const {
INFO
,
HEAD
,
YXDY,
YXDY,
ITEM
ITEM
} = res.DATA
} = res.DATA
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
...this.planinnerLists[0],
...this.planinnerLists[0],
...ITEM[0]
...ITEM[0]
}
}
this.HEADINFO =
INFO
this.HEADINFO =
HEAD
this.productInitInfo = ITEM[0]
this.productInitInfo = ITEM[0]
},
},
async updateNoQuotaData(productIndex, mode = '', product) {
async updateNoQuotaData(productIndex, mode = '', product) {
...
@@ -213,7 +213,7 @@
...
@@ -213,7 +213,7 @@
item_inner = [productAfterInit]
item_inner = [productAfterInit]
const params = {
const params = {
"
INFO
": this.HEADINFO,
"
HEAD
": this.HEADINFO,
"ITEM": item_inner,
"ITEM": item_inner,
}
}
const res = await apiUpdateProducePlanData(params)
const res = await apiUpdateProducePlanData(params)
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
let obj = {}
let obj = {}
this.planinnerLists = this.planinnerLists.map((item, i) => {
this.planinnerLists = this.planinnerLists.map((item, i) => {
if (i === productIndex) {
if (i === productIndex) {
item.
ORDERED_PRO
D = PRODUCT_ID
item.
PROD_I
D = PRODUCT_ID
item.DESCRIPTION = SHORT_TEXT
item.DESCRIPTION = SHORT_TEXT
item.PLANQTY_BOX = item.quantity
item.PLANQTY_BOX = item.quantity
obj = item
obj = item
...
@@ -288,9 +288,6 @@
...
@@ -288,9 +288,6 @@
handleDel(index, ) {
handleDel(index, ) {
this.planinnerLists.splice(index, 1)
this.planinnerLists.splice(index, 1)
},
},
change(e) {
console.log('当前模式:' + e.type + ',状态:' + e.show);
},
fnBackHome() {
fnBackHome() {
this.resetData()
this.resetData()
this.$refs.popup.close()
this.$refs.popup.close()
...
@@ -314,11 +311,26 @@
...
@@ -314,11 +311,26 @@
async submit() {
async submit() {
const params = {
const params = {
INFO
: this.HEADINFO,
HEAD
: this.HEADINFO,
ITEM: this.planinnerLists
ITEM: this.planinnerLists
}
}
const res = await apiUpdateProduceOrder(params)
const res = await apiUpdateProduceOrder(params)
const {
DATA1: HEAD2,
DATA2: ITEM2
} = res
const params2 = {
HEAD: HEAD2,
ITEM: ITEM2
}
// this.HEADINFO = HEAD2
// this.planinnerLists = ITEM2
const res2 = await apiSubmitProduceOrder(params2)
this.orderInfo = res.DATA1
this.orderInfo = res.DATA1
this.$refs.popup.open('center')
this.$refs.popup.open('center')
...
...
servers/produceMaterial.js
0 → 100644
View file @
0a5a68b7
import
apiHelper
from
'./api.helper.js'
/**
* 根据搜索条件查询材料计划信息。
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiGetProduceMaterialOrder
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/get_m_plan_app'
,
params
)
return
res
}
/**
* 材料计划创建初始化数据。
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiProduceMaterialPlanInit
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/m_plan_init'
,
params
)
return
res
}
/**
* 材料计划项目更新数据
* @param name 账户名
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiUpdateProduceMaterialPlanData
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/m_plan_update'
,
params
)
return
res
}
/**
* 材料计划单保存。
* @param
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiUpdateProduceMaterialOrder
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/prodplan03'
,
params
)
return
res
}
/**
* 材料计划单提交。
* @param
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiSubmitProduceMaterialOrder
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/masterdata/materialplnsubm'
,
params
)
return
res
}
/**
* 查询客户可售产品。
* @param captcha 验证码
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiProductSelect
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/bp_pro_search'
,
params
)
return
res
}
servers/produceOrder.js
View file @
0a5a68b7
...
@@ -32,11 +32,21 @@ export async function apiUpdateProducePlanData(params) {
...
@@ -32,11 +32,21 @@ export async function apiUpdateProducePlanData(params) {
}
}
/**
/**
* 生产计划单
提交
。
* 生产计划单
保存
。
* @param
* @param
* @returns {Promise<AxiosResponse<T>>}
* @returns {Promise<AxiosResponse<T>>}
*/
*/
export
async
function
apiUpdateProduceOrder
(
params
)
{
export
async
function
apiUpdateProduceOrder
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/prodplan03'
,
params
)
return
res
}
/**
* 生产计划单提交。
* @param
* @returns {Promise<AxiosResponse<T>>}
*/
export
async
function
apiSubmitProduceOrder
(
params
)
{
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/prodplan003'
,
params
)
const
res
=
await
apiHelper
.
post
(
'/sap/bc/ztpm/to_new_crm/transdata/prodplan003'
,
params
)
return
res
return
res
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment