diff --git a/src/pages.json b/src/pages.json index bbb0265..ca3e563 100644 --- a/src/pages.json +++ b/src/pages.json @@ -137,6 +137,12 @@ "navigationBarTitleText": "领料出库" } }, + { + "path": "pages/picking/outbound/sign", + "style": { + "navigationBarTitleText": "电子签名" + } + }, // 2. 详情 { "path": "pages/picking/outbound/details", diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 968617d..45a56a1 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -61,6 +61,7 @@ onMounted(async () => { uni.setStorageSync('username', loginForm.username) uni.setStorageSync('password', loginForm.password) uni.setStorageSync('id', res.user.userId) + uni.setStorageSync('deptName', res.user?.dept?.deptName) setTimeout(() => { uni.switchTab({ url: '/pages/index/index', @@ -87,6 +88,7 @@ const onHandleLogin = async () => { uni.setStorageSync('username', loginForm.username) uni.setStorageSync('password', loginForm.password) uni.setStorageSync('id', result.user.userId) + uni.setStorageSync('deptName', result.user?.dept?.deptName) setTimeout(() => { uni.switchTab({ url: '/pages/index/index', diff --git a/src/pages/new-purchase/accept/acceptDetails.vue b/src/pages/new-purchase/accept/acceptDetails.vue index fdd3180..a984d6c 100644 --- a/src/pages/new-purchase/accept/acceptDetails.vue +++ b/src/pages/new-purchase/accept/acceptDetails.vue @@ -13,11 +13,11 @@ - + - -
+ + +
+
- +
@@ -37,11 +40,10 @@ class="table-list-item" v-for="(item, index) in tableList" :key="index" - @click="handleItem(item)" >
- + 新购验收 @@ -97,16 +99,17 @@ + + diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue index fdd9aa1..cb4498d 100644 --- a/src/pages/work/index.vue +++ b/src/pages/work/index.vue @@ -174,6 +174,11 @@ const newPurchaseList = ref([ // 仓储 const pickingList = ref([ + { + title: '电子签名', + url: '/pages/picking/outbound/sign', + iconSrc: '../../static/workbench/backCreate.png', + }, { title: '领料出库', url: '/pages/picking/outbound/index', diff --git a/src/services/purchase.js b/src/services/purchase.js index cc324f2..fabd230 100644 --- a/src/services/purchase.js +++ b/src/services/purchase.js @@ -72,3 +72,12 @@ export const getMachineCode = (data)=> { data: data, }) } + +// 流程图 +export function getSignListApi(data) { + return http({ + url: '/material/purchase_check_info/getSignList', + method: 'get', + data + }) +} diff --git a/src/utils/http.js b/src/utils/http.js index 55aa3fd..5d22f13 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -10,7 +10,7 @@ const ENV = process.env.NODE_ENV // export const baseURL = ENV === 'development' ? 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/' : 'http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api/'//生产 export const baseURL = ENV === 'development' ? '/api' : '/iws/jiju-api'; // 宏源服务 // export const baseURL = ENV === 'development' ? 'http://192.168.0.234:18080' : '***' -// export const baseURL = ENV === 'development' ? 'http://192.168.2.27:18080' : 'http://192.168.2.27:18080'//马 +// export const baseURL = ENV === 'development' ? 'http://192.168.0.96:18080' : 'http://192.168.2.27:18080'//马 // export const baseURL = ENV === 'development' ? '/api' : '***' // **********OCR识别为NVUE文件页面请求URL需要同步配置**********