ct 20 hodín pred
rodič
commit
ab191d6aeb

+ 2 - 2
src/views/store/components/addOrder.vue

@@ -344,8 +344,8 @@ export default {
   },
   created() {
     this.getTreeselect();
-    // 媒体来源 如需要则增加字典 
-    this.getDicts("store_order_medium").then((response) => {
+    // 客户来源 如需要则增加字典 
+    this.getDicts("crm_customer_source").then((response) => {
       this.orderMediumOptions = response.data;
     });
     this.getDicts("store_order_type").then((response) => {

+ 26 - 0
src/views/store/storeOrder/list.vue

@@ -250,11 +250,33 @@
                   <el-tag prop="status" v-for="(item, index) in orderTypeOptions"    v-if="scope.row.orderType==item.dictValue">{{item.dictLabel}}</el-tag>
               </template>
           </el-table-column>
+          <el-table-column label="媒体来源" align="center" prop="orderMedium" >
+          <template slot-scope="scope">
+              <el-tag prop="orderMedium" v-for="(item, index) in orderMediumOptions"    v-if="scope.row.orderMedium==item.dictValue">{{item.dictLabel}}</el-tag>
+          </template>
+          </el-table-column>
+          <el-table-column label="订单产品" align="center" width="200px">
+            <template slot-scope="scope">
+              <div v-if="scope.row.items && scope.row.items.length > 0">
+                <el-tag 
+                  v-for="(item, index) in scope.row.items" 
+                  :key="index" 
+                  size="mini" 
+                  class="product-tag"
+                >
+                  {{ JSON.parse(item.jsonInfo).productName }} × {{ item.num }}
+                </el-tag>
+              </div>
+              <span v-else class="no-products">暂无商品</span>
+            </template>
+          </el-table-column>
           <el-table-column label="状态" align="center" prop="status" >
               <template slot-scope="scope">
                   <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
               </template>
           </el-table-column>
+          <el-table-column label="运单号" align="center" prop="deliveryId" >
+          </el-table-column>
           <el-table-column label="物流状态" align="center" prop="deliveryStatus" >
               <template slot-scope="scope">
                   <el-tag prop="status" v-for="(item, index) in deliveryStatusOptions"    v-if="scope.row.deliveryStatus==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -476,6 +498,7 @@ export default {
       deliveryPayStatusOptions:[],
       deliveryStatusOptions:[],
       dateRange: [],
+      orderMediumOptions:[],
       orderTypeOptions:[],
       payTypeOptions:[],
       payQr:{
@@ -611,6 +634,9 @@ export default {
   },
   created() {
     this.getTreeselect();
+    this.getDicts("crm_customer_source").then((response) => {
+      this.orderMediumOptions = response.data;
+    });
     this.getDicts("store_order_type").then((response) => {
       this.orderTypeOptions = response.data;
     });