Browse Source

规格型号替换成规格

cz 1 year ago
parent
commit
652ff8ce7c
53 changed files with 81 additions and 81 deletions
  1. 1 1
      src/components/WDLY/process/ReturnGood.vue
  2. 1 1
      src/components/WDLY/process/SendPurchaseWDLY.vue
  3. 1 1
      src/components/WDLY/process/SendSubscribeWDLY.vue
  4. 2 2
      src/components/WDLY/product/SelectGoods.vue
  5. 2 2
      src/components/WDLY/product/SelectProduct.vue
  6. 4 4
      src/components/process/Contract.vue
  7. 1 1
      src/components/process/EHSD/Purchase.vue
  8. 3 3
      src/components/process/PriceSheet.vue
  9. 1 1
      src/components/process/ReturnGood.vue
  10. 1 1
      src/components/process/SendPurchase.vue
  11. 1 1
      src/components/process/SendSubscribe.vue
  12. 4 4
      src/components/process/ServiceContract.vue
  13. 2 2
      src/components/product/SelectGoods.vue
  14. 2 2
      src/components/product/SelectMaterial.vue
  15. 2 2
      src/components/product/SelectProduct.vue
  16. 1 1
      src/views/EHSD/productLibrary/companyProduct/index.vue
  17. 1 1
      src/views/EHSD/productLibrary/customerProduct/index.vue
  18. 3 3
      src/views/WDLY/basic/product/index.vue
  19. 1 1
      src/views/WDLY/basic/spu/index.vue
  20. 1 1
      src/views/WDLY/outInBound/abnormal/index.vue
  21. 1 1
      src/views/WDLY/outInBound/jdOrderReceive/index.vue
  22. 2 2
      src/views/WDLY/outInBound/logistics/index.vue
  23. 1 1
      src/views/WDLY/outInBound/record/index.vue
  24. 1 1
      src/views/WDLY/outInBound/transfer/index.vue
  25. 1 1
      src/views/WDLY/outInBound/waitInBound/index.vue
  26. 1 1
      src/views/WDLY/outInBound/waitOutBound/index.vue
  27. 2 2
      src/views/WDLY/purchaseManage/alreadyPurchase/index.vue
  28. 1 1
      src/views/WDLY/purchaseManage/arrival/index.vue
  29. 1 1
      src/views/WDLY/purchaseManage/purchase/index.vue
  30. 1 1
      src/views/WDLY/purchaseManage/returnGoods/index.vue
  31. 1 1
      src/views/WDLY/purchaseManage/subscribe/index.vue
  32. 1 1
      src/views/WDLY/purchaseManage/updatePurchaseData/index.vue
  33. 1 1
      src/views/WDLY/salesMange/afterSale/index.vue
  34. 3 3
      src/views/WDLY/salesMange/jdReGoodsInspection/index.vue
  35. 1 1
      src/views/WDLY/salesMange/jdSalesData/index.vue
  36. 1 1
      src/views/WDLY/stockManage/analysis/index.vue
  37. 1 1
      src/views/WDLY/stockManage/productCombination/index.vue
  38. 1 1
      src/views/WDLY/stockManage/productSplit/index.vue
  39. 2 2
      src/views/WDLY/stockManage/query/index.vue
  40. 2 2
      src/views/product/material/index.vue
  41. 2 2
      src/views/product/product/index.vue
  42. 2 2
      src/views/product/product/index2.vue
  43. 1 1
      src/views/purchaseManage/purchaseManage/alreadyPurchase/index.vue
  44. 2 2
      src/views/purchaseManage/purchaseManage/arrival/index.vue
  45. 1 1
      src/views/purchaseManage/purchaseManage/returnGoods/index.vue
  46. 2 2
      src/views/purchaseManage/supplier/supplyPrice/index.vue
  47. 1 1
      src/views/purchaseSales/outAndInWarehouse/inventoryInquiry/index.vue
  48. 2 2
      src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue
  49. 2 2
      src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue
  50. 1 1
      src/views/purchaseSales/outAndInWarehouse/record/index.vue
  51. 1 1
      src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue
  52. 1 1
      src/views/purchaseSales/outAndInWarehouse/waitingForStorage/index.vue
  53. 2 2
      src/views/purchaseSales/outAndInWarehouse/warehouseAdjustment/index.vue

