浏览代码

轮胎商城把字 轮胎改成商品 2024-1-10

caojunjie 1 年之前
父节点
当前提交
96df3d1ebc
共有 20 个文件被更改,包括 97 次插入97 次删除
  1. 2 2
      src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue
  2. 4 4
      src/views/tirePartsMall/basicData/commodityInformation/js/optionList.js
  3. 3 3
      src/views/tirePartsMall/basicData/listingManagement/index.vue
  4. 2 2
      src/views/tirePartsMall/basicData/shareListing/index.vue
  5. 4 4
      src/views/tirePartsMall/configuration/commodity.json
  6. 2 2
      src/views/tirePartsMall/configuration/commodityxsho.json
  7. 1 1
      src/views/tirePartsMall/inventory/config/LTdetail.json
  8. 3 3
      src/views/tirePartsMall/inventory/index.vue
  9. 5 5
      src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue
  10. 2 2
      src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue
  11. 19 19
      src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue
  12. 3 3
      src/views/tirePartsMall/salesManagement/Inventory/index.vue
  13. 4 4
      src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue
  14. 3 3
      src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue
  15. 2 2
      src/views/tirePartsMall/salesManagement/outboundWorkOrderL/commodityxsho.json
  16. 3 3
      src/views/tirePartsMall/salesManagement/outboundWorkOrderL/index.vue
  17. 15 15
      src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue
  18. 3 3
      src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue
  19. 15 15
      src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue
  20. 2 2
      src/views/tirePartsMall/salesManagement/saleOrder/index.vue

