v1.0.2 bug修复

src/views/goods/components/price-edit.vue

@@ -20,8 +20,7 @@
       </el-form-item>
       <el-form-item label="商品状态:" prop="validFlag">
         <el-select v-model="formData.validFlag" placeholder="请选择" :disabled="true" @change="handleChange($event)">
-          <el-option label="已上架" :value="2" />
-          <el-option label="已下架" :value="3" />
+          <el-option :label="storeStatus(formData.validFlag)" :value="formData.validFlag" />
         </el-select>
       </el-form-item>
       <el-form-item label="商品规格:" prop="skus">
@@ -66,7 +65,10 @@
 
 <script>
 import { saveGoods } from '@/api/goods'
+import storeStatus from '@/views/mixins/storeStatus'
+
 export default {
+  mixins: [storeStatus],
   props: {
     dialogTitle: {
       type: String,

src/views/goods/list.vue

@@ -81,14 +81,11 @@
         min-width="200"
       />
       <el-table-column label="供应商" align="center" prop="shopName" min-width="110" />
-      <el-table-column label="成本价" align="center">
+      <el-table-column label="SKU-售价" align="center" min-width="110">
         <template slot-scope="{ row }">
-          ¥{{ row.costPrice | toThousandFloatFilter }}
-        </template>
-      </el-table-column>
-      <el-table-column label="售价" align="center">
-        <template slot-scope="{ row }">
-          ¥{{ row.price | toThousandFloatFilter }}
+          <div v-for="item in row.skus" :key="item.skuId">
+            {{ item.unit }} - ¥{{ item.price | toThousandFloatFilter }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column

src/views/order/detail.vue

@@ -34,8 +34,7 @@
               }}</el-tag>
             </template>
           </el-col>
-          <!-- <el-col :span="4"><b>订单类型：</b> {{ order.orderTime }}</el-col> -->
-          <el-col :span="4"><b>订单来源：</b> 【丽格集采联盟】平台</el-col>
+          <el-col :span="6"><b>订单来源：</b> 【丽格集采联盟】平台</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
           <el-col
@@ -152,10 +151,6 @@
             <template v-else>¥{{ receiptAmount | toThousandFloatFilter }}</template>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="24" class="box-row">
-          <el-col :span="6"><b>退款金额(已完成)：</b> ¥{{ returnValue | toThousandFloatFilter }}
-          </el-col>
-        </el-row> -->
       </div>
       <div class="refund-item">
         <div
@@ -185,28 +180,33 @@
                   功能<i class="el-icon-arrow-down el-icon--right" />
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <!-- <el-dropdown-item v-if="order.checkFlag === 1">
-                    <div @click="handeleDropdown(6,order.orderId)"> 上传线下支付凭证</div>
-                  </el-dropdown-item>
-                  <el-dropdown-item v-if="order.checkFlag === 1">
-                    <div @click="handeleDialogFormVisible"> 确认收款金额</div>
-                  </el-dropdown-item>
-                  <el-dropdown-item v-if="['11','12','21','22','31','32'].indexOf(order.status) !== -1">
-                    <div @click="handeleDropdown(1,order.orderId)">发货</div>
-                  </el-dropdown-item> -->
-                  <el-dropdown-item
-                    v-if="shopOrder.sendOutStatus * 1 > 1"
-                  >
-                    <div @click="handeleDropdown(2, order.orderId, shopOrder.shopOrderId)">发货记录</div>
+                  <el-dropdown-item v-if="shopOrder.sendOutStatus * 1 > 1">
+                    <div
+                      @click="handeleDropdown(2, order.orderId, shopOrder.shopOrderId)"
+                    >
+                      发货记录
+                    </div>
                   </el-dropdown-item>
                   <el-dropdown-item>
-                    <div @click="handeleDropdown(3, order.orderId, shopOrder.shopOrderId)">收付款记录</div>
+                    <div
+                      @click="handeleDropdown(3, order.orderId, shopOrder.shopOrderId)"
+                    >
+                      收付款记录
+                    </div>
                   </el-dropdown-item>
                   <el-dropdown-item>
-                    <div @click="handeleDropdown(4, order.orderId, shopOrder.shopOrderId)">退款（退货）记录</div>
+                    <div
+                      @click="handeleDropdown(4, order.orderId, shopOrder.shopOrderId)"
+                    >
+                      退款（退货）记录
+                    </div>
                   </el-dropdown-item>
                   <el-dropdown-item>
-                    <div @click="handeleDropdown(5, order.orderId, shopOrder.shopOrderId)">订单备注</div>
+                    <div
+                      @click="handeleDropdown(5, order.orderId, shopOrder.shopOrderId)"
+                    >
+                      订单备注
+                    </div>
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -220,21 +220,33 @@
             }}</el-col>
             <el-col
               :span="6"
