修改下名称硬盘/运费/其他--DDR

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) +

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: '加工费用',

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' },

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' },

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' },

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() {

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>