From 2d52775207126701e6d3d780d17f9f5cd1eb87cb Mon Sep 17 00:00:00 2001 From: FOAM <491460741@qq.com> Date: Tue, 16 Sep 2025 14:59:01 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/area.js | 2 +- src/api/billType.js | 9 +- src/api/bomAccount.js | 9 +- src/views/base-data/bomAccount/index.vue | 143 ++----- src/views/base-data/point/print_kw_x.vue | 1 + src/views/base-data/productionPlan/index.vue | 84 +--- src/views/business-asn/asn/index.vue | 25 +- src/views/business-asn/asn/viewAsnDetail.vue | 153 ++++---- src/views/business-asn/asn/viewXbDetail.vue | 365 +++++------------- src/views/business-asn/asn/xbrk.vue | 2 +- src/views/business-asn/xppRecord/index.vue | 18 +- src/views/business-asn/xppRecord/xppZztl.vue | 20 +- src/views/business-inv/inventory/index.vue | 15 + src/views/business-inv/inventory/invXb.vue | 16 + src/views/business-inv/inventory/invXt.vue | 16 + src/views/business-inv/inventory/invZz.vue | 16 + src/views/business-inv/inventoryLog/index.vue | 21 +- src/views/business-pick/pickDetail/index.vue | 23 +- src/views/business-pick/spareParts/index.vue | 80 ++-- src/views/generic-component/AreaSelect.vue | 84 ++++ src/views/generic-component/BigItemSelect.vue | 95 +++++ .../generic-component/BillTypeSelect.vue | 102 +++++ .../BomAccountPointSelect.vue | 4 +- src/views/generic-component/ItemSelect.vue | 30 +- src/views/generic-component/PointSelect.vue | 4 +- 25 files changed, 751 insertions(+), 586 deletions(-) create mode 100644 src/views/generic-component/AreaSelect.vue create mode 100644 src/views/generic-component/BigItemSelect.vue create mode 100644 src/views/generic-component/BillTypeSelect.vue diff --git a/src/api/area.js b/src/api/area.js index c5c001c..f5ca51e 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -47,4 +47,4 @@ export function edit(data) { }) } -export default { add, edit, del } +export default { add, edit, del, getAres, getAreas, queryAreaList } diff --git a/src/api/billType.js b/src/api/billType.js index 015fa29..ac7754b 100644 --- a/src/api/billType.js +++ b/src/api/billType.js @@ -7,6 +7,13 @@ export function getBillType() { }) } +export function queryBillTypeList(params) { + return request({ + url: 'api/billType/queryBillTypeList', + method: 'get', + params + }) +} export function add(data) { return request({ @@ -32,4 +39,4 @@ export function edit(data) { }) } -export default { add, edit, del } +export default { add, edit, del ,queryBillTypeList} diff --git a/src/api/bomAccount.js b/src/api/bomAccount.js index 9edb220..ac9bf79 100644 --- a/src/api/bomAccount.js +++ b/src/api/bomAccount.js @@ -15,6 +15,13 @@ export function queryBigItemByStationType(stationType) { }) } +export function queryByAreaId(areaId) { + return request({ + url: `api/bomAccount/queryByAreaId/${areaId}`, + method: 'get' + }) +} + export function queryItemByArea(areaId) { return request({ url: `api/bomAccount/queryItemByArea/${areaId}`, @@ -76,4 +83,4 @@ export function bomPrintBiaoQianList(dxw) { }) } -export default { add, edit, del, queryBomAccountPoints, bomPrintBiaoQianList,queryBomPrintListD,queryBomPrintListX } +export default { add, edit, del, queryBomAccountPoints, bomPrintBiaoQianList,queryBomPrintListD,queryBomPrintListX ,queryByAreaId} diff --git a/src/views/base-data/bomAccount/index.vue b/src/views/base-data/bomAccount/index.vue index d8fd0f6..646f07f 100644 --- a/src/views/base-data/bomAccount/index.vue +++ b/src/views/base-data/bomAccount/index.vue @@ -105,25 +105,11 @@ - - - - + + - - - - + + + + + - + + + + + + + + + + + + + - @@ -220,17 +226,9 @@ {{ dict.label.bp_type[scope.row.bp_type] }} --> - - - + - - - + @@ -269,10 +267,13 @@ import Link from "@/layout/components/Sidebar/Link.vue"; import excelUtil from "@/api/tools/excelUtil" import { formatDate } from '@/utils/commonUtils' import {mapGetters} from "vuex"; -const defaultForm = { id: null, bigItem: null, supplier: null,item: null, contents: null, singles: null, rArea: null, cArea: null, outType: null, station_type: null, bp_type: null, dept: null, enabled: null, createBy: null, updateBy: null, createTime: null, updateTime: null, description: null, ac: null, bonded: null, zPoint: { code: null }} +import ItemSelect from "@/views/generic-component/ItemSelect.vue"; +import BigItemSelect from "@/views/generic-component/BigItemSelect.vue"; +import PointSelect from "@/views/generic-component/PointSelect.vue"; +const defaultForm = { id: null, bigItem: null, supplier: null,item: null, contents: null, singles: null, rArea: null, zPoint:null,cArea: null, outType: null, station_type: null, bp_type: null, dept: null, enabled: null, createBy: null, updateBy: null, createTime: null, updateTime: null, description: null, ac: null, bonded: null,kyQz:null,tckw:null} export default { name: 'BomAccount', - components: {Link, DateRangePicker, pagination, crudOperation, rrOperation, udOperation }, + components: {PointSelect, ItemSelect,BigItemSelect, Link, DateRangePicker, pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], dicts: ['process_content', 'out_type', 'station_type', 'bp_type','bonded_type','ac_type','zdw_type'], cruds() { @@ -287,11 +288,6 @@ export default { return { headers: { 'Authorization': getToken() }, fileList: [], - // 下拉框 - bigItemList: [], - itemList: [], - rAreaList: [], - cAreaList: [], permission: { add: ['admin', 'bomAccount:add'], edit: ['admin', 'bomAccount:edit'], @@ -315,31 +311,18 @@ export default { bigItem: [ { required: true, message: '完成品品番不能为空', trigger: 'blur' } ], - outType: [ - { required: true, message: '出库类型不能为空', trigger: 'blur' } + item: [ + { required: true, message: '部品品番不能为空', trigger: 'blur' } + ], + zPoint: [ + { required: true, message: '货位不能为空', trigger: 'blur' } ], bonded: [ { required: true, message: '税别不能为空', trigger: 'blur' } - ], - bp_type: [ - { required: true, message: '部品种类不能为空', trigger: 'blur' } - ], - zPoint: [ - { required: true, message: '制造库位不能为空', trigger: 'blur' } - ], - rArea: [ - { required: true, message: '接受库区不能为空', trigger: 'blur' } - ], - cArea: [ - { required: true, message: '出库库区不能为空', trigger: 'blur' } ] }} }, mounted() { - this.getBigItemList() - this.getItemList() - this.getRAreaList() - this.getCAreaList() //计算界面高度 }, @@ -368,54 +351,6 @@ export default { [CRUD.HOOK.beforeRefresh]() { return true }, - getBigItemList() { - bigItem.getBigItem(1).then(res => { - this.bigItemList = res.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } - return obj - }) - }) - }, - getRAreaList() { - queryAreaList({enabled:true}).then(res=>{ - this.rAreaList = res - }) - // getAreas().then(res => { - // this.rAreaList = res.map(function(obj) { - // if (obj.hasChildren) { - // obj.children = null - // } - // return obj - // }) - // }) - }, - getCAreaList() { - queryAreaList({bexb:false,enabled:true}).then(res=>{ - this.cAreaList = res - }) - - // getAreas().then(res => { - // this.cAreaList = res.map(function(obj) { - // if (obj.hasChildren) { - // obj.children = null - // } - // return obj - // }) - // }) - }, - getItemList() { - getItemsList().then(res => { - this.itemList = res.map(function(obj) { - if (obj.hasChildren) { - obj.children = null - } - return obj - }) - }) - }, - saveBomPrintD() { console.log("打印中大物标签") queryBomPrintListD(this.crud.getQueryParams2()).then(res => { diff --git a/src/views/base-data/point/print_kw_x.vue b/src/views/base-data/point/print_kw_x.vue index a6f15bc..4768061 100644 --- a/src/views/base-data/point/print_kw_x.vue +++ b/src/views/base-data/point/print_kw_x.vue @@ -172,6 +172,7 @@ body { font-weight: bold; text-align: center; border: #000000 2px solid; + white-space: nowrap; } .td-item-value2{ diff --git a/src/views/base-data/productionPlan/index.vue b/src/views/base-data/productionPlan/index.vue index cbc5e2f..4690089 100644 --- a/src/views/base-data/productionPlan/index.vue +++ b/src/views/base-data/productionPlan/index.vue @@ -16,10 +16,7 @@ - - + - @@ -50,7 +45,7 @@ ref="upload" slot='right' style="float: right;padding-left: 5px" - :action="baseApi+'/api/productionPlan/import_data'" + :action="baseApi+'/api/importData/importProductionPlan'" :file-list="fileList" :on-success=handleSuccess :on-error="handleError" @@ -60,13 +55,13 @@ 导入 - 手工生成 - + --> - 批量耗用 @@ -112,15 +107,11 @@ - - - - - + - + @@ -183,58 +174,28 @@ :height="crud.tableHeight" @selection-change="crud.selectionChangeHandler" @select="selectTableM" @select-all="selectAllTableM" > - + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - + - - - - - - + + @@ -459,12 +420,9 @@ export default { this.productionPlanVo.id = data.id //起始单号 this.productionPlanVo.machineNo = data.machineNo - //工位 - this.productionPlanVo.workingStation = data.workingStation //工位名 - this.productionPlanVo.name = this.dict.label.station_type[data.workingStation] - console.log(this.productionPlanVo) - console.log(this.$options.dicts) + this.productionPlanVo.workingStation = data.rkArea.name + this.productionPlanVo.areaId = data.rkArea.id this.haoYongOnOff = true }, submitHaoYongForm() { diff --git a/src/views/business-asn/asn/index.vue b/src/views/business-asn/asn/index.vue index 5f38815..fd1b541 100644 --- a/src/views/business-asn/asn/index.vue +++ b/src/views/business-asn/asn/index.vue @@ -7,17 +7,11 @@ - - - - + + + @@ -101,7 +95,7 @@ - + @@ -242,7 +236,7 @@ - + @@ -304,6 +298,7 @@ import UploadExcelComponent from '@/components/UploadExcel/index.vue' import {cancelReceiv} from "@/api/xppRecord"; import BomAccountPointSelect from "@/views/generic-component/BomAccountPointSelect.vue"; import PointSelect from "@/views/generic-component/PointSelect.vue"; +import AreaSelect from "@/views/generic-component/AreaSelect.vue"; const defaultForm = { id: null, @@ -336,6 +331,7 @@ const defaultForm = { export default { name: 'Asn', components: { + AreaSelect, PointSelect, BomAccountPointSelect, pagination, crudOperation, rrOperation, udOperation, DateRangePicker, UploadExcelComponent}, @@ -598,6 +594,9 @@ export default { getChangeVule(dben) { this.plsjForm.pointId = dben.id; }, + getChangeAreaVule(dben) { + this.query.areaCode = dben.code; + }, // 导入相关方法 diff --git a/src/views/business-asn/asn/viewAsnDetail.vue b/src/views/business-asn/asn/viewAsnDetail.vue index bae719b..e8322d6 100644 --- a/src/views/business-asn/asn/viewAsnDetail.vue +++ b/src/views/business-asn/asn/viewAsnDetail.vue @@ -3,78 +3,67 @@
-
+
-
- - - - - -
-
- - - - - -
-
- - - - -
-
-
-
+ + + + + + + + + + + + + + + + + + + - + -
-
+ + - + -
-
-
+ + + + + + + + + + + + + + +
提交
-
- -
-
- - - - -
- 取消上架 - + --> -
+
-
- - - - + + + + + + + + + -
-
- - - - - -
-
- - - - -
-
-
-
- - - -
-
- - - -
-
-
+ + + + + + + + + + + + + + + + + + + +
提交
-
- -
-
- - - - -
@@ -82,18 +59,7 @@ @click="rkAndQxButtonM(1)" :loading="logining1" > - 整单入库 - - - 单一入库 + 整单上架 - 取消收货 + 取消上架 - 导入 - + --> - - - - - - - - - - - - - - - - - - - - - -
- 取 消 - 确认 -
- - - - - - {{ item.code }} - {{ item.name }} - - + + - - + + - - - - + + - - + + + + + + + +
@@ -210,47 +122,15 @@ @selection-change="crud.selectionChangeHandler" :height="crud.tableHeight" > - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -291,16 +171,26 @@ import { getBillType } from '@/api/billType' import crudAsn from '@/api/asn' import { queryBomAccountList } from '@/api/bomAccount' import {mapGetters} from "vuex"; +import PointSelect from "@/views/generic-component/PointSelect.vue"; +import BillTypeSelect from "@/views/generic-component/BillTypeSelect.vue"; +import ItemSelect from "@/views/generic-component/ItemSelect.vue"; +import BomAccountPointSelect from "@/views/generic-component/BomAccountPointSelect.vue"; const defaultForm = { id: null, asn: null, - item: null, + item: {id:null,code:null,name:null}, + bom_account_id: null, + item_code:null, + item_name:null, + item_id:null, + zzkw_code:null, + point_id:null, stock: null, lineNo: null, po: null, status: 'OPEN', - point: null, + point: {id:null,code:null}, orderQty: 0, receivedQty: 0, moveQty: 0, @@ -329,9 +219,13 @@ const asnQuery = { } export default { name: 'viewXbDetail', - components: { DateRangePicker, AsnTask, Search, pagination, crudOperation, rrOperation, udOperation }, + components: { + BomAccountPointSelect, + ItemSelect, + BillTypeSelect, + PointSelect, DateRangePicker, AsnTask, Search, pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], - dicts: ['asn_status'], + dicts: ['asn_status','bonded_type'], cruds() { return CRUD({ title: '收货数据', @@ -376,8 +270,8 @@ export default { del: ['admin', 'asnDetail:del'] }, rules: { - area: [ - { required: true, message: '出库库区不能为空', trigger: 'blur' } + cusCode: [ + { required: true, message: '箱单号不能为空', trigger: 'blur' } ], orderDate: [{ required: true, message: '订单日期不能为空', trigger: 'blur' @@ -387,9 +281,6 @@ export default { }] }, asnDetailRules: { - item: [ - { required: true, message: '物料不能为空', trigger: 'blur' } - ], orderQty: [ { required: true, message: '订单数量不能为空', trigger: 'blur' } ] @@ -457,17 +348,7 @@ export default { // clearInterval(this.clearTimeSet); // }, mounted() { - //查询公用的下拉数据 - this.getOnceOptionAll() - //判断是否是新增主表和是查看明细新政附表 - // setTimeout(() => { - // // 方法区 - // this.asnTF() - // this.crud.toQuery() - // }, 100); - // this.asnTF() - //定时查询 1000 为1s - // this.setTime(); + }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 @@ -489,38 +370,6 @@ export default { //存当前时间 this.asnFrom.orderDate = `${year}-${month}-${day}` }, - //查询库位 - getPointList(code, data) { - if (data.area.bexb) { - this.pointTF=true; - let selectDate = { rAreaCode: null, itemCode: null } - selectDate.rAreaCode = data.area.code - selectDate.itemCode = code - // if (selectDate.rAreaCode === null) { - // if (selectDate.rAreaCode === null) { - // this.$message.error('主表未绑定库区') - // return - // } - queryBomAccountList(selectDate).then(res => { - this.pointOptions = [] - if (res != null) { - console.log(res) - let data_ = [] - for (const re of res) { - data_.push(re.zPoint) - } - this.pointOptions = this.filterListObj(data_) - } - if (!(this.pointOptions.length > 0)) { - queryPointList({ code: 'ZZKW' }).then(re => { - this.pointOptions = re - }) - } - }) - }else { - this.pointTF=false; - } - }, //过滤重复数据 filterListObj(listObj) { let date = [] @@ -538,32 +387,6 @@ export default { }) return date }, - //查询公用的下拉数据 - getOnceOptionAll() { - //物料数据 - queryItemAll({}).then(res => { - this.itemOptions = res - }).catch(e => { - this.$message({ - showClose: true, - message: '物料加载失败', - type: 'error' - }) - }) - //获取库区数据 - getAreas().then(res => { - this.areaOptions = res - }) - //单据类型 - getBillType().then(res => { - this.billTypeOptions = res - for (const re of res) { - if (re.code === 'RK') { - this.asnFrom.billType = re - } - } - }) - }, //判断是否是新增主表和是查看明细新政附表 asnTF() { if (this.asnId != 0) { @@ -574,8 +397,6 @@ export default { //将主表数据在新增哪里展示 this.asnFrom = res asnQuery.asnId = res.id - //查询点位数据 - this.pointTF = res.area.bexb // if (res.area.besh){ // this.getPointList(res) // } @@ -596,7 +417,7 @@ export default { this.asnTF() this.$message.success('添加成功') // this.crud.toQuery() - this.$router.push({ path: '/business-asn/viewAsnDetail', query: { ids: res.id } }) + this.$router.push({ path: '/business-asn/viewXbDetail', query: { ids: res.id } }) }) } else { return false @@ -662,6 +483,16 @@ export default { this.asnDetailButton.asnDetailDataS = data this.rkAndQxButtonM(3) }, + getChangeVule(dben) { + this.form.orderQty=dben.srs; + this.form.item.code=dben.item_code; + this.form.item.name=dben.item_name; + this.form.sourceId=dben.bom_account_id + this.form.item.id=dben.item_id; + this.form.point.id=dben.zzkw_id; + this.form.point.code=dben.zzkw_code; + this.form.propC2=dben.bonded; + }, handleSuccess(response, file, fileList) { this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.$refs.upload.clearFiles() diff --git a/src/views/business-asn/asn/xbrk.vue b/src/views/business-asn/asn/xbrk.vue index 05117de..46bef57 100644 --- a/src/views/business-asn/asn/xbrk.vue +++ b/src/views/business-asn/asn/xbrk.vue @@ -385,7 +385,7 @@ export default { name: 'Xbrk', components: {pagination, crudOperation, rrOperation, udOperation, DateRangePicker, UploadExcelComponent}, mixins: [presenter(), header(), form(defaultForm), crud()], - dicts: ['asn_status'], + dicts: ['asn_status','bonded_type'], cruds() { return CRUD({ title: 'asn', url: 'api/asn', idField: 'id', sort: 'id,desc', crudMethod: {...crudAsn}, optShow: { diff --git a/src/views/business-asn/xppRecord/index.vue b/src/views/business-asn/xppRecord/index.vue index f66d1cb..706d14a 100644 --- a/src/views/business-asn/xppRecord/index.vue +++ b/src/views/business-asn/xppRecord/index.vue @@ -40,6 +40,22 @@ :value="item.value" /> + + + + + + @@ -116,6 +132,8 @@ + + - + + @@ -146,7 +163,7 @@ export default { name: 'InventoryLog', components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation}, mixins: [presenter(), header(), form(defaultForm), crud()], - dicts: ['inv_log_type', 'inc_dec'], + dicts: ['inv_log_type', 'inc_dec','bonded_type'], cruds() { return CRUD({ title: 'inventoryLog', url: 'api/inventoryLog', idField: 'id', sort: 'id,desc', crudMethod: {...crudInventoryLog}, diff --git a/src/views/business-pick/pickDetail/index.vue b/src/views/business-pick/pickDetail/index.vue index c2b09e0..0c37dae 100644 --- a/src/views/business-pick/pickDetail/index.vue +++ b/src/views/business-pick/pickDetail/index.vue @@ -94,7 +94,9 @@ + + @@ -129,7 +131,7 @@ - + @@ -141,13 +143,15 @@ - + + + - + + + @@ -220,13 +224,16 @@ export default { radio3: '未拣货', items: [], cxjlFromFlag: false, - cxjlFrom: { bom_account_id: null,order_qty:0, item_code:null, item_name:null, zzkw_id:null, zzkw_code:null, gw_code:null, gw_name:null, status:null, remark:null,srs:0 }, + cxjlFrom: { bom_account_id: null,order_qty:0, item_code:null, item_name:null, zzkw_id:null, bonded:null,zzkw_code:null, gw_code:null, gw_name:null, status:null, remark:null,srs:0,beXdPf:false }, permission: { }, rules: { item: [ - {required: true, message: '物料必填', trigger: 'blur'} + {required: true, message: '品番必填', trigger: 'blur'} + ], + zzkwCode: [ + {required: true, message: '制造库位必填', trigger: 'blur'} ] }, itemListData: [], @@ -370,9 +377,11 @@ export default { this.cxjlFrom.item_id=dben.item_id; this.cxjlFrom.zzkw_id=dben.zzkw_id; this.cxjlFrom.rk_id=dben.rk_id; + this.cxjlFrom.bonded=dben.bonded; }, btnZzjl() { + console.log(this.cxjlFrom) zzjl(this.cxjlFrom).then(res => { if (res.status == 200) { this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS) diff --git a/src/views/business-pick/spareParts/index.vue b/src/views/business-pick/spareParts/index.vue index 2d203bc..c8f2355 100644 --- a/src/views/business-pick/spareParts/index.vue +++ b/src/views/business-pick/spareParts/index.vue @@ -4,16 +4,17 @@
- - - + + - + />--> @@ -71,7 +72,7 @@ :title="crud.status.title" width="500px" @close="fromeClose()" > - + + + - - + + + + - - - + + + @@ -26,7 +30,7 @@ export default { value: null, // v-model placeholder: { type: String, - default: '请选择物料' + default: '请选择部品品番' }, filterable: { type: Boolean, @@ -40,7 +44,7 @@ export default { type: Boolean, default: true }, - style: { + styles: { type: String, default: 'width: 200px;' } @@ -48,6 +52,7 @@ export default { data() { return { items: [], + filteredItems: [], selected: this.value } }, @@ -63,14 +68,27 @@ export default { methods: { fetchItems() { if (this.items.length === 0) { - crudItem.getItemsList({ enabled: this.isEnabled }).then(res => { + getItemsList({ enabled: this.isEnabled }).then(res => { this.items = res + this.filteredItems = [...this.items]; }) } }, onChange(val) { this.$emit('change', val) - } + }, + filterMethod(query) { + if (!query) { + this.filteredItems = [...this.items]; + return; + } + + const lowerQuery = query.toLowerCase(); + this.items = this.filteredItems.filter(item => + item.code.toLowerCase().includes(lowerQuery) || + item.name.toLowerCase().includes(lowerQuery) + ); + }, } } diff --git a/src/views/generic-component/PointSelect.vue b/src/views/generic-component/PointSelect.vue index d564bd4..a4b3638 100644 --- a/src/views/generic-component/PointSelect.vue +++ b/src/views/generic-component/PointSelect.vue @@ -65,10 +65,10 @@ export default { value(val) { this.selected = val }, -/* selected(val) { + selected(val) { this.$emit('input', val) this.$emit('change', val) - }*/ + } }, methods: { fetchItems() {