+ 2 - 2
src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -196,7 +196,7 @@ export default {
                         }]
                     },
                     {
-                        label: "轮胎编码",
+                        label: "商品编码",
                         prop: "code",
                         span: 8,
                         rules: [{
@@ -274,7 +274,7 @@ export default {
                         span: 8,
                     },
                     {
-                        label: "轮胎描述",
+                        label: "商品描述",
                         prop: "goodsDescription",
                         span: 8,
                     },

+ 4 - 4
src/views/tirePartsMall/basicData/commodityInformation/js/optionList.js

@@ -18,19 +18,19 @@ export const option = {
   searchIndex: 2,
   column: [
     {
-      label: "轮胎名称",
+      label: "商品名称",
       prop: "cname",
       search: true,
       overHidden: true,
     },
     {
-      label: "轮胎编码",
+      label: "商品编码",
       prop: "code",
       overHidden: true,
       search: true
     },
     {
-      label: "轮胎分类",
+      label: "商品分类",
       prop: "goodsTypeName",
       overHidden: true,
     },
@@ -85,7 +85,7 @@ export const option = {
       }],
     },
     {
-      label: "轮胎描述",
+      label: "商品描述",
       prop: "goodsDescription",
       search: false,
       overHidden: true,

+ 3 - 3
src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -331,7 +331,7 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "90%",
         column: [{
-          label: '轮胎名称',
+          label: '商品名称',
           prop: 'cname',
           search: true,
           disabled: true,
@@ -441,7 +441,7 @@ export default {
           dicUrl: '/api/blade-system/dept/deptList'
         },
         {
-          label: "轮胎图片",
+          label: "商品图片",
           prop: "filesList",
           hide: true,
           showColumn: false,
@@ -491,7 +491,7 @@ export default {
                     value: "1"
                 }],
             }, {
-          label: "轮胎详情",
+          label: "商品详情",
           prop: "detailsText",
           hide: true,
           span: 24,

+ 2 - 2
src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -187,7 +187,7 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "70%",
         column: [{
-          label: '轮胎名称',
+          label: '商品名称',
           prop: 'cname',
           search: true,
           disabled: true,
@@ -347,7 +347,7 @@ export default {
           overHidden: true,
           span: 24,
         }, {
-          label: "轮胎详情",
+          label: "商品详情",
           prop: "detailsText",
           hide: true,
           span: 24,

+ 4 - 4
src/views/tirePartsMall/configuration/commodity.json

@@ -21,7 +21,7 @@
   "dialogClickModal": false,
   "column": [
     {
-      "label": "轮胎名称",
+      "label": "商品名称",
       "prop": "cname",
       "search": true,
       "width": 100,
@@ -73,14 +73,14 @@
       "overHidden": true
     },
     {
-      "label": "轮胎编码",
+      "label": "商品编码",
       "prop": "code",
       "slot": true,
       "overHidden": true,
       "width": "120"
     },
     {
-      "label": "轮胎分类",
+      "label": "商品分类",
       "prop": "goodsTypeName",
       "slot": true,
       "overHidden": true
@@ -107,7 +107,7 @@
       "search": true
     },
     {
-      "label": "轮胎描述",
+      "label": "商品描述",
       "prop": "goodsDescription",
       "slot": true,
       "overHidden": true

+ 2 - 2
src/views/tirePartsMall/configuration/commodityxsho.json

@@ -23,7 +23,7 @@
   "searchIndex": 2,
   "column": [
     {
-      "label": "轮胎名称",
+      "label": "商品名称",
       "prop": "cname",
       "search": true,
       "width": 100,
@@ -102,7 +102,7 @@
       "overHidden": true
     },
     {
-      "label": "轮胎分类",
+      "label": "商品分类",
       "prop": "goodsTypeName",
       "slot": true,
       "overHidden": true

+ 1 - 1
src/views/tirePartsMall/inventory/config/LTdetail.json

@@ -55,7 +55,7 @@
             "overHidden": true
         },
         {
-            "label": "轮胎名称",
+            "label": "商品名称",
             "prop": "goodsName",
             "minWidth": 80,
             "overHidden": true

+ 3 - 3
src/views/tirePartsMall/inventory/index.vue

@@ -112,13 +112,13 @@ export default {
         ],
         column: [
           {
-            label: '轮胎名称',
+            label: '商品名称',
             prop: "cname",
             search: true,
             overHidden: true,
           },
           {
-            label: '轮胎编码',
+            label: '商品编码',
             prop: "code",
             search: true,
             overHidden: true,
@@ -147,7 +147,7 @@ export default {
             overHidden: true,
             width: 100
           }, {
-            label: '轮胎描述',
+            label: '商品描述',
             prop: "productDescription",
             overHidden: true,
             width: 100

+ 5 - 5
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -56,7 +56,7 @@
                             </template>
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <!-- <el-button type="primary" icon="el-icon-plus" size="small" @click="rowAdd(row, score)"
-                                    :disabled="isrowAdd">添加轮胎</el-button>
+                                    :disabled="isrowAdd">添加商品</el-button>
                                 <el-button type="success" size="small" :disabled="isrowAdd" icon="el-icon-bottom" @click="excelBox = true">导入
                                 </el-button> -->
                                 <el-button type="primary" icon="el-icon-printer" size="small"
@@ -341,7 +341,7 @@ export default {
                     }
                 ],
                 column: [{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsId',
                     width: 200,
                     overHidden: true,
@@ -355,7 +355,7 @@ export default {
                     },
                     dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
                 },{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsName',
                     width: 200,
                     overHidden: true,
@@ -420,7 +420,7 @@ export default {
                     },
                     overHidden: true
                 }, {
-                    label: '轮胎编码',
+                    label: '商品编码',
                     prop: 'goodsNo',
                     overHidden: true,
                     disabled: false,
@@ -459,7 +459,7 @@ export default {
                     disabled: false,
                     overHidden: true
                 }, {
-                    label: "轮胎描述",
+                    label: "商品描述",
                     prop: "goodsDescription",
                     disabled: false,
                     overHidden: true

+ 2 - 2
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -81,7 +81,7 @@ export default {
         menu: false,
         column: [
           {
-            label: '轮胎名称',
+            label: '商品名称',
             prop: 'goodsId',
             width: 200,
             overHidden: true,
@@ -151,7 +151,7 @@ export default {
             disabled: true,
             ovrHidden: true,
           }, {
-            label: "轮胎描述",
+            label: "商品描述",
             prop: "goodsDescription",
             disabled: false,
             overHidden: true

+ 19 - 19
src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -148,7 +148,7 @@ export default {
     data() {
         return {
             switchDialog:false, //打印
-            // 添加轮胎弹窗左侧配置
+            // 添加商品弹窗左侧配置
             treeOption: {
                 addBtn: false,
                 menu: false,
@@ -159,7 +159,7 @@ export default {
                     value: "value",
                 }
             },
-            treeData: [], // 添加轮胎弹窗左侧数据
+            treeData: [], // 添加商品弹窗左侧数据
             inventorySearch: {whether:'0'}, // 弹窗表格检索条件
             inventoryForm: {}, // 弹窗条件
             inventoryPage: {
@@ -211,13 +211,13 @@ export default {
                 ],
                 column: [
                     {
-                        label: '轮胎名称',
+                        label: '商品名称',
                         prop: "cname",
                         search: true,
                         overHidden: true,
                     },
                     {
-                        label: '轮胎编码',
+                        label: '商品编码',
                         prop: "code",
                         search: true,
                         overHidden: true,
@@ -246,7 +246,7 @@ export default {
                         overHidden: true,
                         width: 100
                     }, {
-                        label: '轮胎描述',
+                        label: '商品描述',
                         prop: "productDescription",
                         overHidden: true,
                         width: 100
@@ -329,7 +329,7 @@ export default {
             },
             // 编辑还是保存
             mingxibaocun:true,
-            // 添加轮胎弹窗
+            // 添加商品弹窗
             dialogVisible:false,
             // 弹窗高度
             rowHeight: '',
@@ -350,7 +350,7 @@ export default {
             inventory: 0,
             isStatus: 1,
             excelBox:false,
-            // 轮胎名称
+            // 商品名称
             goodsIdoptions: [],
             dataList: [],
             dicUrlWithCustomId: '',
@@ -488,7 +488,7 @@ export default {
                 border: true,
                 align: 'center',
                 index: true,
-                addBtnText: "添加轮胎",
+                addBtnText: "添加商品",
                 updateBtnText: '保存',
                 refreshBtn: false,
                 dialogDrag: true,
@@ -534,7 +534,7 @@ export default {
                     decimals: 2
                 }],
                 column: [{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsId',
                     width: 200,
                     disabled: false,
@@ -551,14 +551,14 @@ export default {
                     dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 },{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsName',
                     width: 200,
                     disabled: false,
                     remote: true,
                     overHidden: true,
                 }, {
-                    label: '轮胎编码',
+                    label: '商品编码',
                     prop: 'goodsNo',
                     overHidden: true,
                     disabled: false,
@@ -727,7 +727,7 @@ export default {
         nodeClick(data){
             console.log(data,508)
         },
-        // 添加轮胎左侧数据接口
+        // 添加商品左侧数据接口
         getAllWorkDicts() {
             getCorpType({ corpType: 'SP' }).then(res => {
                 this.treeData = res.data.data;
@@ -758,8 +758,8 @@ export default {
                 // goodsTypeId
                 // goodsTypeName
 
-                // 轮胎名称 goodsId cname
-                // 轮胎编码 code
+                // 商品名称 goodsId cname
+                // 商品编码 code
                 // 花纹 productDescription
                 // 批次号 dot
                 // 库存成本 inventoryCostPrice
@@ -774,9 +774,9 @@ export default {
                     brandName:item.brandName,
                     goodsTypeId:item.goodsTypeId,
                     goodsTypeName:item.goodsTypeName,
-                    goodsId:item.goodsId, // 轮胎名称id
-                    goodsName:item.cname, // 轮胎名称
-                    goodsNo:item.code, // 轮胎编码
+                    goodsId:item.goodsId, // 商品名称id
+                    goodsName:item.cname, // 商品名称
+                    goodsNo:item.code, // 商品编码
                     pattern:item.brandItem, // 花纹
                     dot:item.dot, // 批次号
                     costprie:item.inventoryCostPrice,// 库存成本
@@ -926,7 +926,7 @@ export default {
                 console.log(form);
                 done(form)
             } else {
-                this.$message.error('请选择相同商户的轮胎')
+                this.$message.error('请选择相同商户的商品')
             }
             console.log(form);
         },
@@ -935,7 +935,7 @@ export default {
             console.log(form);
             done(form)
         },
-        // 新增轮胎
+        // 新增商品
         rowAdd(row) {
             // 判断仓库
             if (!this.form.storageId) {

+ 3 - 3
src/views/tirePartsMall/salesManagement/Inventory/index.vue

@@ -76,7 +76,7 @@ export default {
         menu: false,
         column: [
             {
-                label: '轮胎名称',
+                label: '商品名称',
                 prop: 'goodsId',
                 width: 200,
                 disabled: false,
@@ -93,14 +93,14 @@ export default {
                 dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
                 // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
             },{
-                label: '轮胎名称',
+                label: '商品名称',
                 prop: 'goodsName',
                 width: 200,
                 disabled: false,
                 remote: true,
                 overHidden: true,
             }, {
-                label: '轮胎编码',
+                label: '商品编码',
                 prop: 'goodsNo',
                 overHidden: true,
                 disabled: false,

+ 4 - 4
src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -273,7 +273,7 @@ export default {
             type: 'sum',
           }],
         column: [{
-          label: '轮胎名称',
+          label: '商品名称',
           prop: 'goodsId',
           disabled: true,
           width: 200,
@@ -286,13 +286,13 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
         },{
-            label: '轮胎名称',
+            label: '商品名称',
             prop: 'goodsName',
             disabled: true,
             width: 200,
             overHidden: true,
         }, {
-          label: '轮胎编码',
+          label: '商品编码',
           disabled: true,
           prop: 'goodsNo',
           width: 100
@@ -319,7 +319,7 @@ export default {
           disabled: true,
           width: 100
         }, {
-          label: '轮胎描述',
+          label: '商品描述',
           prop: 'goodsDescription',
           disabled: true,
         }, {

+ 3 - 3
src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -135,7 +135,7 @@ export default {
         menu: false,
         column: [
           {
-            label: '轮胎名称',
+            label: '商品名称',
             prop: 'goodsId',
             disabled: true,
             width: 200,
@@ -146,7 +146,7 @@ export default {
             },
             dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
           }, {
-            label: '轮胎编码',
+            label: '商品编码',
             disabled: true,
             prop: 'goodsNo',
             width: 100
@@ -172,7 +172,7 @@ export default {
             disabled: true,
             width: 100
           }, {
-            label: '轮胎描述',
+            label: '商品描述',
             prop: 'goodsDescription',
             disabled: true,
           }, {

+ 2 - 2
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/commodityxsho.json

@@ -23,7 +23,7 @@
   "searchIndex": 2,
   "column": [
     {
-      "label": "轮胎名称",
+      "label": "商品名称",
       "prop": "cname",
       "search": true,
       "width": 100,
@@ -102,7 +102,7 @@
       "overHidden": true
     },
     {
-      "label": "轮胎分类",
+      "label": "商品分类",
       "prop": "goodsTypeName",
       "slot": true,
       "overHidden": true

+ 3 - 3
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/index.vue

@@ -126,7 +126,7 @@ export default {
         menu: false,
         column: [
           {
-            label: '轮胎名称',
+            label: '商品名称',
             prop: 'goodsId',
             disabled: true,
             width: 200,
@@ -137,7 +137,7 @@ export default {
             },
             dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
           }, {
-            label: '轮胎编码',
+            label: '商品编码',
             disabled: true,
             prop: 'goodsNo',
             width: 100
@@ -163,7 +163,7 @@ export default {
             disabled: true,
             width: 100
           }, {
-            label: '轮胎描述',
+            label: '商品描述',
             prop: 'goodsDescription',
             disabled: true,
           }, {

+ 15 - 15
src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -84,7 +84,7 @@
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn"
-                                    @click="rowAdd(row)">添加轮胎</el-button>
+                                    @click="rowAdd(row)">添加商品</el-button>
                                     <el-button type="success" size="small" :disabled="isAddBtn" icon="el-icon-bottom" @click="excelBox = true">导入
                                 </el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
@@ -211,7 +211,7 @@
         </el-dialog>
         </div>
 
-        <el-dialog title="选择轮胎" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
+        <el-dialog title="选择商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods">
             <el-row :style="{ height: rowHeight }">
                 <el-col :span="5" style="height: 100%;overflow-y: auto">
@@ -319,7 +319,7 @@ export default {
             mingxibaocun:true,
             // 批次号请求到的数据
             picihaolist:[],
-            // 添加轮胎弹窗
+            // 添加商品弹窗
             dialogVisible:false,
             // 弹窗高度
             rowHeight: '',
@@ -366,7 +366,7 @@ export default {
             inventory: 0,
             isStatus: 1,
             excelBox:false,
-            // 轮胎名称
+            // 商品名称
             goodsIdoptions: [],
             dataList: [],
             dicUrlWithCustomId: '',
@@ -654,7 +654,7 @@ export default {
                 index: true,
                 showSummary: true,
 
-                addBtnText: "添加轮胎",
+                addBtnText: "添加商品",
                 updateBtnText: '保存',
                 refreshBtn: false,
                 dialogDrag: true,
@@ -691,7 +691,7 @@ export default {
                     decimals: 2
                 }],
                 column: [{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsId',
                     width: 200,
                     disabled: false,
@@ -708,7 +708,7 @@ export default {
                     dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 },{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsName',
                     width: 200,
                     disabled: false,
@@ -790,7 +790,7 @@ export default {
                         editDisplay: false,
                         addDisplay: false
                     }, {
-                    label: '轮胎编码',
+                    label: '商品编码',
                     prop: 'goodsNo',
                     overHidden: true,
                     disabled: false,
@@ -816,7 +816,7 @@ export default {
                     disabled: false,
                     width: 100
                 }, {
-                    label: '轮胎描述',
+                    label: '商品描述',
                     prop: 'goodsDescription',
                     disabled: false,
                     overHidden: true,
@@ -1179,7 +1179,7 @@ export default {
                 });
                 shortcutWarehousing(this.form).then(res=>{
                     this.$message.success("保存成功");
-                    this.isAddBtn = true // 表格的添加轮胎禁用
+                    this.isAddBtn = true // 表格的添加商品禁用
                     this.refresh(res.data.data.id)
                     loading.close();
                 }).catch(()=>{
@@ -1342,7 +1342,7 @@ export default {
                         propertyName:item.specificationAndModel,
                         // 花纹
                         pattern:item.brandItem,
-                        // 轮胎描述
+                        // 商品描述
                         goodsDescription:item.goodsDescription,
 
                         goodsNum:item.goodsNum,
@@ -1373,7 +1373,7 @@ export default {
             this.tableDataHandle()
         },
 
-        //导入轮胎弹窗列表查询
+        //导入商品弹窗列表查询
         onLoadfun(page, params = { artsVision: this.form.belongToCorpId }) {
             this.loading = true;
             getList({
@@ -1742,7 +1742,7 @@ export default {
                         // this.editButton = true // 让编辑按钮出来
                         // this.isDisabledTask = false;
                         // this.viewDisabled = false;
-                        this.isAddBtn = false // 表格的添加轮胎禁用
+                        this.isAddBtn = false // 表格的添加商品禁用
                         this.$set(this.optionForm, 'disabled', false)
                         this.$set(this.optionContactsBack, 'disabled', false)
                         this.isContacts = true // 基础信息联系人 和地址插槽禁用
@@ -2031,7 +2031,7 @@ export default {
                 console.log(form);
                 done(form)
             } else {
-                this.$message.error('请选择相同商户的轮胎')
+                this.$message.error('请选择相同商户的商品')
             }
             console.log(form);
             // this.form.sharedCompanyId = res.data.data.sharedCompanyId
@@ -2042,7 +2042,7 @@ export default {
             console.log(form);
             done(form)
         },
-        // 新增轮胎
+        // 新增商品
         rowAdd(row) {
             if (!this.form.customerId) {
                 this.$message.error('请选择供应商')

+ 3 - 3
src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -76,7 +76,7 @@ export default {
         menu: false,
         column: [
           {
-            label: '轮胎名称',
+            label: '商品名称',
             prop: 'goodsId',
             width: 200,
             disabled: false,
@@ -153,7 +153,7 @@ export default {
             dicUrl: "/api/blade-sales-part/stockDesc/dotList",
             overHidden: true,
           }, {
-            label: '轮胎编码',
+            label: '商品编码',
             prop: 'goodsNo',
             overHidden: true,
             disabled: false,
@@ -192,7 +192,7 @@ export default {
             disabled: false,
             width: 100
           }, {
-            label: '轮胎描述',
+            label: '商品描述',
             prop: 'goodsDescription',
             disabled: false,
             overHidden: true,

+ 15 - 15
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -69,7 +69,7 @@
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn"
-                                    @click="rowAdd(row)">添加轮胎</el-button>
+                                    @click="rowAdd(row)">添加商品</el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                             </template>
@@ -194,7 +194,7 @@
         </div>
 
 
-        <el-dialog title="选择轮胎" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
+        <el-dialog title="选择商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
                    :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods">
             <el-row :style="{ height: rowHeight }">
                 <el-col :span="5" style="height: 100%;overflow-y: auto">
@@ -302,12 +302,12 @@ export default {
     data() {
         return {
             reportName:'', // 打印传的名字
-            SelectSearch:{}, // 添加轮胎检索
+            SelectSearch:{}, // 添加商品检索
             // 编辑还是保存
             mingxibaocun:true,
             // 批次号请求到的数据
             picihaolist:[],
-            // 添加轮胎弹窗
+            // 添加商品弹窗
             dialogVisible:false,
             // 弹窗高度
             rowHeight: '',
@@ -359,7 +359,7 @@ export default {
             dataList: [],
             dicUrlWithCustomId: '',
             sharedCompanyId: 0,
-            isAddBtn: true, // 添加轮胎的是否禁用
+            isAddBtn: true, // 添加商品的是否禁用
             isSaveBtn: false, // 大保存的是否禁用
             viewDisabled: false, // 大审批的是否禁用
             isAdd: false, // 表格按钮的是否点击
@@ -623,7 +623,7 @@ export default {
                 border: true,
                 align: 'center',
                 index: true,
-                addBtnText: "添加轮胎",
+                addBtnText: "添加商品",
                 updateBtnText: '保存',
                 refreshBtn: false,
                 dialogDrag: true,
@@ -663,7 +663,7 @@ export default {
                     type: "sum"
                 }],
                 column: [{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsId',
                     width: 250,
                     disabled: false,
@@ -680,7 +680,7 @@ export default {
                     dicUrl: `/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=&enableOrNot=1&stock=${this.goodsId}`
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 },{
-                    label: '轮胎名称',
+                    label: '商品名称',
                     prop: 'goodsName',
                     width: 250,
                     disabled: false,
@@ -763,7 +763,7 @@ export default {
                     dicUrl: "/api/blade-sales-part/stockDesc/dotList",
                     overHidden: true,
                 }, {
-                    label: '轮胎编码',
+                    label: '商品编码',
                     prop: 'goodsNo',
                     overHidden: true,
                     disabled: false,
@@ -795,7 +795,7 @@ export default {
                     disabled: false,
                     width: 100
                 }, {
-                    label: '轮胎描述',
+                    label: '商品描述',
                     prop: 'goodsDescription',
                     disabled: false,
                     overHidden: true,
@@ -1353,7 +1353,7 @@ export default {
             this.tableData = this.goodsListSave
             this.tableDataHandle()
         },
-        // 获取添加轮胎弹窗里的数据
+        // 获取添加商品弹窗里的数据
         goodsPageXsfun(){
             goodsPageXs({
                 customId: this.form.customerId,
@@ -1364,7 +1364,7 @@ export default {
                 this.goodsListShow = data.records;
             })
         },
-        //导入轮胎弹窗列表查询
+        //导入商品弹窗列表查询
         onLoadfun(page, params = { artsVision: this.form.belongToCorpId }) {
             this.loading = true;
             goodsPageXs({
@@ -1822,7 +1822,7 @@ export default {
                 let picihao = false
                 if (valid) {
                   if (this.form.orderItemsList.length == 0) {
-                    this.$message.warning("请添加轮胎");
+                    this.$message.warning("请添加商品");
                     return
                   }
                     for(let i in this.form.orderItemsList) {
@@ -2312,7 +2312,7 @@ export default {
             if (this.isStatus) {
                 done(form)
             } else {
-                this.$message.error('请选择相同公司的轮胎')
+                this.$message.error('请选择相同公司的商品')
             }
             console.log(form);
             // this.form.sharedCompanyId = res.data.data.sharedCompanyId
@@ -2321,7 +2321,7 @@ export default {
         rowUpdate(form, index, done, loading) {
             done(form)
         },
-        // 新增轮胎
+        // 新增商品
         rowAdd(row) {
             if (!this.form.customerId) {
                 this.$message.error('请选择客户')

+ 2 - 2
src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -90,7 +90,7 @@ export default {
         menu: false,
         column: [
           {
-            label: '轮胎名称',
+            label: '商品名称',
             prop: 'goodsName',
             width: 200,
             overHidden: true,
@@ -128,7 +128,7 @@ export default {
             dicUrl: "/api/blade-sales-part/stockDesc/dotList",
             overHidden: true,
           }, {
-            label: '轮胎编码',
+            label: '商品编码',
             prop: 'goodsNo',
             overHidden: true,
             width: 150