Merge branch 'developerA' into developer

src/router/modules/finance.js

@@ -42,12 +42,12 @@ const financeRouter = {
       meta: { title: '退/付款记录', noCache: true, icon: 'el-icon-bank-card' },
       hidden: true
     },
-    {
-      path: 'payapply-list',
-      name: 'PayapplyList',
-      component: () => import('@/views/finance/payapply-list'),
-      meta: { title: '申请付款', noCache: true, icon: 'el-icon-wallet' }
-    },
+    // {
+    //   path: 'payapply-list',
+    //   name: 'PayapplyList',
+    //   component: () => import('@/views/finance/payapply-list'),
+    //   meta: { title: '申请付款', noCache: true, icon: 'el-icon-wallet' }
+    // },
     {
       path: 'payapply-edit',
       name: 'PayapplyEdit',

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

@@ -19,7 +19,7 @@
         <div class="text" v-text="product.shopName" />
       </el-form-item>
       <el-form-item label="商品状态:" prop="validFlag">
-        <el-select v-model="formData.validFlag" placeholder="请选择" @change="handleChange($event)">
+        <el-select v-model="formData.validFlag" placeholder="请选择" disabled="true" @change="handleChange($event)">
           <el-option label="已上架" :value="1" />
           <el-option label="已下架" :value="2" />
         </el-select>
@@ -31,22 +31,28 @@
               <span>{{ row.unit }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="起订量" prop="name" align="center" width="100">
+          <el-table-column label="起订量" prop="name" align="center">
             <template slot-scope="{row}">
-              <el-input v-model="row.minBuyNumber" @input="e => (row.name= checkedInput(e))" />
+              <span>{{ row.minBuyNumber }}</span>
             </template>
+            <!-- <template slot-scope="{row}">
+              <el-input v-model="row.minBuyNumber" disabled="true" @input="e => (row.name= checkedInput(e))" />
+            </template> -->
           </el-table-column>
-          <el-table-column label="成本价" prop="name" align="center" width="200">
+          <el-table-column label="成本价" prop="name" align="center">
             <template slot-scope="{row}">
               <span> ¥{{ row.costPrice | toThousandFloatFilter }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="售价" prop="name" align="center" width="200">
+          <el-table-column label="售价" prop="name" align="center">
             <template slot-scope="{row}">
-              <el-input v-model="row.price" @input="e => (row.price= checkedInput(e))">
+              <span> ¥{{ row.price | toThousandFloatFilter }}</span>
+            </template>
+            <!-- <template slot-scope="{row}">
+              <el-input v-model="row.price" disabled="true" @input="e => (row.price= checkedInput(e))">
                 <template slot="prepend">¥</template>
               </el-input>
-            </template>
+            </template> -->
           </el-table-column>
         </el-table>
       </el-form-item>

src/views/goods/list.vue

@@ -71,9 +71,9 @@
           <span>{{ row.addTime | parseTime('{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="primary" size="mini" @click="handleEdit(row)">查看详情</el-button>
           <el-button :type="row.validFlag*1 === 1 ? 'warning' : 'primary'" size="mini" @click="handleSwitch(row)">{{ row.validFlag*1 === 1 ? '下架' : '上架' }}</el-button>
         </template>
       </el-table-column>

src/views/order/detail.vue

@@ -18,6 +18,7 @@
             </template>
           </el-col>
           <!-- <el-col :span="4"><b>订单类型：</b> {{ order.orderTime }}</el-col> -->
+          <el-col :span="4"><b>订单来源：</b> 【采美】平台</el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>收款状态：</b>
@@ -46,7 +47,7 @@
                 功能<i class="el-icon-arrow-down el-icon--right" />
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-if="order.checkFlag === 1">
+                <!-- <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">
@@ -54,7 +55,7 @@
                 </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> -->
                 <el-dropdown-item v-if="['4','5','12','13', '22', '23', '32', '33'].indexOf(order.status) !== -1">
                   <div @click="handeleDropdown(2,order.orderId)">发货记录</div>
                 </el-dropdown-item>
@@ -94,9 +95,6 @@
         <el-row :gutter="24" class="box-row">
           <el-col :span="6"><b>退款金额(已完成)：</b> ¥{{ returnValue | toThousandFloatFilter }}
           </el-col>
-          <el-col :span="6"><b>运费：</b>
-            <span>{{ order.postageInfo }}</span>
-          </el-col>
         </el-row>
       </div>
       <div class="refund-item">
@@ -105,13 +103,22 @@
             <el-col :span="6"><b>下单时间：</b> {{ shopOrder.orderTime }}</el-col>
             <el-col :span="6"><b>子订单号(ID)：</b> {{ shopOrder.shopOrderNo + '(' + shopOrder.shopOrderId + ')' }}</el-col>
             <el-col :span="6"><b>子订单金额：</b> ¥{{ shopOrder.needPayAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>运费：</b>
+              <span>{{ shopOrder.postageInfo }}</span>
+            </el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
             <el-col :span="6"><b>商品总额：</b> ¥{{ shopOrder.productAmount | toThousandFloatFilter }}</el-col>
             <el-col :span="6"><b>应付金额：</b> ¥{{ shopOrder.shouldPayShopAmount | toThousandFloatFilter }}</el-col>
             <el-col :span="6"><b>已付金额：</b> ¥{{ shopOrder.payedShopAmount | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>待付金额：</b> ¥{{ shopOrder.waitPayShop | toThousandFloatFilter }}</el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
+            <el-col :span="6"><b>收款状态：</b>
+              <el-tag v-if="shopOrder.receiptStatus*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.receiptStatus*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.receiptStatus*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
             <el-col :span="6"><b>付款状态：</b>
               <el-tag v-if="shopOrder.payStatus*1===1" type="danger" size="small">待付款</el-tag>
               <el-tag v-if="shopOrder.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
@@ -122,7 +129,11 @@
               <el-tag v-if="shopOrder.sendOutStatus*1===2" type="warning" size="small">部分发货</el-tag>
               <el-tag v-if="shopOrder.sendOutStatus*1===3" type="success" size="small">已发货</el-tag>
             </el-col>
-            <el-col :span="6"><b>待付金额：</b> ¥{{ shopOrder.waitPayShop | toThousandFloatFilter }}</el-col>
+            <el-col :span="6"><b>退款状态：</b>
+              <el-tag v-if="shopOrder.refundType*1===1" type="danger" size="small">待付款</el-tag>
+              <el-tag v-if="shopOrder.refundType*1===2" type="warning" size="small">部分付款</el-tag>
+              <el-tag v-if="shopOrder.refundType*1===3" type="success" size="small">已付款</el-tag>
+            </el-col>
           </el-row>
           <el-row :gutter="22" class="box-row">
             <el-col :span="22"><b>留言：</b> {{ shopOrder.note ? shopOrder.note : '无' }}</el-col>

src/views/order/list.vue

@@ -133,6 +133,14 @@
           @change="getList"
         />
       </div>
+      <div class="filter-control">
+        <span>订单来源:</span>
+        <el-select v-model="listQuery.status" style="width:180px;" clearable @change="getList">
+          <el-option value="" label="所有" />
+          <el-option label="【采美】平台" value="99" />
+          <el-option label="【丽格集采联盟】平台" value="7" />
+        </el-select>
+      </div>
       <div class="filter-control">
         <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
       </div>