+ 1 - 1
src/components/WDLY/process/ReturnGood.vue

@@ -7,7 +7,7 @@
           <el-table :data="formData.data.salesReturnDetailList">
           <el-table :data="formData.data.salesReturnDetailList">
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="count" label="退货数量" min-width="150">
             <el-table-column prop="count" label="退货数量" min-width="150">
               <template #default="{ row, $index }">
               <template #default="{ row, $index }">

+ 1 - 1
src/components/WDLY/process/SendPurchaseWDLY.vue

@@ -128,7 +128,7 @@
           />
           />
           <el-table-column prop="productCustomCode" label="物品编码" />
           <el-table-column prop="productCustomCode" label="物品编码" />
           <el-table-column prop="productName" label="物品名称" />
           <el-table-column prop="productName" label="物品名称" />
-          <el-table-column prop="productSpec" label="规格型号" />
+          <el-table-column prop="productSpec" label="规格" />
           <el-table-column
           <el-table-column
             prop="productUnit"
             prop="productUnit"
             label="单位"
             label="单位"

+ 1 - 1
src/components/WDLY/process/SendSubscribeWDLY.vue

@@ -31,7 +31,7 @@
             />
             />
             <el-table-column prop="productCode" label="物品编码" />
             <el-table-column prop="productCode" label="物品编码" />
             <el-table-column prop="productName" label="物品名称" />
             <el-table-column prop="productName" label="物品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column
             <el-table-column
               prop="productUnit"
               prop="productUnit"
               label="单位"
               label="单位"

+ 2 - 2
src/components/WDLY/product/SelectGoods.vue

