商品订单合并一个页面

admin-ui/src/views/goods/commonGoods/index.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-card class="search-card" shadow="never">

admin-ui/src/views/order/activity/index.vue

@@ -2,12 +2,12 @@
     <div class="app-container">
         <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="100px">
             <el-form-item label-width="120px" prop="orgId" v-if="userInfoVO.userType == '00'">
-                <el-select v-model="queryParams.orgId" filterable placeholder="请选择" clearable>
-                    <el-option-group label="门店">
+                <el-select v-model="queryParams.orgId" filterable placeholder="请选择门店" clearable>
+                    <!-- <el-option-group label="门店"> -->
                         <template>
                             <el-option v-for="store in storeList" :key="store.id" :label="store.name" :value="store.id"> </el-option>
                         </template>
-                    </el-option-group>
+                    <!-- </el-option-group> -->
                 </el-select>
             </el-form-item>
             <el-form-item prop="orderNo">
@@ -28,10 +28,10 @@
                 <el-input v-model="queryParams.activityTitle" placeholder="请输入活动名称" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item>
-                <el-date-picker clearable v-model="queryPayTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="getPayTime"> </el-date-picker>
+                <el-date-picker clearable v-model="queryPayTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="订单支付开始日期" end-placeholder="订单支付结束日期" @change="getPayTime"> </el-date-picker>
             </el-form-item>
             <el-form-item>
-                <el-date-picker clearable v-model="queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="getCreateTime"> </el-date-picker>
+                <el-date-picker clearable v-model="queryCreateTime" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="订单创建开始日期" end-placeholder="订单创建结束日期" @change="getCreateTime"> </el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>

admin-ui/src/views/order/cloth/collectCloth.vue

@@ -1529,11 +1529,10 @@ export default {
 
                 return
             }
