From d90ff208757ba5c1eae29e9c88dac9d9415527e5 Mon Sep 17 00:00:00 2001 From: wx-jincw Date: Sun, 5 Apr 2026 17:42:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=89=A9=E8=B5=84=E9=A2=86=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/property.js | 36 + app/config/app.js | 8 +- app/pages/supply_chain/complaint/index.vue | 2 +- .../supply_chain/material_receipt/index.vue | 642 +++++++++++++++--- app/pages/supply_chain/repair/index.vue | 2 +- app/pages/supply_chain/stock/detail.vue | 3 +- app/pages/supply_chain/supply_query/index.vue | 2 +- app/pages/supply_chain/wish_menu/index.vue | 6 +- app/uni_modules/uni-popup/changelog.md | 104 +++ .../components/uni-popup-dialog/keypress.js | 45 ++ .../uni-popup-dialog/uni-popup-dialog.vue | 330 +++++++++ .../uni-popup-message/uni-popup-message.vue | 143 ++++ .../uni-popup-share/uni-popup-share.vue | 188 +++++ .../components/uni-popup/i18n/en.json | 7 + .../components/uni-popup/i18n/index.js | 8 + .../components/uni-popup/i18n/zh-Hans.json | 7 + .../components/uni-popup/i18n/zh-Hant.json | 7 + .../components/uni-popup/keypress.js | 45 ++ .../uni-popup/components/uni-popup/popup.js | 26 + .../components/uni-popup/uni-popup.uvue | 90 +++ .../components/uni-popup/uni-popup.vue | 518 ++++++++++++++ app/uni_modules/uni-popup/package.json | 108 +++ app/uni_modules/uni-popup/readme.md | 15 + app/uni_modules/uni-scss/changelog.md | 8 + app/uni_modules/uni-scss/index.scss | 1 + app/uni_modules/uni-scss/package.json | 82 +++ app/uni_modules/uni-scss/readme.md | 4 + app/uni_modules/uni-scss/styles/index.scss | 7 + .../uni-scss/styles/setting/_border.scss | 3 + .../uni-scss/styles/setting/_color.scss | 66 ++ .../uni-scss/styles/setting/_radius.scss | 55 ++ .../uni-scss/styles/setting/_space.scss | 56 ++ .../uni-scss/styles/setting/_styles.scss | 167 +++++ .../uni-scss/styles/setting/_text.scss | 24 + .../uni-scss/styles/setting/_variables.scss | 146 ++++ .../uni-scss/styles/tools/functions.scss | 19 + app/uni_modules/uni-scss/theme.scss | 31 + app/uni_modules/uni-scss/variables.scss | 62 ++ app/uni_modules/uni-transition/changelog.md | 31 + .../uni-transition/createAnimation.js | 131 ++++ .../uni-transition/uni-transition.vue | 292 ++++++++ app/uni_modules/uni-transition/package.json | 112 +++ app/uni_modules/uni-transition/readme.md | 11 + 43 files changed, 3540 insertions(+), 110 deletions(-) create mode 100644 app/uni_modules/uni-popup/changelog.md create mode 100644 app/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js create mode 100644 app/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue create mode 100644 app/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue create mode 100644 app/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue create mode 100644 app/uni_modules/uni-popup/components/uni-popup/i18n/en.json create mode 100644 app/uni_modules/uni-popup/components/uni-popup/i18n/index.js create mode 100644 app/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json create mode 100644 app/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json create mode 100644 app/uni_modules/uni-popup/components/uni-popup/keypress.js create mode 100644 app/uni_modules/uni-popup/components/uni-popup/popup.js create mode 100644 app/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue create mode 100644 app/uni_modules/uni-popup/components/uni-popup/uni-popup.vue create mode 100644 app/uni_modules/uni-popup/package.json create mode 100644 app/uni_modules/uni-popup/readme.md create mode 100644 app/uni_modules/uni-scss/changelog.md create mode 100644 app/uni_modules/uni-scss/index.scss create mode 100644 app/uni_modules/uni-scss/package.json create mode 100644 app/uni_modules/uni-scss/readme.md create mode 100644 app/uni_modules/uni-scss/styles/index.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_border.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_color.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_radius.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_space.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_styles.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_text.scss create mode 100644 app/uni_modules/uni-scss/styles/setting/_variables.scss create mode 100644 app/uni_modules/uni-scss/styles/tools/functions.scss create mode 100644 app/uni_modules/uni-scss/theme.scss create mode 100644 app/uni_modules/uni-scss/variables.scss create mode 100644 app/uni_modules/uni-transition/changelog.md create mode 100644 app/uni_modules/uni-transition/components/uni-transition/createAnimation.js create mode 100644 app/uni_modules/uni-transition/components/uni-transition/uni-transition.vue create mode 100644 app/uni_modules/uni-transition/package.json create mode 100644 app/uni_modules/uni-transition/readme.md diff --git a/app/api/property.js b/app/api/property.js index 0b864fd..5692e29 100644 --- a/app/api/property.js +++ b/app/api/property.js @@ -136,3 +136,39 @@ export function updateMaintenanceOrderStatus(data) { ); } +// 物资列表 +export function listCkstock() { + return request.get( + 'autogencode/ckcargostock/listCkstock', + {}, + { useAdminUrl: true } + ); +} + +// 提交领用申请 +export function quickOutBill(data) { + return request.post( + 'autogencode/ckbill/quickOutBill', + data, + { useAdminUrl: true } + ); +} + +// 获取领用记录列表 +export function stockPageList(params) { + return request.get( + 'autogencode/ckbill/stockPageList', + params, + { useAdminUrl: true } + ); +} + +// 取消单据 +export function cancelBill(id) { + return request.get( + `autogencode/ckbill/cancelBill/${id}`, + {}, + { useAdminUrl: true } + ); +} + diff --git a/app/config/app.js b/app/config/app.js index eadf9eb..8a9fc51 100644 --- a/app/config/app.js +++ b/app/config/app.js @@ -8,8 +8,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- //移动端商城API -// let domain = 'https://fzbfwy.com/mobile-api' -let domain = 'http://crmebxcx.test.jiutianda.cn' +let domain = 'https://fzbfwy.com/mobile-api' +// let domain = 'http://crmebxcx.test.jiutianda.cn' module.exports = { // 请求域名 格式: https://您的域名 @@ -18,8 +18,8 @@ module.exports = { // #ifdef MP HTTP_REQUEST_URL: domain, // #endif - HTTP_ADMIN_URL:'https://crmeb.test.jiutianda.cn', - // HTTP_ADMIN_URL:'https://fzbfwy.com/prod-api', //PC后台的API请求地址,上传图片用,影响h5上传头像 + // HTTP_ADMIN_URL:'https://crmeb.test.jiutianda.cn', + HTTP_ADMIN_URL:'https://fzbfwy.com/prod-api', //PC后台的API请求地址,上传图片用,影响h5上传头像 // #ifdef H5 //H5接口是浏览器地址 // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, diff --git a/app/pages/supply_chain/complaint/index.vue b/app/pages/supply_chain/complaint/index.vue index 1f4ff47..27bb18e 100644 --- a/app/pages/supply_chain/complaint/index.vue +++ b/app/pages/supply_chain/complaint/index.vue @@ -458,7 +458,7 @@ export default { .tabs { padding: 0 30rpx; display: flex; - margin-bottom: 30rpx; + margin-bottom: 15rpx; background-color: #fff; border-radius: 10rpx; box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1); diff --git a/app/pages/supply_chain/material_receipt/index.vue b/app/pages/supply_chain/material_receipt/index.vue index 4fda10a..2441705 100644 --- a/app/pages/supply_chain/material_receipt/index.vue +++ b/app/pages/supply_chain/material_receipt/index.vue @@ -24,24 +24,20 @@ - 物资名称 - - + 物资选择 + + + + {{ item.cargoName }} ({{ item.cargoSpec }}) + × + + + + {{ selectedMaterials.length > 0 ? '已选择 ' + selectedMaterials.length + ' 项' : '请选择物资' }} + - - 领用数量 - - - 领用用途