@@ -127,7 +127,7 @@ const config = computed(() => {
 
 
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -216,7 +216,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "select",
       type: "select",

+ 2 - 2
src/components/WDLY/product/SelectProduct.vue

@@ -358,7 +358,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -482,7 +482,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "select",
       type: "select",

+ 4 - 4
src/components/process/Contract.vue

@@ -136,12 +136,12 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="规格型号" width="180">
+            <el-table-column label="规格" width="180">
               <template #default="{ row, $index }">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
                 <div style="width: 100%">
                   <!-- :rules="rules.productModel" -->
                   <!-- :rules="rules.productModel" -->
                   <el-form-item :prop="'contractProductList.' + $index + '.productModel'"  :inline-message="true">
                   <el-form-item :prop="'contractProductList.' + $index + '.productModel'"  :inline-message="true">
-                    <el-input v-model="row.productModel" placeholder="请输入规格型号" />
+                    <el-input v-model="row.productModel" placeholder="请输入规格" />
                   </el-form-item>
                   </el-form-item>
                 </div>
                 </div>
               </template>
               </template>
@@ -595,7 +595,7 @@ const rules = ref({
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
-  productModel: [{ required: true, message: "请输入规格型号", trigger: "blur" }],
+  productModel: [{ required: true, message: "请输入规格", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
@@ -894,7 +894,7 @@ const formHandoverConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "productModel",
       prop: "productModel",
-      label: "规格型号",
+      label: "规格",
       itemType: "text",
       itemType: "text",
       disabled: true,
       disabled: true,
     },
     },

+ 1 - 1
src/components/process/EHSD/Purchase.vue

@@ -1051,7 +1051,7 @@ const formHandoverConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "productModel",
       prop: "productModel",
-      label: "规格型号",
+      label: "规格",
       itemType: "text",
       itemType: "text",
       disabled: true,
       disabled: true,
     },
     },

+ 3 - 3
src/components/process/PriceSheet.vue

@@ -136,12 +136,12 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="规格型号" width="180">
+            <el-table-column label="规格" width="180">
               <template #default="{ row, $index }">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
                 <div style="width: 100%">
                   <!-- :rules="rules.productModel" -->
                   <!-- :rules="rules.productModel" -->
                   <el-form-item :prop="'quotationProductList.' + $index + '.productModel'"  :inline-message="true">
                   <el-form-item :prop="'quotationProductList.' + $index + '.productModel'"  :inline-message="true">
-                    <el-input v-model="row.productModel" placeholder="请输入规格型号" />
+                    <el-input v-model="row.productModel" placeholder="请输入规格" />
                   </el-form-item>
                   </el-form-item>
                 </div>
                 </div>
               </template>
               </template>
@@ -447,7 +447,7 @@ const rules = ref({
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
-  productModel: [{ required: true, message: "请输入规格型号", trigger: "blur" }],
+  productModel: [{ required: true, message: "请输入规格", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],

+ 1 - 1
src/components/process/ReturnGood.vue

@@ -7,7 +7,7 @@
           <el-table :data="formData.data.salesReturnDetailList">
           <el-table :data="formData.data.salesReturnDetailList">
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="count" label="退货数量" min-width="150">
             <el-table-column prop="count" label="退货数量" min-width="150">
               <template #default="{ row, $index }">
               <template #default="{ row, $index }">

+ 1 - 1
src/components/process/SendPurchase.vue

@@ -45,7 +45,7 @@
           <el-table-column prop="goodType" label="货品类型" :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')" />
           <el-table-column prop="goodType" label="货品类型" :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')" />
           <el-table-column prop="productCode" label="货品编码" />
           <el-table-column prop="productCode" label="货品编码" />
           <el-table-column prop="productName" label="货品名称" />
           <el-table-column prop="productName" label="货品名称" />
-          <el-table-column prop="productSpec" label="规格型号" />
+          <el-table-column prop="productSpec" label="规格" />
           <el-table-column prop="productUnit" label="单位" />
           <el-table-column prop="productUnit" label="单位" />
           <el-table-column prop="subscribeCount" label="申购数量" v-if="ids.length > 0" />
           <el-table-column prop="subscribeCount" label="申购数量" v-if="ids.length > 0" />
           <el-table-column prop="purchaseCount" label="已采购数量" v-if="ids.length > 0" />
           <el-table-column prop="purchaseCount" label="已采购数量" v-if="ids.length > 0" />

+ 1 - 1
src/components/process/SendSubscribe.vue

@@ -29,7 +29,7 @@
           <el-table-column prop="goodType" label="货品类型" :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')" />
           <el-table-column prop="goodType" label="货品类型" :formatter="(row) => (row.goodType == 1 ? '产品' : '物料')" />
           <el-table-column prop="code" label="货品编码" />
           <el-table-column prop="code" label="货品编码" />
           <el-table-column prop="name" label="货品名称" min-width="150" />
           <el-table-column prop="name" label="货品名称" min-width="150" />
-          <el-table-column prop="spec" label="规格型号" />
+          <el-table-column prop="spec" label="规格" />
           <el-table-column prop="unit" label="单位" />
           <el-table-column prop="unit" label="单位" />
           <el-table-column prop="count" label="申购数量" min-width="150">
           <el-table-column prop="count" label="申购数量" min-width="150">
             <template #default="{ row, $index }">
             <template #default="{ row, $index }">

+ 4 - 4
src/components/process/ServiceContract.vue

@@ -144,11 +144,11 @@
                 </div>
                 </div>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="规格型号" width="180">
+            <el-table-column label="规格" width="180">
               <template #default="{ row, $index }">
               <template #default="{ row, $index }">
                 <div style="width: 100%">
                 <div style="width: 100%">
                   <el-form-item :prop="'serviceContractProductList.' + $index + '.productModel'" :rules="rules.productModel" :inline-message="true">
                   <el-form-item :prop="'serviceContractProductList.' + $index + '.productModel'" :rules="rules.productModel" :inline-message="true">
-                    <el-input v-model="row.productModel" placeholder="请输入规格型号" />
+                    <el-input v-model="row.productModel" placeholder="请输入规格" />
                   </el-form-item>
                   </el-form-item>
                 </div>
                 </div>
               </template>
               </template>
@@ -435,7 +435,7 @@ const rules = ref({
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactName: [{ required: true, message: "请输入联系人", trigger: ["change", "blur"] }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   buyContactNumber: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
   productName: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
-  productModel: [{ required: true, message: "请输入规格型号", trigger: "blur" }],
+  productModel: [{ required: true, message: "请输入规格", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   quantity: [{ required: true, message: "请输入数量", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
   price: [{ required: true, message: "请输入单价", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
@@ -691,7 +691,7 @@ const formHandoverConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "productModel",
       prop: "productModel",
-      label: "规格型号",
+      label: "规格",
       itemType: "text",
       itemType: "text",
       disabled: true,
       disabled: true,
     },
     },

+ 2 - 2
src/components/product/SelectGoods.vue

@@ -127,7 +127,7 @@ const config = computed(() => {
 
 
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -210,7 +210,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "select",
       type: "select",

+ 2 - 2
src/components/product/SelectMaterial.vue

@@ -188,7 +188,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -281,7 +281,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "select",
       type: "select",

+ 2 - 2
src/components/product/SelectProduct.vue

@@ -196,7 +196,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -281,7 +281,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "select",
       type: "select",

+ 1 - 1
src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -426,7 +426,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
       itemWidth: 100,
       itemWidth: 100,
       disabled: false,
       disabled: false,
     },
     },

+ 1 - 1
src/views/EHSD/productLibrary/customerProduct/index.vue

@@ -445,7 +445,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
       itemWidth: 100,
       itemWidth: 100,
       disabled: false,
       disabled: false,
     },
     },

+ 3 - 3
src/views/WDLY/basic/product/index.vue

@@ -109,7 +109,7 @@
               >
               >
                 <el-table-column prop="code" label="产品编码" />
                 <el-table-column prop="code" label="产品编码" />
                 <el-table-column prop="name" label="产品名称" />
                 <el-table-column prop="name" label="产品名称" />
-                <el-table-column prop="spec" label="规格型号" />
+                <el-table-column prop="spec" label="规格" />
                 <el-table-column
                 <el-table-column
                   prop="linkQuantity"
                   prop="linkQuantity"
                   label="组合数量"
                   label="组合数量"
@@ -498,7 +498,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -660,7 +660,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "input",
       type: "input",

+ 1 - 1
src/views/WDLY/basic/spu/index.vue

@@ -51,7 +51,7 @@
             <el-table :data="formData.data.productInfos">
             <el-table :data="formData.data.productInfos">
               <el-table-column prop="code" label="产品编码" />
               <el-table-column prop="code" label="产品编码" />
               <el-table-column prop="name" label="产品名称" />
               <el-table-column prop="name" label="产品名称" />
-              <el-table-column prop="spec" label="规格型号" />
+              <el-table-column prop="spec" label="规格" />
               <el-table-column prop="zip" label="操作" width="100">
               <el-table-column prop="zip" label="操作" width="100">
                 <template #default="{ $index }">
                 <template #default="{ $index }">
                   <el-button type="primary" link @click="handleRemove($index)"
                   <el-button type="primary" link @click="handleRemove($index)"

+ 1 - 1
src/views/WDLY/outInBound/abnormal/index.vue

@@ -111,7 +111,7 @@
             <el-table :data="formData.dataOne.purchaseDetailVoList">
             <el-table :data="formData.dataOne.purchaseDetailVoList">
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="deliverGoodsQuantity" label="已发货">
               <el-table-column prop="deliverGoodsQuantity" label="已发货">
                 <template #default="{ row }">
                 <template #default="{ row }">

+ 1 - 1
src/views/WDLY/outInBound/jdOrderReceive/index.vue

@@ -113,7 +113,7 @@
             <el-table :data="formData.data.stockTransferDetailsList">
             <el-table :data="formData.data.stockTransferDetailsList">
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="quantity" label="调仓数量" />
               <el-table-column prop="quantity" label="调仓数量" />
               <el-table-column prop="alQuantity" label="已接收数量" />
               <el-table-column prop="alQuantity" label="已接收数量" />
               <el-table-column
               <el-table-column

+ 2 - 2
src/views/WDLY/outInBound/logistics/index.vue

@@ -86,7 +86,7 @@
               />
               />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <!-- <el-table-column prop="productSpec" label="规格型号" /> -->
+              <!-- <el-table-column prop="productSpec" label="规格" /> -->
               <el-table-column prop="productUnit" label="单位" />
               <el-table-column prop="productUnit" label="单位" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="transitQuantity" label="剩余在途" />
               <el-table-column prop="transitQuantity" label="剩余在途" />
@@ -155,7 +155,7 @@
             <el-table :data="formData.dataOne.purchaseDetailVoList">
             <el-table :data="formData.dataOne.purchaseDetailVoList">
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="deliverGoodsQuantity" label="已发货">
               <el-table-column prop="deliverGoodsQuantity" label="已发货">
                 <template #default="{ row }">
                 <template #default="{ row }">

+ 1 - 1
src/views/WDLY/outInBound/record/index.vue

@@ -194,7 +194,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 1 - 1
src/views/WDLY/outInBound/transfer/index.vue

@@ -63,7 +63,7 @@
             <el-table :data="formData.data.stockTransferDetailsList">
             <el-table :data="formData.data.stockTransferDetailsList">
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column
               <el-table-column
                 prop="outQuantity"
                 prop="outQuantity"
                 label="调仓数量"
                 label="调仓数量"

+ 1 - 1
src/views/WDLY/outInBound/waitInBound/index.vue

@@ -53,7 +53,7 @@
             <el-table :data="formData.data.stockWaitDetailsList">
             <el-table :data="formData.data.stockWaitDetailsList">
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column
               <el-table-column
                 prop="purchaseQuantity"
                 prop="purchaseQuantity"
                 label="采购数量"
                 label="采购数量"

+ 1 - 1
src/views/WDLY/outInBound/waitOutBound/index.vue

@@ -87,7 +87,7 @@
             <el-table :data="formData.data.jdOrderDetailsList">
             <el-table :data="formData.data.jdOrderDetailsList">
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="waitQuantity" label="应出库" />
               <el-table-column prop="waitQuantity" label="应出库" />
               <el-table-column
               <el-table-column
                 prop="receiptQuantity"
                 prop="receiptQuantity"

+ 2 - 2
src/views/WDLY/purchaseManage/alreadyPurchase/index.vue

@@ -119,7 +119,7 @@
 
 
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column
               <el-table-column
                 prop="productUnit"
                 prop="productUnit"
                 label="单位"
                 label="单位"
@@ -224,7 +224,7 @@
             <el-table :data="formData.dataOne.purchaseDetailVoList">
             <el-table :data="formData.dataOne.purchaseDetailVoList">
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="count" label="采购数量" />
               <el-table-column prop="deliverGoodsQuantity" label="已发货">
               <el-table-column prop="deliverGoodsQuantity" label="已发货">
                 <template #default="{ row }">
                 <template #default="{ row }">

+ 1 - 1
src/views/WDLY/purchaseManage/arrival/index.vue

@@ -73,7 +73,7 @@
               />
               />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productCustomCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column
               <el-table-column
                 prop="productUnit"
                 prop="productUnit"
                 label="单位"
                 label="单位"

+ 1 - 1
src/views/WDLY/purchaseManage/purchase/index.vue

@@ -155,7 +155,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         // width: 120,
         // width: 120,
       },
       },

+ 1 - 1
src/views/WDLY/purchaseManage/returnGoods/index.vue

@@ -85,7 +85,7 @@
             />
             />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="sumArrivalCount" label="已到货" />
             <el-table-column prop="sumArrivalCount" label="已到货" />

+ 1 - 1
src/views/WDLY/purchaseManage/subscribe/index.vue

@@ -145,7 +145,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 1 - 1
src/views/WDLY/purchaseManage/updatePurchaseData/index.vue

@@ -81,7 +81,7 @@
 
 
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column
               <el-table-column
                 prop="productUnit"
                 prop="productUnit"
                 label="单位"
                 label="单位"

+ 1 - 1
src/views/WDLY/salesMange/afterSale/index.vue

@@ -97,7 +97,7 @@
             <el-table :data="formData.data.afterSaleDetailList">
             <el-table :data="formData.data.afterSaleDetailList">
               <el-table-column prop="productCode" label="商品编码" />
               <el-table-column prop="productCode" label="商品编码" />
               <el-table-column prop="productName" label="商品名称" />
               <el-table-column prop="productName" label="商品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="quantity" label="数量" min-width="150">
               <el-table-column prop="quantity" label="数量" min-width="150">
                 <template #default="{ row, $index }">
                 <template #default="{ row, $index }">
                   <el-form-item
                   <el-form-item

+ 3 - 3
src/views/WDLY/salesMange/jdReGoodsInspection/index.vue

@@ -70,7 +70,7 @@
               />
               />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productCode" label="物品编码" />
               <el-table-column prop="productName" label="物品名称" />
               <el-table-column prop="productName" label="物品名称" />
-              <el-table-column prop="productSpec" label="规格型号" />
+              <el-table-column prop="productSpec" label="规格" />
               <el-table-column prop="productUnit" label="单位" />
               <el-table-column prop="productUnit" label="单位" />
               <el-table-column
               <el-table-column
                 prop="quantity"
                 prop="quantity"
@@ -288,7 +288,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },
@@ -349,7 +349,7 @@ const configOne = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 1 - 1
src/views/WDLY/salesMange/jdSalesData/index.vue

@@ -234,7 +234,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "logisticsCode",
         prop: "logisticsCode",
       },
       },
     },
     },

+ 1 - 1
src/views/WDLY/stockManage/analysis/index.vue

@@ -120,7 +120,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         fixed: "left",
         fixed: "left",
       },
       },

+ 1 - 1
src/views/WDLY/stockManage/productCombination/index.vue

@@ -175,7 +175,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 1 - 1
src/views/WDLY/stockManage/productSplit/index.vue

@@ -171,7 +171,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 2 - 2
src/views/WDLY/stockManage/query/index.vue

@@ -218,7 +218,7 @@ const configData = [
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },
@@ -323,7 +323,7 @@ const configData = [
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 2 - 2
src/views/product/material/index.vue

@@ -209,7 +209,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -319,7 +319,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "input",
       type: "input",

+ 2 - 2
src/views/product/product/index.vue

@@ -201,7 +201,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -309,7 +309,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "input",
       type: "input",

+ 2 - 2
src/views/product/product/index2.vue

@@ -200,7 +200,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "spec",
         prop: "spec",
       },
       },
     },
     },
