商品改价及订单页面优化

src/views/store/storeOrder/index.vue

@@ -272,11 +272,33 @@
               <el-tag prop="orderType" 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>
@@ -498,6 +520,7 @@ export default {
   },
   data() {
     return {
+      itemlist : [],
       importMsgOpen:false,
       importMsg:"",
       scheduleOptions:[],
@@ -507,6 +530,7 @@ export default {
       deptOptions:[],
       companyId:undefined,
       deptId:undefined,
+      orderMediumOptions:[],
       orderTypeOptions:[],
       payTypeOptions:[],
       payQr:{
@@ -654,6 +678,9 @@ export default {
           this.getTreeselect();
         }
     });
+    this.getDicts("crm_customer_source").then((response) => {
+      this.orderMediumOptions = response.data;
+    });
     this.getDicts("store_order_type").then((response) => {
       this.orderTypeOptions = response.data;
     });

src/views/system/config/config.vue

@@ -76,6 +76,14 @@
                 </el-radio-group>
               </el-tooltip>
             </el-form-item>
+            <el-form-item  label="制单改价" prop="createSalesOrderType">
+              <el-tooltip class="item" effect="dark" content="销售制单改价形式" placement="top-end">
+                <el-radio-group v-model="form1.createSalesOrderType">
+                  <el-radio :label="1">改商品单价</el-radio>
+                  <el-radio :label="2">改订单总价</el-radio>
+                </el-radio-group>
+              </el-tooltip>
+            </el-form-item>
            <div   class="footer">
               <el-button type="primary" @click="submitForm1">提  交</el-button>
             </div>