From 8fb90bfa4e6d3efd7ca0ef335a0875daf03bdaef Mon Sep 17 00:00:00 2001
From: liangjiami <2249412933@qq.com>
Date: Thu, 13 Nov 2025 14:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E7=A1=AC=E7=9B=98/=E8=BF=90=E8=B4=B9/=E5=85=B6=E4=BB=96--DDR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/lcProject/lcggdytab.vue                    | 4 ++--
 src/utils/lc_data.js                                      | 6 +++---
 src/views/components/ProductListCom/ProductListCom.vue    | 2 +-
 .../components/SetComponents/SkuVxeTable-attr-backups.vue | 2 +-
 src/views/components/SetComponents/SkuVxeTable.vue        | 2 +-
 src/views/index/index.vue                                 | 8 ++++----
 src/views/lcProject/taskMange/spxdxqMx.vue                | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/lcProject/lcggdytab.vue b/src/components/lcProject/lcggdytab.vue
index f2f892d..f925086 100644
--- a/src/components/lcProject/lcggdytab.vue
+++ b/src/components/lcProject/lcggdytab.vue
@@ -280,7 +280,7 @@
           </template>
         </vxe-column>
         <vxe-column v-if="item.value && item.key == 'other_fare' && data.userInfo.isall == 1" field="other_fare"
-          title="硬盘/运费/其他" :edit-render="{ autofocus: '.vxe-input--inner' }" width="130" align="center">
+          title="硬盘/运费/其他/DDR" :edit-render="{ autofocus: '.vxe-input--inner' }" width="130" align="center">
           <template #default="{ row }">
             <span>¥{{ row.other_fare ? row.other_fare : '0.000' }}</span>
           </template>
@@ -332,7 +332,7 @@
         <vxe-column v-if="item.value && item.key == 'tco_cost' && data.userInfo.isall == 1" field="tco_cost" title="物料成本价"
           width="130" align="center">
           <template #default="{ row }">