@@ -308,7 +308,7 @@ const formConfig = computed(() => {
     {
     {
       type: "input",
       type: "input",
       prop: "spec",
       prop: "spec",
-      label: "规格型号",
+      label: "规格",
     },
     },
     {
     {
       type: "input",
       type: "input",

+ 1 - 1
src/views/purchaseManage/purchaseManage/alreadyPurchase/index.vue

@@ -85,7 +85,7 @@
             />
             />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="sumArrivalCount" label="已到货" />
             <el-table-column prop="sumArrivalCount" label="已到货" />

+ 2 - 2
src/views/purchaseManage/purchaseManage/arrival/index.vue

@@ -87,7 +87,7 @@
             />
             />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="count" label="到货数量" />
             <el-table-column prop="count" label="到货数量" />
             <el-table-column prop="sumQualityCount" label="已质检" />
             <el-table-column prop="sumQualityCount" label="已质检" />
@@ -248,7 +248,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 1 - 1
src/views/purchaseManage/purchaseManage/returnGoods/index.vue

@@ -85,7 +85,7 @@
             />
             />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productCode" label="货品编码" />
             <el-table-column prop="productName" label="货品名称" />
             <el-table-column prop="productName" label="货品名称" />
-            <el-table-column prop="productSpec" label="规格型号" />
+            <el-table-column prop="productSpec" label="规格" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="productUnit" label="单位" />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="purchaseCount" label="采购数量" />
             <el-table-column prop="sumArrivalCount" label="已到货" />
             <el-table-column prop="sumArrivalCount" label="已到货" />

+ 2 - 2
src/views/purchaseManage/supplier/supplyPrice/index.vue

@@ -64,7 +64,7 @@
               <el-table :data="formData.data.supplierPriceList">
               <el-table :data="formData.data.supplierPriceList">
                 <el-table-column prop="code" label="货品编码" />
                 <el-table-column prop="code" label="货品编码" />
                 <el-table-column prop="name" label="货品名称" min-width="150" />
                 <el-table-column prop="name" label="货品名称" min-width="150" />
-                <el-table-column prop="spec" label="规格型号" />
+                <el-table-column prop="spec" label="规格" />
                 <el-table-column
                 <el-table-column
                   prop="unit"
                   prop="unit"
                   label="单位"
                   label="单位"
@@ -227,7 +227,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
       },
       },
     },
     },

