lhch2015 3 weeks ago
parent
commit
01b8ac4b7d

BIN
.DS_Store


+ 4 - 4
admin-ui/src/views/order/serviceOrder/carBeautyOrder.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="82px">
             <el-form-item label="订单编号" prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
@@ -44,11 +44,11 @@
                     <span>{{ scope.row.phoneNumber ? scope.row.phoneNumber : '' }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="预约时间" align="center" prop="appointmentTime" width="150px">
+            <!-- <el-table-column label="预约时间" align="center" prop="appointmentTime" width="150px">
                 <template slot-scope="scope">
                     {{ scope.row.appointmentTime ? scope.row.appointmentTime : '--' }}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="订单总价" align="center" prop="totalPrice" width="100px" />
             <el-table-column label="抵扣金额" align="center" prop="deductAmount" width="100px">
                 <template slot-scope="scope">
@@ -76,7 +76,7 @@
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_receiving(scope.row)" v-if="scope.row.orderStatus == '1'">接单</el-button>
-                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '2'">确认</el-button>
+                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '4'">确认</el-button>
                     <!-- <el-button
 
             type="text"

+ 5 - 5
admin-ui/src/views/order/serviceOrder/lifeServicesOrder.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="82px">
             <el-form-item label="订单编号" prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
@@ -43,11 +43,11 @@
                     <span>{{ scope.row.phoneNumber ? scope.row.phoneNumber : '' }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="预约时间" align="center" prop="appointmentTime" width="150px">
+            <!-- <el-table-column label="预约时间" align="center" prop="appointmentTime" width="150px">
                 <template slot-scope="scope">
                     {{ scope.row.appointmentTime ? scope.row.appointmentTime : '--' }}
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="订单总价" align="center" prop="totalPrice" width="100px" />
             <el-table-column label="抵扣金额" align="center" prop="deductAmount" width="100px">
                 <template slot-scope="scope">
@@ -76,7 +76,7 @@
                 <template slot-scope="scope">
                     <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
                     <el-button type="text" icon="el-icon-check" @click="btn_receiving(scope.row)" v-if="scope.row.orderStatus == '1'">接单</el-button>
-                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '2'">确认</el-button>
+                    <el-button type="text" icon="el-icon-check" @click="btn_confirm(scope.row)" v-if="scope.row.orderStatus == '4'">确认</el-button>
                 </template>
             </el-table-column>
         </Page>
@@ -94,7 +94,7 @@
                     <el-descriptions-item label="下单时间">{{ detailView.createTime ? detailView.createTime : '暂无信息' }}</el-descriptions-item>
                     <el-descriptions-item label="支付时间">{{ detailView.payTime ? detailView.payTime : '暂无信息' }}</el-descriptions-item>
                     <!--          <el-descriptions-item label="发货时间">{{detailView.sendTime?detailView.sendTime:'暂无信息'}}</el-descriptions-item>-->
-                    <el-descriptions-item label="预约时间">{{ detailView.appointmentTime ? detailView.appointmentTime : '暂无信息' }}</el-descriptions-item>
+                    <!-- <el-descriptions-item label="预约时间">{{ detailView.appointmentTime ? detailView.appointmentTime : '暂无信息' }}</el-descriptions-item> -->
                     <el-descriptions-item label="确认收货时间">{{ detailView.finishTime ? detailView.finishTime : '暂无信息' }}</el-descriptions-item>
                     <el-descriptions-item label="订单总价">{{ detailView.totalPrice ? detailView.totalPrice : '暂无信息' }}</el-descriptions-item>
                     <!--          <el-descriptions-item label="物流公司">{{detailView.deliveryCompany?detailView.deliveryCompany:'暂无信息'}}</el-descriptions-item>-->

+ 18 - 11
admin-ui/src/views/systemSet/purchaseGoods/index.vue

@@ -1,5 +1,8 @@
 <template>
     <div class="app-container">
+        <el-tabs v-model="goodsType" @tab-click="onChangeGoodsType">
+            <el-tab-pane v-for="(dict, i) in dict.type.goods_type" :key="i" :label="dict.label" :name="dict.value"></el-tab-pane>
+        </el-tabs>
         <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="68px">
             <el-form-item prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
@@ -17,10 +20,10 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(0)" v-hasPermi="['order:purchaseGoods:add']">普通商品采购</el-button>
-            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(1)" v-hasPermi="['order:purchaseGoods:add']">材料商品采购</el-button>
-            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(2)" v-hasPermi="['order:purchaseGoods:add']">生活服务商品采购</el-button>
-            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(3)" v-hasPermi="['order:purchaseGoods:add']">汽车美容商品采购</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(0)" v-hasPermi="['order:purchaseGoods:add']">普通商品批发</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(1)" v-hasPermi="['order:purchaseGoods:add']">材料商品批发</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(2)" v-hasPermi="['order:purchaseGoods:add']">生活服务商品批发</el-button>
+            <el-button type="primary" plain icon="el-icon-plus" @click="addOrder(3)" v-hasPermi="['order:purchaseGoods:add']">汽车美容商品批发</el-button>
           </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -61,7 +64,7 @@
         </Page>
 
         <!--新增-->
-        <el-dialog :title="title" :visible.sync="open" size="80%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
             <el-card class="purchase-dialog">
                 <el-row :gutter="20" class="purchase-container">
                     <!-- 左侧分类选择区域 -->
@@ -84,7 +87,7 @@
                     <el-col :span="20" class="content-section">
                         <!-- 上半区:已采购商品列表 -->
                         <div class="purchased-section">
-                            <div class="section-title">已采购商品</div>
+                            <div class="section-title">已批发商品</div>
                             <el-table :data="addGoodsList" border stripe>
                                 <!-- <el-table-column label="编号" align="center" prop="goodsSkuStoreId" width="100" /> -->
                                 <el-table-column label="商品名称" align="center" prop="goodsName" min-width="200" />
@@ -147,7 +150,7 @@
                                         {{formatSpec(scope.row.specValLists)}}
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="采购价格" align="center" prop="purchasePrice" width="100" />
+                                <el-table-column label="批发价格" align="center" prop="purchasePrice" width="100" />
                                 <el-table-column label="平台库存" align="center" width="120">
                                     <template slot-scope="scope">
                                         <span :class="{'low-stock': scope.row.hqStock <= 5}">{{ scope.row.hqStock }}</span>
@@ -226,7 +229,7 @@
         <el-dialog :title="detailTitle" :visible.sync="openDetail" size="80%" append-to-body>
             <el-card>
                 <el-descriptions title="基本信息" v-show="detailView" :column="3" border :label-style="{ 'text-align': 'center' }" :contentStyle="{ 'text-align': 'center' }">
-                    <el-descriptions-item label="采购来源" span="3">{{ detailView.orgName ? detailView.orgName : '--' }}</el-descriptions-item>
+                    <el-descriptions-item label="批发来源" span="3">{{ detailView.orgName ? detailView.orgName : '--' }}</el-descriptions-item>
                     <el-descriptions-item label="订单状态">
                         <dict-tag :options="dict.type.purchase_order_status" :value="detailView.orderStatus" />
                     </el-descriptions-item>
@@ -279,7 +282,7 @@ import { getFactoryInfo } from '@/api/system/factory'
 import { getStoreInfo } from '@/api/system/store'
 export default {
     name: 'goodsPurchase',
-    dicts: ['purchase_order_status', 'recharge_pay_type'],
+    dicts: ['purchase_order_status', 'recharge_pay_type','goods_type'],
     data() {
         return {
             //
@@ -399,6 +402,10 @@ export default {
         }
     },
     methods: {
+        onChangeGoodsType() {
+            this.queryParams.goodsType = this.goodsType
+            this.handleQuery()
+        },
         handleUser() {
             this.userInfoVO = this.getUserInfo()
             if (this.userInfoVO.userType == '00') {
@@ -524,7 +531,7 @@ export default {
             this.isUserBalance = false
             this.getBalance()
             this.goodsType = type
-            this.title = this.goodsType == '0' ? '商品采购' : '商品采购'
+            this.title = this.goodsType == '0' ? '商品批发' : '商品批发'
             this.titleType = this.goodsType == '0' ? '商品分类' : '商品分类'
             this.purchaseCountVOList = []
             this.addGoodsList = []
@@ -657,7 +664,7 @@ export default {
 <style lang="scss" scoped>
 .purchase-dialog {
   .purchase-container {
-    min-height: 600px;
+    // min-height: 600px;
   }
 
   .category-section {

+ 1 - 1
admin-ui/src/views/systemSet/purchaseGoods/platform.vue

@@ -60,7 +60,7 @@
         </Page>
 
         <!--新增-->
-        <el-dialog :title="title" :visible.sync="open" size="80%" append-to-body>
+        <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
             <el-card class="purchase-dialog">
                 <el-row :gutter="20" class="purchase-container">
                     <!-- 左侧分类选择区域 -->

+ 5 - 4
admin-ui/src/views/systemSet/sellGoods/retailStore.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="goodsType" @tab-click="onChangeGoodsType">
-      <el-tab-pane v-for="dict in dict.type.goods_type" :label="dict.label" :name="dict.value"></el-tab-pane>
+      <el-tab-pane v-for="(dict, i) in dict.type.goods_type" :key="i" :label="dict.label" :name="dict.value"></el-tab-pane>
     </el-tabs>
     <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item prop="orderNo">
@@ -54,9 +54,9 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column label="下单时间" align="center" prop="createTime" width="140" />
-      <el-table-column label="支付时间" align="center" prop="payTime" width="140" />
-      <el-table-column label="发货时间" align="center" prop="sendTime" width="140" />
+      <el-table-column label="下单时间" align="center" prop="createTime" width="150" />
+      <el-table-column label="支付时间" align="center" prop="payTime" width="150" />
+      <el-table-column label="发货时间" align="center" prop="sendTime" width="150" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template slot-scope="scope">
           <el-button type="text" icon="el-icon-chat-dot-square" @click="orderDetail(scope.row)">订单详情</el-button>
@@ -447,6 +447,7 @@ export default {
     },
     selectDeliveryWay(row) {
       this.openDeliveryWayPage = true
+      this.deliveryWay = '2'
       this.orderId = row.id
     },
     sellOrder() {