Parcourir la source

订单创建,详情: 没有显示商品名称

lxf il y a 1 an
Parent
commit
c5a46cdf49

+ 40 - 11
src/views/group/order/management/add.vue

@@ -68,10 +68,20 @@
                     <el-table-column label="产品" width="300">
                       <template #default="{ row }">
                         <div style="width: 100%">
-                          <div style="line-height: 28px">品号: {{ item.code }}</div>
-                          <div style="line-height: 28px; word-break: break-all">品名: {{ item.name }}</div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">商品名称: </span>
+                            <span>{{ item.wlnSkuName }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">品号: </span>
+                            <span>{{ item.code }}</span>
+                          </div>
+                          <div style="line-height: 28px; word-break: break-all">
+                            <span style="color: black; font-weight: 700">品名: </span>
+                            <span>{{ item.name }}</span>
+                          </div>
                           <div style="line-height: 28px; display: flex">
-                            <span style="width: 37px">数量:</span>
+                            <span style="width: 37px; color: black; font-weight: 700">数量: </span>
                             <el-form-item
                               :prop="'orderSkuList.' + index + '.quantity'"
                               :rules="rules.quantity"
@@ -88,14 +98,32 @@
                                 @change="changeQuantity(index)" />
                             </el-form-item>
                           </div>
-                          <div style="line-height: 28px">加工费: {{ item.customProcessingFee }}</div>
-                          <div style="line-height: 28px">代发费: {{ item.lssueFee }}</div>
-                          <div style="line-height: 28px">快递包材费: {{ item.deliveryMaterialsFee }}</div>
-                          <div style="line-height: 28px">包装人工费: {{ item.packingLabor }}</div>
-                          <div style="line-height: 28px">单价: ¥{{ item.unitPrice }}</div>
-                          <div style="line-height: 28px">小计: ¥{{ item.subtotal }}</div>
                           <div style="line-height: 28px">
-                            <span style="width: 37px">打印:</span>
+                            <span style="color: black; font-weight: 700">加工费: </span>
+                            <span>{{ item.customProcessingFee }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">代发费: </span>
+                            <span>{{ item.lssueFee }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">快递包材费: </span>
+                            <span>{{ item.deliveryMaterialsFee }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">包装人工费: </span>
+                            <span>{{ item.packingLabor }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">单价: </span>
+                            <span>{{ item.unitPrice }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="color: black; font-weight: 700">小计: </span>
+                            <span>{{ item.subtotal }}</span>
+                          </div>
+                          <div style="line-height: 28px">
+                            <span style="width: 37px; color: black; font-weight: 700">打印: </span>
                             <el-form-item
                               :prop="'orderSkuList.' + index + '.printType'"
                               :rules="rules.printType"
@@ -645,13 +673,14 @@ const printType = ref([
     dictValue: "双面",
   },
 ]);
-const selectProduct = (row) => {
+const selectProduct = (row, bom) => {
   if (row.id) {
     let list = formData.data.orderSkuList.filter((item) => item.skuSpecId === row.id);
     if (list && list.length > 0) {
       return ElMessage("该产品已添加");
     }
     formData.data.orderSkuList.push({
+      wlnSkuName: bom.name,
       skuId: row.skuId,
       code: row.code,
       name: row.name,

+ 3 - 3
src/views/group/product/management/index.vue

@@ -51,7 +51,7 @@
                 {{ `${spec.length}  *  ${spec.width}  *  ${spec.height}(cm³)` }}
               </div>
               <div style="width: 60px; text-align: center" v-if="props.selectStatus">
-                <el-button type="text" @click="selectProduct(spec)" :disabled="selectBtnStatus">选择</el-button>
+                <el-button type="text" @click="selectProduct(spec, item)" :disabled="selectBtnStatus">选择</el-button>
               </div>
             </div>
           </div>
@@ -336,9 +336,9 @@ const getLogsList = async (req) => {
 };
 const emit = defineEmits(["selectProduct"]);
 const selectBtnStatus = ref(false);
-const selectProduct = (item) => {
+const selectProduct = (spec, item) => {
   selectBtnStatus.value = true;
-  emit("selectProduct", item);
+  emit("selectProduct", spec, item);
   setTimeout(() => {
     selectBtnStatus.value = false;
   }, 200);