+ 1 - 1
src/views/purchaseSales/outAndInWarehouse/inventoryInquiry/index.vue

@@ -151,7 +151,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 160,
         width: 160,
       },
       },

+ 2 - 2
src/views/purchaseSales/outAndInWarehouse/manualDelivery/index.vue

@@ -52,7 +52,7 @@
               />
               />
               <el-table-column
               <el-table-column
                 prop="productSpec"
                 prop="productSpec"
-                label="规格型号"
+                label="规格"
                 width="160"
                 width="160"
               />
               />
               <el-table-column prop="productUnit" label="单位" width="100" />
               <el-table-column prop="productUnit" label="单位" width="100" />
@@ -178,7 +178,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 160,
         width: 160,
       },
       },

+ 2 - 2
src/views/purchaseSales/outAndInWarehouse/manualWarehousing/index.vue

@@ -54,7 +54,7 @@
               />
               />
               <el-table-column
               <el-table-column
                 prop="productSpec"
                 prop="productSpec"
-                label="规格型号"
+                label="规格"
                 min-width="220"
                 min-width="220"
               />
               />
               <el-table-column prop="productUnit" label="单位" width="100" />
               <el-table-column prop="productUnit" label="单位" width="100" />
@@ -171,7 +171,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 160,
         width: 160,
       },
       },

