diff --git a/.prettierrc.json b/.prettierrc.json index ad0351a..9b44b26 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,5 @@ { - "tabWidth": 4, + "tabWidth": 2, "singleQuote": true, "semi": false, "printWidth": 100, diff --git a/src/pages.json b/src/pages.json index 2763d39..83dd5f9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -12,7 +12,7 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "业务办理" + "navigationBarTitleText": "首页" } }, // 工作台 @@ -36,6 +36,20 @@ "navigationBarTitleText": "我的" } }, + // 工器具领料 + { + "path": "pages/toolsLease/toolsLease", + "style": { + "navigationStyle": "custom" + } + }, + // 工器具领料-新增 + { + "path": "pages/toolsLease/toolsLeaseAdd", + "style": { + "navigationStyle": "custom" + } + }, /* 新购及其页面 */ // 验收 { @@ -548,22 +562,22 @@ "list": [ { "pagePath": "pages/index/index", - "text": "业务办理", - "iconPath": "static/yeWuBanLi.png", - "selectedIconPath": "static/yeWuBanLiSelected.png" - }, - { - "pagePath": "pages/work/index", - "text": "工作台", - "iconPath": "static/work.png", - "selectedIconPath": "static/workSelected.png" - }, - { - "pagePath": "pages/search/index", - "text": "查询", - "iconPath": "static/search.png", - "selectedIconPath": "static/searchSelected.png" + "text": "首页", + "iconPath": "static/home.png", + "selectedIconPath": "static/homeSelected.png" }, + // { + // "pagePath": "pages/work/index", + // "text": "工作台", + // "iconPath": "static/work.png", + // "selectedIconPath": "static/workSelected.png" + // }, + // { + // "pagePath": "pages/search/index", + // "text": "查询", + // "iconPath": "static/search.png", + // "selectedIconPath": "static/searchSelected.png" + // }, { "pagePath": "pages/my/index", "text": "我的", diff --git a/src/pages/business/leaseApply.vue b/src/pages/business/leaseApply.vue index f62bf05..0dcc62a 100644 --- a/src/pages/business/leaseApply.vue +++ b/src/pages/business/leaseApply.vue @@ -2,15 +2,19 @@
- - + + + - - - + @@ -137,13 +141,13 @@ import { ref, reactive } from 'vue' import eselect from '@/components/tree-select/eselect.vue' import { onLoad,onReady } from '@dcloudio/uni-app' -import { getUnitList,getProjectList,getConfigList,getLevelThreeType,insertApp,getAgreementInfoById,getListsByConfigId,getTypeDataList,leaseTask } from '../../services/back.js'; +import { getBmTeamList,getProjectList,getConfigList,getLevelThreeType,insertApp,getAgreementInfoById,getListsByConfigId,getTypeDataList,leaseTask } from '@/services/back.js'; const taskInfo = ref({}) const treeSelect = ref(null) const treeSelect2 = ref(null) const formData = ref({ value: { - unitId: '', + teamId: '', proId: '', leasePerson: '', phone: '', @@ -233,11 +237,22 @@ const getUnit = () => { let obj = { projectId: proId.value, } - getUnitList(obj) + getBmTeamList() .then((res) => { - console.log(res) - unitList.value = res.data - // getAgreement() + console.log('🚀 ~ .班组 ~ res:', res) + // unitList.value = res.data + if (res.data.rows.length > 0) { + unitList.value = res.data.rows.map(option => { + return { + value: option.id, + text: option.teamName, + } + }) + } else { + unitList.value = [] + } + console.log('🚀 ~ getUnit ~ unitList.value:', unitList.value) + if (unitId.value && proId.value) { getAgreement() } @@ -247,20 +262,20 @@ const getUnit = () => { }) } //工程 -const getProject = async (e) => { - flagFile.value = false - if (e.typeKey == 'fbs') { - flagFile.value = true - } - console.log('🚀 ~ getProject ~ e:', e) - unitId.value = e?.id || '' - formData.value.unitId = e?.id || '' - let obj = { - unitId: unitId.value, - // "isApp":true - } +const getProject = async () => { + // flagFile.value = false + // if (e.typeKey == 'fbs') { + // flagFile.value = true + // } + // console.log('🚀 ~ getProject ~ e:', e) + // unitId.value = e?.id || '' + // formData.value.unitId = e?.id || '' + // let obj = { + // unitId: unitId.value, + // // "isApp":true + // } try { - const res = await getProjectList(obj); + const res = await getProjectList({}); proList.value = res.data; // proId.value="" // treeSelect2.value.clearInput(); @@ -449,19 +464,20 @@ const submitNum = async() => { }) return } - for (let i = 0; i < typeList.value.length; i++) { - if (typeList.value[i].preNum <= 0 || !typeList.value[i].preNum) { - uni.showToast({ - title: '预领数量不能为空或等于0', - icon: 'none', - duration: 1000 - }) - return - } - } + // for (let i = 0; i < typeList.value.length; i++) { + // if (typeList.value[i].preNum <= 0 || !typeList.value[i].preNum) { + // uni.showToast({ + // title: '预领数量不能为空或等于0', + // icon: 'none', + // duration: 1000 + // }) + // return + // } + // } let obj = { "leaseApplyInfo":{ "unitId":unitId.value, + "teamId":formData.value.teamId, "projectId":proId.value, "agreementId":agreementId.value, "leasePerson":formData.value.leasePerson, diff --git a/src/pages/index/index-old.vue b/src/pages/index/index-old.vue new file mode 100644 index 0000000..aee37eb --- /dev/null +++ b/src/pages/index/index-old.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 4042f2c..d9ea43b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,233 +1,453 @@ - diff --git a/src/pages/picking/outbound/details.vue b/src/pages/picking/outbound/details.vue index 2c310f9..8b2b663 100644 --- a/src/pages/picking/outbound/details.vue +++ b/src/pages/picking/outbound/details.vue @@ -323,6 +323,7 @@ const options2 = ref([ // 点击滑动按钮 const onClick = (e, item) => { console.log("tttttttttt",e,item) + console.log('🚀 ~ onClick ~ taskStatus.value:', taskStatus.value) if(taskStatus.value==3){//出库进行中 console.log("333333333333333333333333333") if (e.index === 0) { diff --git a/src/pages/picking/outbound/index.vue b/src/pages/picking/outbound/index.vue index 6bf1b0f..fa4f383 100644 --- a/src/pages/picking/outbound/index.vue +++ b/src/pages/picking/outbound/index.vue @@ -52,8 +52,8 @@ {{ item.code }}
@@ -132,7 +132,7 @@ const queryParams = ref({ startTime: '', // 开始时间 endTime: '', // 结束时间 keyWord: '', // 关键字 - statusList: [3], // 状态 + statusList: [1], // 状态 pageNum: 1, pageSize: 3, }) @@ -222,7 +222,7 @@ const changeTab = (index) => { queryParams.value.pageNum = 1 getTableList(true) } else if (index == 1) { - queryParams.value.statusList = [3] // 查未完成的 + queryParams.value.statusList = [1] // 查未完成的 queryParams.value.pageNum = 1 getTableList(true) } diff --git a/src/pages/toolsLease/toolsLease.vue b/src/pages/toolsLease/toolsLease.vue new file mode 100644 index 0000000..9b17bb1 --- /dev/null +++ b/src/pages/toolsLease/toolsLease.vue @@ -0,0 +1,244 @@ + + + + + diff --git a/src/pages/toolsLease/toolsLeaseAdd.vue b/src/pages/toolsLease/toolsLeaseAdd.vue new file mode 100644 index 0000000..6c7f473 --- /dev/null +++ b/src/pages/toolsLease/toolsLeaseAdd.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/src/services/back.js b/src/services/back.js index 26b4dd3..7859a09 100644 --- a/src/services/back.js +++ b/src/services/back.js @@ -196,7 +196,7 @@ export const getDetailsByIdApi = (data) => { export const leaseTask = (data) => { return http({ method: 'POST', - url: '/material/leaseTask', + url: '/material/lease_apply_info', data:data, }) } @@ -262,4 +262,13 @@ export const directEdit = (data) => { url: '/material/slt_agreement_reduce/addApply', data:data, }) +} + +// 班组-下拉 +export const getBmTeamList = (data) => { + return http({ + method: 'GET', + url: '/material/bmTeam/list', + data, + }) } \ No newline at end of file diff --git a/src/services/picking/outbound.js b/src/services/picking/outbound.js index 1e3bd9c..79bcf03 100644 --- a/src/services/picking/outbound.js +++ b/src/services/picking/outbound.js @@ -10,6 +10,14 @@ export const getPickingOutboundListAPI = (data) => { data, }) } +// 删除 +export const deleteLeaseApplyApi = (id) => { + return http({ + method: 'delete', + url: `/material/lease_apply_info/${id}`, + data: id + }) +} /** * 领料出库 ---- 任务详情 */ diff --git a/src/static/bfsh.png b/src/static/bfsh.png new file mode 100644 index 0000000..57c0d71 Binary files /dev/null and b/src/static/bfsh.png differ diff --git a/src/static/bg1.jpg b/src/static/bg1.jpg new file mode 100644 index 0000000..6171f4f Binary files /dev/null and b/src/static/bg1.jpg differ diff --git a/src/static/bgd.png b/src/static/bgd.png new file mode 100644 index 0000000..16eedc7 Binary files /dev/null and b/src/static/bgd.png differ diff --git a/src/static/exitMaterial.png b/src/static/exitMaterial.png new file mode 100644 index 0000000..8749843 Binary files /dev/null and b/src/static/exitMaterial.png differ diff --git a/src/static/fetchMaterialOutStore.png b/src/static/fetchMaterialOutStore.png new file mode 100644 index 0000000..9ec7aae Binary files /dev/null and b/src/static/fetchMaterialOutStore.png differ diff --git a/src/static/llsp.png b/src/static/llsp.png new file mode 100644 index 0000000..26e39d4 Binary files /dev/null and b/src/static/llsp.png differ diff --git a/src/static/materialsBack.png b/src/static/materialsBack.png new file mode 100644 index 0000000..5bacd4e Binary files /dev/null and b/src/static/materialsBack.png differ diff --git a/src/static/materialsLease.png b/src/static/materialsLease.png new file mode 100644 index 0000000..18a6d61 Binary files /dev/null and b/src/static/materialsLease.png differ diff --git a/src/static/notice.png b/src/static/notice.png new file mode 100644 index 0000000..5dada37 Binary files /dev/null and b/src/static/notice.png differ diff --git a/src/static/sysh.png b/src/static/sysh.png new file mode 100644 index 0000000..fe7b582 Binary files /dev/null and b/src/static/sysh.png differ diff --git a/src/static/tlsp.png b/src/static/tlsp.png new file mode 100644 index 0000000..af1d783 Binary files /dev/null and b/src/static/tlsp.png differ diff --git a/src/static/toolsBack.png b/src/static/toolsBack.png new file mode 100644 index 0000000..66eb0df Binary files /dev/null and b/src/static/toolsBack.png differ diff --git a/src/static/toolsLease.png b/src/static/toolsLease.png new file mode 100644 index 0000000..443a776 Binary files /dev/null and b/src/static/toolsLease.png differ diff --git a/src/utils/http.js b/src/utils/http.js index ca8ed9c..40ad108 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -7,10 +7,11 @@ import { useMemberStore } from '@/stores' */ const ENV = process.env.NODE_ENV // export const baseURL = ENV === 'development' ? 'http://192.168.0.244:18580' : 'http://192.168.0.244:18580'//测试 - 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' ? '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.1.117:18080' : 'http://192.168.1.117:18080'//马 +console.log('🚀 ~ baseURL:', baseURL) // export const baseURL = ENV === 'development' ? '/api' : '***' // **********OCR识别为NVUE文件页面请求URL需要同步配置********** diff --git a/vite.config.js b/vite.config.js index 826fe19..2452440 100644 --- a/vite.config.js +++ b/vite.config.js @@ -22,8 +22,8 @@ export default defineConfig({ '/api': { // target: 'http://192.168.2.76:18080', // target: 'http://192.168.0.244:18580', - target: 'http://36.33.26.201:19988/prod-api/', - // target: 'http://192.168.0.234:18080', + // target: 'http://36.33.26.201:19988/prod-api/', + target: 'http://192.168.1.117:18080', // target: 'http://localhost:18080', changeOrigin: true, rewrite: (path) => {