-            if (!this.orderForm.sendClothWay) {
-                this.$message.error('请先选取衣方式')
-                return
-            }
-
+            // if (!this.orderForm.sendClothWay) {
+            //     this.$message.error('请先选取衣方式')
+            //     return
+            // }
             if (this.orderForm.isAppointment == 'Y') {
                 var res = await getInfoByOrderNo({ orderNo: this.orderForm.orderNo, appUserId: this.appUserInfo.id })
                 if (res.data == null) {

admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -62,7 +62,7 @@
                                 <span class="title">收款方式</span>
                             </div>
 
-                            <div class="payment-methods">
+                            <div class="payment-methods" v-if="orderForm.isAppointment!= 'Y'">
                                 <el-radio-group v-model="orderForm.payType" size="large" @change="changePayType" >
                                     <el-radio-button label="3" style="width: 80px"> <i class="el-icon-wallet"></i> 余额 </el-radio-button>
                                     <el-radio-button label="2" style="width: 80px"> <i class="el-icon-money"></i> 现金 </el-radio-button>
@@ -78,7 +78,7 @@
                             <!-- 支付按钮 -->
                             <div class="payment-actions">
                                 <el-button type="primary" size="large" icon="el-icon-shopping-cart-2" style="width: 180px" @click="submitForm(0)"> 立即收款 </el-button>
-                                <el-button type="warning" size="large" icon="el-icon-time" style="width: 180px" @click="submitForm(1)"> 取衣付款 </el-button>
+                                <el-button type="warning" size="large" icon="el-icon-time" style="width: 180px" @click="submitForm(1)" v-if="orderForm.isAppointment!= 'Y'"> 取衣付款 </el-button>
                             </div>
                         </el-card>
                     </div>
@@ -817,7 +817,7 @@ export default {
                 return;
             }
 
-            if (!this.orderForm.payType && payTimeType == 0) {
+            if (!this.orderForm.payType && payTimeType == 0 && this.orderForm.isAppointment!= 'Y') {
                 this.$message.error('请选择收款方式');
                 return;
             }
@@ -866,7 +866,7 @@ export default {
                             loading.close();
                             // 直接打开支付状态弹窗，不需要延时
                           //0=微信，1=支付宝，2=现金，3=余额
-                          if (payTimeType == 0) {
+                          if (payTimeType == 0 && this.orderForm.isAppointment != 'Y') {
                             if (this.orderForm.payType === '0') {
                                 res.data.authCode = this.orderForm.authCode
                                 this.$refs.payStatusPopup.open(0, {...params, ...res.data}, this.appUserInfo);

admin-ui/src/views/order/cloth/orderList.vue

@@ -3,7 +3,7 @@
         <!-- 搜索区域 -->
         <el-card class="search-wrapper" shadow="never">
             <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="100px">
-                <el-form-item label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
+                <el-form-item label-width="120px" prop="orgIndex" label="门店" v-if="userInfoVO.userType == '00'">
                     <el-select v-model="queryParams.orgIndex" filterable placeholder="请选择门店" clearable style="width: 240px">
                         <template>
                             <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id + ',' + store.sourceType"> </el-option>
@@ -23,6 +23,19 @@
                         <el-option key="-1" label="已取消" value="-1" />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="支付方式" prop="payType">
+                    <el-select v-model="queryParams.payType" placeholder="请选择支付方式" clearable style="width: 180px">
+                        <el-option key="0" label="微信" value="0" />
+                        <el-option key="1" label="支付宝" value="1" />
+                        <el-option key="2" label="现金" value="2" />
+                        <el-option key="3" label="会员余额" value="3" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="支付状态" prop="payStatus">
+                    <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" clearable style="width: 180px">
+                        <el-option v-for="(item, i) in dict.type.pay_status" :key="i" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="订单编号" prop="orderNo">
                     <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable style="width: 200px" @keyup.enter.native="handleQuery">
                         <i slot="prefix" class="el-input__icon el-icon-document"></i>

admin-ui/src/views/order/cloth/sendCloth.vue

@@ -47,7 +47,7 @@
                 </div>
             </div>
 
-            <el-table v-loading="loading" :data="clothOrderList" border stripe highlight-current-row @row-click="handleRowClick">
+            <el-table v-loading="loading" :data="clothOrderList" border stripe highlight-current-row>
                 <el-table-column label="订单编号" align="center" prop="orderNo" min-width="200" fixed="left" />
                 <el-table-column label="衣物数量" align="center" prop="orderClothCount" width="100" />
                 <el-table-column label="支付信息" align="center" width="200">

admin-ui/src/views/order/retailOrder/index.vue

@@ -1,5 +1,10 @@
 <template>
     <div class="app-container">
+        <el-tabs v-model="goodsType" @tab-click="onChangeGoodsType">
+            <template v-for="(dict, i) in dict.type.goods_type">
+                <el-tab-pane :key="i" :label="dict.label" :name="dict.value" v-if="dict.label !== '材料商品'"></el-tab-pane>
+            </template>
+        </el-tabs>
         <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="100px">
             <el-form-item prop="orderNo">
                 <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
@@ -24,6 +29,7 @@
                 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
+        
 
         <el-row :gutter="10" class="mb8">
             <!--            <el-col :span="1.5">-->
@@ -347,7 +353,7 @@ import { printGoods } from '@/api/order/clothItem'
 
 export default {
     name: 'goodsRetailOrder',
-    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type'],
+    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type', 'goods_type'],
     data() {
         var validateNumberInput = (rule, value, callback) => {
             if (!value || isNaN(value)) {
@@ -535,6 +541,10 @@ export default {
         }
     },
     methods: {
+        onChangeGoodsType() {
+            this.queryParams.goodsType = this.goodsType
+            this.handleQuery()
+        },
         handleUser() {
             this.userInfoVO = this.getUserInfo()
         },

admin-ui/src/views/order/statistics/factory/bydate.vue

@@ -1,7 +1,7 @@
 <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="80px">
       <el-form-item label="日期范围" prop="dateRange">
         <el-date-picker
           v-model="dateRange"
@@ -25,8 +25,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

admin-ui/src/views/order/statistics/factory/bystore.vue

@@ -1,7 +1,7 @@
 <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="80px">
       <el-form-item label="日期范围" prop="dateRange">
         <el-date-picker
           v-model="dateRange"
@@ -25,8 +25,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 

admin-ui/src/views/refund/refundRetailOrder/index.vue

@@ -1,5 +1,10 @@
 <template>
     <div class="app-container">
+        <el-tabs v-model="goodsType" @tab-click="onChangeGoodsType">
+            <template v-for="(dict, i) in dict.type.goods_type">
+                <el-tab-pane :key="i" :label="dict.label" :name="dict.value" v-if="dict.label !== '材料商品'"></el-tab-pane>
+            </template>
+        </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" />
@@ -136,7 +141,7 @@ import { findUserByPhoneNumber, getUser } from '@/api/app/user'
 
 export default {
     name: 'refundRetailOrder',
-    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type', 'goods_order_refund_status'],
+    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type', 'goods_order_refund_status', 'goods_type'],
     data() {
         return {
             userInfoVO: null,
@@ -193,6 +198,10 @@ export default {
         this.getList()
     },
     methods: {
+        onChangeGoodsType() {
+            this.queryParams.goodsType = this.goodsType
+            this.handleQuery()
+        },
         handleUser() {
             this.userInfoVO = this.getUserInfo()
         },