-            <!--结构/本体+硬盘/运费/其他+电子+电源+线材+配料/配件+加工费+包材-->
+            <!--结构/本体+硬盘/运费/其他/DDR+电子+电源+线材+配料/配件+加工费+包材-->
             <span>¥{{
               setNums83((
                 parseFloat(row.structure_fare ? row.structure_fare : 0) +
diff --git a/src/utils/lc_data.js b/src/utils/lc_data.js
index d4ff2a0..1e6d438 100644
--- a/src/utils/lc_data.js
+++ b/src/utils/lc_data.js
@@ -162,7 +162,7 @@ export const spsdmqKeylist = {
     key: 'parts_fare',
     value: false
   }, {
-    name: '硬盘/运费/其他',
+    name: '硬盘/运费/其他/DDR',
     key: 'other_fare',
     value: false
   }, {
@@ -366,7 +366,7 @@ export const spsdmqKeylistMr = {
     key: 'parts_fare',
     value: false
   }, {
-    name: '硬盘/运费/其他',
+    name: '硬盘/运费/其他/DDR',
     key: 'other_fare',
     value: false
   }, {
@@ -716,7 +716,7 @@ export const ggdykeytable = [{
     name: '辅料/配件',
     field: 'parts_fare'
   }, {
-    name: '硬盘/运费/其他',
+    name: '硬盘/运费/其他/DDR',
     field: 'other_fare'
   }, {
     name: '加工费用',
diff --git a/src/views/components/ProductListCom/ProductListCom.vue b/src/views/components/ProductListCom/ProductListCom.vue
index 947e77c..51e0b17 100644
--- a/src/views/components/ProductListCom/ProductListCom.vue
+++ b/src/views/components/ProductListCom/ProductListCom.vue
@@ -212,7 +212,7 @@ export default defineComponent({
             { type: 'col', field: 'accessories_cost', title: '配料/配件', width: '100' },
             { type: 'col', field: 'packing_cost', title: '包材', width: '80' },
             { type: 'col', field: 'process_cost', title: '加工费', width: '80' },
-            { type: 'col', field: 'other_cost', title: '硬盘/运费其他', width: '120' },
+            { type: 'col', field: 'other_cost', title: '硬盘/运费/其他/DDR', width: '120' },
           ]
         },
         { type: 'col', field: 'moq', title: 'MOQ', width: '100', align: 'center' },
diff --git a/src/views/components/SetComponents/SkuVxeTable-attr-backups.vue b/src/views/components/SetComponents/SkuVxeTable-attr-backups.vue
index 242683a..4c2cc5e 100644
--- a/src/views/components/SetComponents/SkuVxeTable-attr-backups.vue
+++ b/src/views/components/SetComponents/SkuVxeTable-attr-backups.vue
@@ -295,7 +295,7 @@ export default defineComponent({
               { type: 'col', field: 'acces', title: '配料/配件', width: '100' },
               { type: 'col', field: 'materials', title: '包材', width: '80' },
               { type: 'col', field: 'processcost', title: '加工费', width: '80' },
-              { type: 'col', field: 'disk', title: '硬盘/运费其他', width: '120' },
+              { type: 'col', field: 'disk', title: '硬盘/运费/其他/DDR', width: '120' },
             ]
           },
           { type: 'col', field: 'moq', title: 'MOQ', width: '100', align: 'center' },
diff --git a/src/views/components/SetComponents/SkuVxeTable.vue b/src/views/components/SetComponents/SkuVxeTable.vue
index ffc9ef1..0909b85 100644
--- a/src/views/components/SetComponents/SkuVxeTable.vue
+++ b/src/views/components/SetComponents/SkuVxeTable.vue
@@ -410,7 +410,7 @@ export default defineComponent({
               { type: 'col', field: 'accessories_cost', title: '配料/配件', width: '100' },
               { type: 'col', field: 'packing_cost', title: '包材', width: '80' },
               { type: 'col', field: 'process_cost', title: '加工费', width: '80' },
-              { type: 'col', field: 'other_cost', title: '硬盘/运费其他', width: '120' },
+              { type: 'col', field: 'other_cost', title: '硬盘/运费/其他/DDR', width: '120' },
             ]
           },
           { type: 'col', field: 'moq', title: 'MOQ', width: '100', align: 'center' },
diff --git a/src/views/index/index.vue b/src/views/index/index.vue
index db33f5f..c6ddde5 100644
--- a/src/views/index/index.vue
+++ b/src/views/index/index.vue
@@ -197,7 +197,7 @@
               <vxe-input v-model="row.process_cost" type="text"></vxe-input>
             </template>
           </vxe-column>
-          <vxe-column field="other_cost" title="硬盘/运费其他" width="80" header-align="center" align="right"
+          <vxe-column field="other_cost" title="硬盘/运费/其他/DDR" width="80" header-align="center" align="right"
             :edit-render="{ autofocus: '.vxe-input--inner' }">
             <template #edit="{ row }">
               <vxe-input v-model="row.other_cost" type="text"></vxe-input>
@@ -327,13 +327,13 @@
             {{ row.remark1 }}
           </template>
         </vxe-column>
-        <vxe-column field="remark2" title="绩效提成经营分析品线(二级)" width="80" header-align="center" align="right"
+        <vxe-column field="remark2" title="绩效提成经营分析品线(二级)" width="100" header-align="center" align="right"
           :edit-render="{}">
           <template #default="{ row }">
             {{ row.remark2}}
           </template>
           <template #edit="{ row, $rowIndex }">
-            <vxe-select v-model="row.remark2" @change="val => updateRemark(val, $rowIndex)">
+            <vxe-select v-model="row.remark2" @change="val => updateRemark(val, $rowIndex)" clearable>
                <vxe-option v-for="item in remark_level" :key="item.remark_two" :value="item.remark_two" :label="item.remark_two"></vxe-option>
             </vxe-select>
           </template>
@@ -464,7 +464,7 @@ export default {
     updateRemark(val, rowIndex){
       // 根据选中的二级品线查找对应的一级品线
       const item = this.remark_level.find(i => i && i.remark_two === val.value);
-      this.tableData[rowIndex].remark1 = item.remark_one;
+      this.tableData[rowIndex].remark1 = val.value==null|| !val.value?'' :item.remark_one;
     },
     // 计算表格自适应高度
     calculateTableHeight() {
diff --git a/src/views/lcProject/taskMange/spxdxqMx.vue b/src/views/lcProject/taskMange/spxdxqMx.vue
index c9da53c..863b734 100644
--- a/src/views/lcProject/taskMange/spxdxqMx.vue
+++ b/src/views/lcProject/taskMange/spxdxqMx.vue
@@ -175,7 +175,7 @@
             </template>
           </vxe-column>
 
-          <vxe-column title="硬盘/运费/其他" v-if="item.value && item.key == 'other_fare'" width="120" align="left">
+          <vxe-column title="硬盘/运费/其他/DDR" v-if="item.value && item.key == 'other_fare'" width="120" align="left">
             <template #default="{ row }">
               <span>{{ row.sku.other_fare }}</span>
             </template>