+ 1 - 1
src/views/purchaseSales/outAndInWarehouse/record/index.vue

@@ -183,7 +183,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 160,
         width: 160,
       },
       },

+ 1 - 1
src/views/purchaseSales/outAndInWarehouse/waitingForDelivery/index.vue

@@ -157,7 +157,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 140,
         width: 140,
       },
       },

+ 1 - 1
src/views/purchaseSales/outAndInWarehouse/waitingForStorage/index.vue

@@ -137,7 +137,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 140,
         width: 140,
       },
       },

+ 2 - 2
src/views/purchaseSales/outAndInWarehouse/warehouseAdjustment/index.vue

@@ -54,7 +54,7 @@
               />
               />
               <el-table-column
               <el-table-column
                 prop="productSpec"
                 prop="productSpec"
-                label="规格型号"
+                label="规格"
                 min-width="220"
                 min-width="220"
               />
               />
               <!-- <el-table-column prop="productUnit" label="单位" width="100" /> -->
               <!-- <el-table-column prop="productUnit" label="单位" width="100" /> -->
@@ -199,7 +199,7 @@ const config = computed(() => {
     },
     },
     {
     {
       attrs: {
       attrs: {
-        label: "规格型号",
+        label: "规格",
         prop: "productSpec",
         prop: "productSpec",
         width: 160,
         width: 160,
       },
       },