diff --git a/miniprogram/app.json b/miniprogram/app.json index 7b9b249..e2b4147 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -42,6 +42,8 @@ "pages/other/batch/batch", "pages/other/batchDetail/batchDetail", "pages/base/viewAttachment/viewAttachment", + "pages/base/processConfig/processConfig", + "pages/base/processChildConfig/processChildConfig", "pages/other/outbound/outbound", "pages/other/outboundDetail/outboundDetail", "pages/other/transfer/transfer", diff --git a/miniprogram/assets/icons/流程配置.svg b/miniprogram/assets/icons/流程配置.svg new file mode 100644 index 0000000..8584912 --- /dev/null +++ b/miniprogram/assets/icons/流程配置.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/miniprogram/pages/base/processChildConfig/processChildConfig.json b/miniprogram/pages/base/processChildConfig/processChildConfig.json new file mode 100644 index 0000000..b8cf14e --- /dev/null +++ b/miniprogram/pages/base/processChildConfig/processChildConfig.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "t-cell": "tdesign-miniprogram/cell/cell", + "t-icon": "tdesign-miniprogram/icon/icon", + "t-cell-group": "tdesign-miniprogram/cell-group/cell-group" + }, + "navigationBarTitleText": "流程工序" +} \ No newline at end of file diff --git a/miniprogram/pages/base/processChildConfig/processChildConfig.ts b/miniprogram/pages/base/processChildConfig/processChildConfig.ts new file mode 100644 index 0000000..a269b7e --- /dev/null +++ b/miniprogram/pages/base/processChildConfig/processChildConfig.ts @@ -0,0 +1,77 @@ +import { loginStatusPage, post } from '@/utils/https'; +import { getAuthInfo, toArray } from '@/utils/util'; + +Page({ + /** + * 页面的初始数据 + */ + data: { + process_id: '', + list: [] as any[], + authInfo: {} as any, + }, + handleLogin(e: any) { + this.setData({ isLogin: e.detail }); + if (e.detail) { + this.init(); + } + }, + init() { + this.setData({ authInfo: getAuthInfo() }); + this.getList(); + }, + getList() { + post('CompanyProcessV2/getChildProcess', { process_id: this.data.process_id }).then( + (res: any) => { + this.setData({ list: toArray(res.data) }); + }, + ); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const { process_id = '', title } = options || {}; + if (title) { + wx.setNavigationBarTitle({ title: decodeURIComponent(title) }); + } + this.data.process_id = process_id; + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() {}, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/base/processChildConfig/processChildConfig.wxml b/miniprogram/pages/base/processChildConfig/processChildConfig.wxml new file mode 100644 index 0000000..1bf89a0 --- /dev/null +++ b/miniprogram/pages/base/processChildConfig/processChildConfig.wxml @@ -0,0 +1,13 @@ + + + + + + {{index + 1}} + + + + + \ No newline at end of file diff --git a/miniprogram/pages/base/processChildConfig/processChildConfig.wxss b/miniprogram/pages/base/processChildConfig/processChildConfig.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/base/processConfig/processConfig.json b/miniprogram/pages/base/processConfig/processConfig.json new file mode 100644 index 0000000..f4b4e1e --- /dev/null +++ b/miniprogram/pages/base/processConfig/processConfig.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "t-cell": "tdesign-miniprogram/cell/cell", + "t-icon": "tdesign-miniprogram/icon/icon", + "t-cell-group": "tdesign-miniprogram/cell-group/cell-group" + }, + "navigationBarTitleText": "流程配置" +} \ No newline at end of file diff --git a/miniprogram/pages/base/processConfig/processConfig.ts b/miniprogram/pages/base/processConfig/processConfig.ts new file mode 100644 index 0000000..966c044 --- /dev/null +++ b/miniprogram/pages/base/processConfig/processConfig.ts @@ -0,0 +1,78 @@ +import { loginStatusPage, post } from '@/utils/https'; +import { getAuthInfo, getDataSet, toArray } from '@/utils/util'; + +Page({ + /** + * 页面的初始数据 + */ + data: { + list: [] as any[], + authInfo: {} as any, + }, + handleLogin(e: any) { + this.setData({ isLogin: e.detail }); + if (e.detail) { + this.init(); + } + }, + init() { + this.setData({ authInfo: getAuthInfo() }); + this.getList(); + }, + getList() { + post('CompanyProcessV2/getParentProcess').then((res: any) => { + this.setData({ list: toArray(res.data) }); + }); + }, + onChildProcess(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + wx.navigateTo({ + url: `/pages/base/processChildConfig/processChildConfig?process_id=${ + item.process_id + }&title=${encodeURIComponent(`${item.process_name} 工序`)}`, + }); + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(_options) { + loginStatusPage(this); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() {}, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() {}, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() {}, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() {}, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() {}, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() {}, +}); diff --git a/miniprogram/pages/base/processConfig/processConfig.wxml b/miniprogram/pages/base/processConfig/processConfig.wxml new file mode 100644 index 0000000..6b7ecc4 --- /dev/null +++ b/miniprogram/pages/base/processConfig/processConfig.wxml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/miniprogram/pages/base/processConfig/processConfig.wxss b/miniprogram/pages/base/processConfig/processConfig.wxss new file mode 100644 index 0000000..e69de29 diff --git a/miniprogram/pages/other/goods/goods.ts b/miniprogram/pages/other/goods/goods.ts index a287593..747cafe 100644 --- a/miniprogram/pages/other/goods/goods.ts +++ b/miniprogram/pages/other/goods/goods.ts @@ -4,7 +4,9 @@ import { getAuthInfo, getDataSet, searchValueFormat, + sleep, toArray, + toastSuccess, toNumber, } from '@/utils/util'; @@ -154,6 +156,25 @@ Page({ }&title=${encodeURIComponent(item.goods_name)}`, }); }, + onDelete(e: any) { + const data = getDataSet(e); + const index = data.index; + const item = this.data.list[index]; + wx.showModal({ + title: '提示', + content: `确认删除 ${item.goods_name}?`, + success: (res) => { + if (res.confirm) { + post('ErpGoods/deleteGoods', { goods_id: JSON.stringify([item.goods_id]) }).then(() => { + toastSuccess('删除成功'); + sleep(() => { + this.getList(this.data.params.curr_page); + }, 1500); + }); + } + }, + }); + }, /** * 生命周期函数--监听页面加载 diff --git a/miniprogram/pages/other/goods/goods.wxml b/miniprogram/pages/other/goods/goods.wxml index 28ce935..1b3966d 100644 --- a/miniprogram/pages/other/goods/goods.wxml +++ b/miniprogram/pages/other/goods/goods.wxml @@ -41,7 +41,10 @@ - 子商品 + 查看 + + 删除 diff --git a/miniprogram/utils/menuConfig.ts b/miniprogram/utils/menuConfig.ts index e6048d6..7d96546 100644 --- a/miniprogram/utils/menuConfig.ts +++ b/miniprogram/utils/menuConfig.ts @@ -115,6 +115,11 @@ export const menuConfig = [ { title: '供应商', url: '/pages/base/supplier/supplier', auth: 'SF_ERP_SUPPLIER_VIEW' }, { title: '经销商', url: '/pages/base/customer/customer', auth: 'SF_ERP_CUSTOMER_VIEW' }, { title: '结算账户', url: '/pages/base/account/account', auth: 'SF_ERP_ACCOUNT_VIEW' }, + { + title: '流程配置', + url: '/pages/base/processConfig/processConfig', + auth: 'SF_PROCESS_CONFIG_VIEW', + }, ], }, {