diff --git a/src/components/J-Picker/jPicker.vue b/src/components/J-Picker/jPicker.vue index d45fb1d..29293f7 100644 --- a/src/components/J-Picker/jPicker.vue +++ b/src/components/J-Picker/jPicker.vue @@ -2,7 +2,7 @@ - {{removeLeadingZeros(listData[nSel][showKey]) || removeLeadingZeros(listData[nSel]) }} + {{ listData[nSel][showKey] || listData[nSel] }} {{ moren != undefined ? moren : $t('message.workArea_Selelct') }} @@ -47,7 +47,6 @@ - - \ No newline at end of file diff --git a/src/components/lanju/lj-pagination/index.vue b/src/components/lanju/lj-pagination/index.vue deleted file mode 100644 index 98991e7..0000000 --- a/src/components/lanju/lj-pagination/index.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/page-head/page-head.vue b/src/components/page-head/page-head.vue deleted file mode 100644 index 01ae9fb..0000000 --- a/src/components/page-head/page-head.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 88ffef3..d584c96 100644 --- a/src/main.ts +++ b/src/main.ts @@ -26,7 +26,6 @@ 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 b64500f..d57cfb2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -663,30 +663,6 @@ "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 deleted file mode 100644 index 913fb66..0000000 --- a/src/pages/quality/ProductSample/index.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - diff --git a/src/pages/quality/ProductSample/model.ts b/src/pages/quality/ProductSample/model.ts deleted file mode 100644 index e37d8f3..0000000 --- a/src/pages/quality/ProductSample/model.ts +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 46757e7..0000000 --- a/src/pages/quality/SampleCheck/index.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - diff --git a/src/pages/quality/SampleCheck/model.ts b/src/pages/quality/SampleCheck/model.ts deleted file mode 100644 index ef5874f..0000000 --- a/src/pages/quality/SampleCheck/model.ts +++ /dev/null @@ -1,33 +0,0 @@ -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 f98557c..ec9807a 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -354,10 +354,6 @@ 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 deleted file mode 100644 index 4a061b1..0000000 --- a/src/pages/wms/Raw/SapStock/index.vue +++ /dev/null @@ -1,163 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/wms/Raw/SapStock/model.ts b/src/pages/wms/Raw/SapStock/model.ts deleted file mode 100644 index 78437a8..0000000 --- a/src/pages/wms/Raw/SapStock/model.ts +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index dddf6d7..0000000 --- a/src/static/styles/index.scss +++ /dev/null @@ -1,7 +0,0 @@ -//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 71b309b..2104ccd 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -48,6 +48,5 @@ 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 deleted file mode 100644 index 51436fd..0000000 --- a/src/utils/tool.ts +++ /dev/null @@ -1,3 +0,0 @@ -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 9ff936d..8a3488e 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -191,9 +191,6 @@ export const url = { ProductionMaterialRequisitionSC: qianzhuione + '/wms/WmsToWCSmission/listOdsProcureOutOrderTS', NewConMaterialOutSCNew: qianzhuione + '/wms/WmsToWCSmission/OdsProcureOutOrderTSCK', }, - SapStockPo: { - getSapStockList: qianzhuione + '/wms/matetowsn/saplist' - } }, WhiteManagement: { WhiteInstorage: { @@ -373,13 +370,5 @@ 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', - } }, };