-            ><b>应付金额：</b> ¥{{
+            ><b>应收金额：</b> ¥{{
               shopOrder.shouldPayShopAmount | toThousandFloatFilter
             }}</el-col>
             <el-col
               :span="6"
-            ><b>已付金额：</b> ¥{{
+            ><b>已收金额：</b> ¥{{
               shopOrder.payedShopAmount | toThousandFloatFilter
             }}</el-col>
             <el-col
               :span="6"
-            ><b>待付金额：</b> ¥{{
+            ><b>待收金额：</b> ¥{{
               shopOrder.waitPayShop | toThousandFloatFilter
             }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
+            <el-col
+              :span="6"
+            ><b>订单状态：</b>
+              <template v-if="shopOrder.shopStatus < 10">
+                <el-tag type="success" size="small">
+                  {{ orderStatus(shopOrder.shopStatus) }}
+                </el-tag>
+              </template>
+              <template v-else>
+                <el-tag type="success" size="small"> 交易中 </el-tag>
+              </template>
+            </el-col>
             <el-col
               :span="6"
             ><b>收款状态：</b>
@@ -256,42 +268,44 @@
             </el-col>
             <el-col
               :span="6"
-            ><b>付款状态：</b>
+            ><b>发货状态：</b>
               <el-tag
-                v-if="shopOrder.payStatus * 1 === 1"
+                v-if="shopOrder.sendOutStatus * 1 === 1"
                 type="danger"
                 size="small"
-              >待付款</el-tag>
+              >待发货</el-tag>
               <el-tag
-                v-if="shopOrder.payStatus * 1 === 2"
+                v-if="shopOrder.sendOutStatus * 1 === 2"
                 type="warning"
                 size="small"
-              >部分付款</el-tag>
+              >部分发货</el-tag>
               <el-tag
-                v-if="shopOrder.payStatus * 1 === 3"
+                v-if="shopOrder.sendOutStatus * 1 === 3"
                 type="success"
                 size="small"
-              >已付款</el-tag>
+              >已发货</el-tag>
             </el-col>
             <el-col
               :span="6"
-            ><b>发货状态：</b>
+            ><b>付款状态：</b>
               <el-tag
-                v-if="shopOrder.sendOutStatus * 1 === 1"
+                v-if="shopOrder.payStatus * 1 === 1"
                 type="danger"
                 size="small"
-              >待发货</el-tag>
+              >待付款</el-tag>
               <el-tag
-                v-if="shopOrder.sendOutStatus * 1 === 2"
+                v-if="shopOrder.payStatus * 1 === 2"
                 type="warning"
                 size="small"
-              >部分发货</el-tag>
+              >部分付款</el-tag>
               <el-tag
-                v-if="shopOrder.sendOutStatus * 1 === 3"
+                v-if="shopOrder.payStatus * 1 === 3"
                 type="success"
                 size="small"
-              >已发货</el-tag>
+              >已付款</el-tag>
             </el-col>
+          </el-row>
+          <el-row :gutter="22" class="box-row">
             <el-col
               :span="6"
             ><b>退款状态：</b>
@@ -311,10 +325,8 @@
                 size="small"
               >已退款</el-tag>
             </el-col>
-          </el-row>
-          <el-row :gutter="22" class="box-row">
             <el-col
-              :span="22"
+              :span="6"
             ><b>留言：</b> {{ shopOrder.note ? shopOrder.note : "无" }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
@@ -557,6 +569,18 @@ export default {
     this.fetchData()
   },
   methods: {
+    // 订单状态更新
+    orderStatus(state) {
+      const status = {
+        0: '待确认',
+        1: '已确认',
+        2: '交易完成',
+        3: '订单完成',
+        4: '已关闭',
+        5: '交易全退'
+      }
+      return status[state]
+    },
     fetchData() {
       getDetail({ id: this.orderId })
         .then((response) => {

src/views/order/list.vue

@@ -117,12 +117,12 @@
           @change="getList"
         />
       </div>
-      <div class="filter-control orderSource">
+      <!-- <div class="filter-control orderSource">
         <span>订单来源:</span>
-        <el-select v-model="listQuery.organizeId" style="width:180px;" clearable @change="getList">
+        <el-select v-model="listQuery.organizeId" style="width:180px;" @change="getList">
           <el-option label="【丽格集采联盟】平台" :value="4" />
         </el-select>
-      </div>
+      </div> -->
       <div class="filter-control">
         <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
       </div>