diff --git a/src/components/J-Picker/jPicker.vue b/src/components/J-Picker/jPicker.vue index 29293f7..d45fb1d 100644 --- a/src/components/J-Picker/jPicker.vue +++ b/src/components/J-Picker/jPicker.vue @@ -2,7 +2,7 @@ - {{ listData[nSel][showKey] || listData[nSel] }} + {{removeLeadingZeros(listData[nSel][showKey]) || removeLeadingZeros(listData[nSel]) }} {{ moren != undefined ? moren : $t('message.workArea_Selelct') }} @@ -47,6 +47,7 @@ + + \ No newline at end of file diff --git a/src/components/lanju/lj-pagination/index.vue b/src/components/lanju/lj-pagination/index.vue new file mode 100644 index 0000000..98991e7 --- /dev/null +++ b/src/components/lanju/lj-pagination/index.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/src/components/page-head/page-head.vue b/src/components/page-head/page-head.vue new file mode 100644 index 0000000..01ae9fb --- /dev/null +++ b/src/components/page-head/page-head.vue @@ -0,0 +1,78 @@ + + + + \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index d584c96..88ffef3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -26,6 +26,7 @@ import uniThead from '@/uni_modules/uni-table/components/uni-thead/uni-thead.vue import uniDataSelect from '@/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue'; import uniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue'; import MyMixins from './utils/mixin'; +import '@/static/styles/index.scss' // global css Vue.config.productionTip = false; diff --git a/src/pages.json b/src/pages.json index d57cfb2..b64500f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -663,6 +663,30 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/SapStock/index", + "style": { + "navigationBarTitleText": "实时库存", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/ProductSample/index", + "style": { + "navigationBarTitleText": "成品留样", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/quality/SampleCheck/index", + "style": { + "navigationBarTitleText": "留样复检", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/quality/ProductSample/index.vue b/src/pages/quality/ProductSample/index.vue new file mode 100644 index 0000000..913fb66 --- /dev/null +++ b/src/pages/quality/ProductSample/index.vue @@ -0,0 +1,184 @@ + + + diff --git a/src/pages/quality/ProductSample/model.ts b/src/pages/quality/ProductSample/model.ts new file mode 100644 index 0000000..e37d8f3 --- /dev/null +++ b/src/pages/quality/ProductSample/model.ts @@ -0,0 +1,31 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.ProductSample', +}) +export class ProductSample extends VuexModule { + list: any = []; + @MutationAction + async selectQcCheckSampleTaskList( query : any) : Promise<{ list : any }> { + const result: any = await http.get(url.lanjuquality.ProductSample.getQcCheckSampleTaskList, { + params: query, + }); + const list = result.rows; + return {list}; + } + + confirmCode: any = ''; + @MutationAction + async updateQcCheckSampleTask( data : any) : Promise<{ confirmCode : String }> { + const result: any = await http.put(url.lanjuquality.ProductSample.updateQcCheckSampleTask, data); + const confirmCode = result.code + return {confirmCode}; + } +} + +export default getModule(ProductSample); diff --git a/src/pages/quality/SampleCheck/index.vue b/src/pages/quality/SampleCheck/index.vue new file mode 100644 index 0000000..46757e7 --- /dev/null +++ b/src/pages/quality/SampleCheck/index.vue @@ -0,0 +1,229 @@ + + + diff --git a/src/pages/quality/SampleCheck/model.ts b/src/pages/quality/SampleCheck/model.ts new file mode 100644 index 0000000..ef5874f --- /dev/null +++ b/src/pages/quality/SampleCheck/model.ts @@ -0,0 +1,33 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.ProductSample', +}) +export class SampleCheck extends VuexModule { + list: any = []; + total: number = 0; + @MutationAction + async getQcWaitCheckSampleTaskList( query : any) : Promise<{ list : any , total : number }> { + const result: any = await http.get(url.lanjuquality.ProductSample.getQcWaitCheckSampleTaskList, { + params: query, + }); + const list = result.rows; + const total = result.total + return {list,total}; + } + + confirmCode: any = ''; + @MutationAction + async updateQcCheckSampleTask( data : any): Promise<{ confirmCode : any }> { + const result: any = await http.put(url.lanjuquality.ProductSample.updateQcCheckSampleTask, data); + const confirmCode = result.code + return {confirmCode}; + } +} + +export default getModule(SampleCheck); diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index ec9807a..f98557c 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -354,6 +354,10 @@ export default class receivePO extends BasePage { }); console.log('this.reducelist', this.reducelist); this.bimWl = this.reducelist[0]; + if (this.reducelist[0].waCode){ + this.areaCode = this.reducelist[0].waCode + await this.queryloc() + } this.oldprodlist = materilist.map((item) => { let newmaterialCode = item.materialCode.slice(item.materialCode.search(/[1-9]/)); return { diff --git a/src/pages/wms/Raw/SapStock/index.vue b/src/pages/wms/Raw/SapStock/index.vue new file mode 100644 index 0000000..4a061b1 --- /dev/null +++ b/src/pages/wms/Raw/SapStock/index.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/src/pages/wms/Raw/SapStock/model.ts b/src/pages/wms/Raw/SapStock/model.ts new file mode 100644 index 0000000..78437a8 --- /dev/null +++ b/src/pages/wms/Raw/SapStock/model.ts @@ -0,0 +1,34 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.raw.sapStockPo', +}) +export class sapStockPo extends VuexModule { + WlList = []; + rows: any = []; + total: Number = 0; + @MutationAction + async getSapStockList(data: any) : Promise<{ rows : any , total : Number}> { + const result: any = await http.get(url.lanjuwms.raw.SapStockPo.getSapStockList, { + params: data + }); + let rows: any; + let total: Number; + if (result.total > 0) { + rows = result.rows; + total = result.total; + } else { + rows = []; + total = 0; + } + return { rows , total}; + } + +} + +export default getModule(sapStockPo); diff --git a/src/static/styles/index.scss b/src/static/styles/index.scss new file mode 100644 index 0000000..dddf6d7 --- /dev/null +++ b/src/static/styles/index.scss @@ -0,0 +1,7 @@ +//main-container全局样式 +.page-product-receipt { + background: #f2f2f2 linear-gradient(0deg, #f2f2f2 0%, #f8262c 51%, #d9001b 100%) no-repeat; + background-size: 100% 600rpx; + padding: 118rpx 30rpx 162rpx; + min-height: 100%; +} \ No newline at end of file diff --git a/src/utils/page.ts b/src/utils/page.ts index 2104ccd..71b309b 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -48,5 +48,6 @@ export const page = { BatchOfflineStorage: '/pages/wms/product/BatchOfflineStorage/index', ArrivalRecord: '/pages/wms/Raw/ArrivalRecord/index', ProductionRecord: '/pages/wms/product/ProductionRecord/index', + SapStock: '/pages/wms/Raw/SapStock/index', }, }; diff --git a/src/utils/tool.ts b/src/utils/tool.ts new file mode 100644 index 0000000..51436fd --- /dev/null +++ b/src/utils/tool.ts @@ -0,0 +1,3 @@ +export function removeLeadingZeros(str : String) : String{ + return String(Number(str)) +} \ No newline at end of file diff --git a/src/utils/url.ts b/src/utils/url.ts index 8a3488e..9ff936d 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -191,6 +191,9 @@ export const url = { ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/listOdsProcureOutOrderTS', NewConMaterialOutSCNew: qianzhuione + '/wms/WmsToWCSmission/OdsProcureOutOrderTSCK', }, + SapStockPo: { + getSapStockList: qianzhuione + '/wms/matetowsn/saplist' + } }, WhiteManagement: { WhiteInstorage: { @@ -370,5 +373,13 @@ export const url = { // 根据工单获取批次下拉 getBatchList: qianzhuione + '/quality/handCheck/getBatchList', }, + //成品留样 + ProductSample:{ + //获取留样列表 + getQcCheckSampleTaskList: qianzhuione + '/quality/qc-check-sample-task/list', + //获取待复检样品列表 + getQcWaitCheckSampleTaskList: qianzhuione + '/quality/qc-check-sample-task/wait-list', + updateQcCheckSampleTask: qianzhuione + '/quality/qc-check-sample-task', + } }, };