diff --git a/klp-oa/klp-ui/src/components/KLPService/BomPanel/BomItem.vue b/klp-oa/klp-ui/src/components/KLPService/BomPanel/BomItem.vue index 7126648a..df0ebadf 100644 --- a/klp-oa/klp-ui/src/components/KLPService/BomPanel/BomItem.vue +++ b/klp-oa/klp-ui/src/components/KLPService/BomPanel/BomItem.vue @@ -73,7 +73,7 @@ @pagination="getList" /> - + @@ -119,7 +119,7 @@ export default { showSearch: true, // 总条数 total: 0, - // BOM 明细,存放属性–值表格数据 + // 参数 明细,存放属性–值表格数据 bomItemList: [], // 弹出层标题 title: "", @@ -144,7 +144,7 @@ export default { this.getList(); }, methods: { - /** 查询BOM 明细,存放属性–值列表 */ + /** 查询参数 明细,存放属性–值列表 */ getList() { this.loading = true; listBomItem(this.queryParams).then(response => { @@ -189,7 +189,7 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = "添加BOM 明细,存放属性–值"; + this.title = "添加参数 明细,存放属性–值"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -200,7 +200,7 @@ export default { this.loading = false; this.form = response.data; this.open = true; - this.title = "修改BOM 明细,存放属性–值"; + this.title = "修改参数 明细,存放属性–值"; }); }, /** 提交按钮 */ @@ -231,7 +231,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const itemIds = row.itemId || this.ids; - this.$modal.confirm('是否确认删除BOM 明细,存放属性–值编号为"' + itemIds + '"的数据项?').then(() => { + this.$modal.confirm('是否确认删除参数 明细,存放属性–值编号为"' + itemIds + '"的数据项?').then(() => { this.loading = true; return delBomItem(itemIds); }).then(() => { diff --git a/klp-oa/klp-ui/src/components/KLPService/BomPanel/index.vue b/klp-oa/klp-ui/src/components/KLPService/BomPanel/index.vue index 303f1d4f..daefb327 100644 --- a/klp-oa/klp-ui/src/components/KLPService/BomPanel/index.vue +++ b/klp-oa/klp-ui/src/components/KLPService/BomPanel/index.vue @@ -10,7 +10,7 @@ class="create-button" > - + diff --git a/klp-oa/klp-ui/src/views/wms/product/semi.vue b/klp-oa/klp-ui/src/views/wms/product/semi.vue index 7ef63e0c..d2f6d62d 100644 --- a/klp-oa/klp-ui/src/views/wms/product/semi.vue +++ b/klp-oa/klp-ui/src/views/wms/product/semi.vue @@ -128,7 +128,7 @@ --> - + @@ -158,7 +158,7 @@ type="text" icon="el-icon-data-analysis" @click="handleBom(scope.row)" - >SKU + >参数 @@ -259,7 +259,7 @@ - + diff --git a/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue b/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue index 4c17de6b..965fb493 100644 --- a/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue +++ b/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue @@ -32,7 +32,7 @@ - + diff --git a/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue b/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue index 883e2631..363e8f8c 100644 --- a/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue +++ b/klp-oa/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue @@ -26,7 +26,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/klp-oa/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-oa/klp-ui/src/views/wms/rawMaterial/index.vue index 691b80a7..848ef694 100644 --- a/klp-oa/klp-ui/src/views/wms/rawMaterial/index.vue +++ b/klp-oa/klp-ui/src/views/wms/rawMaterial/index.vue @@ -135,7 +135,7 @@ --> - + @@ -144,7 +144,7 @@ --> - + @@ -158,7 +158,7 @@ type="text" icon="el-icon-data-analysis" @click="handleBom(scope.row)" - >SKU + >参数 @@ -259,7 +259,7 @@ - + diff --git a/klp-ui/src/views/wms/productBom/index.vue b/klp-ui/src/views/wms/productBom/index.vue index 36033afd..a2f47d23 100644 --- a/klp-ui/src/views/wms/productBom/index.vue +++ b/klp-ui/src/views/wms/productBom/index.vue @@ -104,7 +104,7 @@ @pagination="getList" /> - + @@ -162,7 +162,7 @@ export default { showSearch: true, // 总条数 total: 0, - // 产品BOM(产品-原材料清单)表格数据 + // 产品参数(产品-原材料清单)表格数据 productBomList: [], // 弹出层标题 title: "", @@ -200,7 +200,7 @@ export default { this.getList(); }, methods: { - /** 查询产品BOM(产品-原材料清单)列表 */ + /** 查询产品参数(产品-原材料清单)列表 */ getList() { this.loading = true; listProductBom(this.queryParams).then(response => { @@ -246,7 +246,7 @@ export default { handleAdd() { this.reset(); this.open = true; - this.title = "添加产品BOM(产品-原材料清单)"; + this.title = "添加产品参数(产品-原材料清单)"; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -257,7 +257,7 @@ export default { this.loading = false; this.form = response.data; this.open = true; - this.title = "修改产品BOM(产品-原材料清单)"; + this.title = "修改产品参数(产品-原材料清单)"; }); }, /** 提交按钮 */ @@ -288,7 +288,7 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const bomIds = row.bomId || this.ids; - this.$modal.confirm('是否确认删除产品BOM(产品-原材料清单)编号为"' + bomIds + '"的数据项?').then(() => { + this.$modal.confirm('是否确认删除产品参数(产品-原材料清单)编号为"' + bomIds + '"的数据项?').then(() => { this.loading = true; return delProductBom(bomIds); }).then(() => { diff --git a/klp-ui/src/views/wms/purchasePlan/list.vue b/klp-ui/src/views/wms/purchasePlan/list.vue index f2ed0aba..b899f88e 100644 --- a/klp-ui/src/views/wms/purchasePlan/list.vue +++ b/klp-ui/src/views/wms/purchasePlan/list.vue @@ -59,7 +59,7 @@ - + diff --git a/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue b/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue index 4c17de6b..965fb493 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/CreatePurchasePanel.vue @@ -32,7 +32,7 @@ - + diff --git a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue index cd1e939f..9acf33d8 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue @@ -65,7 +65,7 @@ - + diff --git a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue index 9f27b8ba..5fc0d65b 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/merger.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/merger.vue @@ -101,17 +101,17 @@ export default { console.log('使用旧的质保单'); } else if (this.uploadQualityCertificateForm.qualityCertificateType === 2) { - // 创建一个新的BOM + // 创建一个新的参数 const bom = await addBom({ bomName: 'N' + new Date().getTime(), bomCode: 'N' + new Date().getTime(), }) - // 将BOMID赋值给对应的materialId + // 将参数ID赋值给对应的materialId await updateRawMaterial({ rawMaterialId: this.info.rawMaterialId, bomId: bom.data.bomId, }) - // 逐项创建BOMItem, 只创建选中的 + // 逐项创建参数Item, 只创建选中的 for (let i = 0; i < this.selection.length; i++) { await addBomItem({ bomId: bom.data.bomId, @@ -122,12 +122,12 @@ export default { this.$store.dispatch('category/getBomMap'); this.$store.dispatch('category/getRawMaterialMap'); } else if (this.uploadQualityCertificateForm.qualityCertificateType === 3) { - // 创建一个新的BOM + // 创建一个新的参数 const bom = await addBom({ bomName: 'N' + new Date().getTime(), bomCode: 'N' + new Date().getTime(), }) - // 逐项创建BOMItem + // 逐项创建参数Item for (let i = 0; i < this.selection.length; i++) { await addBomItem({ bomId: bom.data.bomId, diff --git a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue index a49a6318..6114d5bd 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/qualityCerticate.vue @@ -203,7 +203,7 @@ const so = { } }, bom: { - loading: '正在处理BOM' + loading: '正在处理参数' }, oss: { loading: '正在获取质保单', @@ -336,7 +336,7 @@ export default { handleMergerConfirm(res) { if (res.status === 'start') { this.loading = true; - this.loadingText = '正在处理产品BOM'; + this.loadingText = '正在处理产品参数'; } else if (res.status === 'success') { this.loading = false; this.active = 3; diff --git a/klp-ui/src/views/wms/purchasePlan/panels/stockin.vue b/klp-ui/src/views/wms/purchasePlan/panels/stockin.vue index df2e62f6..a90b6fad 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/stockin.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/stockin.vue @@ -64,7 +64,7 @@ style="width: 100%" > - + diff --git a/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue b/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue index 883e2631..363e8f8c 100644 --- a/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue +++ b/klp-ui/src/views/wms/purchasePlan/panels/transfer.vue @@ -26,7 +26,7 @@ - + @@ -70,7 +70,7 @@ - + diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue index 691b80a7..848ef694 100644 --- a/klp-ui/src/views/wms/rawMaterial/index.vue +++ b/klp-ui/src/views/wms/rawMaterial/index.vue @@ -135,7 +135,7 @@ --> - + @@ -144,7 +144,7 @@ - + diff --git a/klp-ui/src/views/wms/stockIo/panels/detail.vue b/klp-ui/src/views/wms/stockIo/panels/detail.vue index 850a4e12..a8181c12 100644 --- a/klp-ui/src/views/wms/stockIo/panels/detail.vue +++ b/klp-ui/src/views/wms/stockIo/panels/detail.vue @@ -124,7 +124,7 @@ {{ scope.row.itemId }} - + diff --git a/klp-ui/src/views/wms/stockIo/panels/returnCreate.vue b/klp-ui/src/views/wms/stockIo/panels/returnCreate.vue index 4cc1fc47..64110d5a 100644 --- a/klp-ui/src/views/wms/stockIo/panels/returnCreate.vue +++ b/klp-ui/src/views/wms/stockIo/panels/returnCreate.vue @@ -39,7 +39,7 @@ {{ scope.row.itemId }} - + diff --git a/klp-ui/src/views/wms/work/schedulePlan/panes/target.vue b/klp-ui/src/views/wms/work/schedulePlan/panes/target.vue index 2e9a7038..456ae220 100644 --- a/klp-ui/src/views/wms/work/schedulePlan/panes/target.vue +++ b/klp-ui/src/views/wms/work/schedulePlan/panes/target.vue @@ -15,7 +15,7 @@ - +