xuhaifeng 10 月之前
父节点
当前提交
d800479eef

+ 443 - 447
src/views/order/cloth/orderList.vue

@@ -1,223 +1,219 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
-        <el-select v-model="queryParams.orgIndex" filterable placeholder="请选择门店" clearable>
-          <template>
-            <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id + ',' + store.sourceType">
-            </el-option>
-          </template>
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
-          <el-option key="6" label="清洗中" value="6" />
-          <el-option key="7" label="已上挂" value="7" />
-          <el-option key="8" label="待送衣" value="8" />
-          <el-option key="9" label="送衣中" value="9" />
-          <el-option key="11" label="已完成" value="11" />
-        </el-select>
-      </el-form-item>
-      <el-form-item prop="orderNo">
-        <el-input v-model="queryParams.orderNo" placeholder="请输入订单条码" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item>
-        <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-      </el-form-item>
-      <el-form-item prop="appUserPhoneNumber">
-        <el-input v-model="queryParams.appUserPhoneNumber" placeholder="请输入会员手机" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <!-- <el-form-item prop="userId">
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item label-width="120px" prop="orgIndex" v-if="userInfoVO.userType == '00'">
+                <el-select v-model="queryParams.orgIndex" filterable placeholder="请选择门店" clearable>
+                    <template>
+                        <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id + ',' + store.sourceType"> </el-option>
+                    </template>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="orderStatus">
+                <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable>
+                    <el-option key="6" label="清洗中" value="6" />
+                    <el-option key="7" label="已上挂" value="7" />
+                    <el-option key="8" label="待送衣" value="8" />
+                    <el-option key="9" label="送衣中" value="9" />
+                    <el-option key="11" label="已完成" value="11" />
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="orderNo">
+                <el-input v-model="queryParams.orderNo" placeholder="请输入订单条码" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-date-picker v-model="createTimeRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item prop="appUserPhoneNumber">
+                <el-input v-model="queryParams.appUserPhoneNumber" placeholder="请输入会员手机" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item prop="userId">
                 <el-input v-model="queryParams.userId" placeholder="会员条码" clearable @keyup.enter.native="handleQuery" />
             </el-form-item> -->
-      <el-form-item>
-        <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>
+            <el-form-item>
+                <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>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:cloth:export']">导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:cloth:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <Page uri="/mapi/order/cloth/list" :request-params="queryParams" ref="pagination">
-      <el-table-column label="订单编号" align="center" prop="orderNo" min-width="120" fixed="left" />
-      <el-table-column v-if="userInfoVO.userType == '00'" label="门店名称" align="center" prop="sysOrg.name" width="150" />
-      <el-table-column label="衣服数量" align="center" prop="orderClothCount" width="60" />
-      <el-table-column label="合计" align="center" prop="clothItemName" width="200">
-        <template slot-scope="scope">
-          <span>合计:{{ scope.row.payAmount }}元</span>
-          <br />
-          <span v-if="scope.row.payType == '0'">支付方式:微信</span>
-          <span v-if="scope.row.payType == '1'">支付方式:支付宝</span>
-          <span v-if="scope.row.payType == '2'">支付方式:现金</span>
-          <span v-if="scope.row.payType == '3'">支付方式:余额</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="客户信息" align="center" width="140">
-        <template slot-scope="scope">
-          <span>{{ scope.row.appUserName ? scope.row.appUserName : "--" }}</span>
-          <br/>
-          <span>{{ scope.row.appUserPhoneNumber ? scope.row.appUserPhoneNumber : "" }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="订单时间" align="center" prop="createTime" min-width="200" />
-      <el-table-column label="付款方式" align="center" prop="createTime" min-width="120">
-        <template slot-scope="scope">
-          <span v-if="scope.row.payTimeType == '0'">收衣付款</span>
-          <span v-if="scope.row.payTimeType == '1'">取衣付款</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="预约配送状态" align="center" width="150">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.cloth_appointment_status" :value="scope.row.refundStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="订单状态" align="center" width="150">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.cloth_order_status" :value="scope.row.orderStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="退款状态" align="center" width="150">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="250">
-        <template slot-scope="scope">
-          <el-button type="text" icon="el-icon-s-order" @click="handleDetail(scope)">详情</el-button>
-          <el-button type="text" icon="el-icon-delete"
-            v-if="scope.row.orderStatus != '10' && scope.row.orderStatus != '11' && scope.row.orderStatus != '4'" @click="handleClose(scope.row)">撤单
-          </el-button>
-          <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType != '00'" @click="btn_lodop(scope.row)">打印</el-button>
-        </template>
-      </el-table-column>
-    </Page>
-
-    <!-- 添加或修改洗衣订单衣服明细对话框 -->
-    <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body>
-      <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
-        <el-col :span="24">
-          <el-descriptions class="margin-top" :column="2" border>
-            <el-descriptions-item>
-              <template slot="label"> 订单号 </template>
-              {{ orderDetail.orderNo }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 支付方式 </template>
-              <template v-if="orderDetail.payType == '0'">微信</template>
-              <template v-if="orderDetail.payType == '1'">支付宝</template>
-              <template v-if="orderDetail.payType == '2'">现金</template>
-              <template v-if="orderDetail.payType == '3'">余额</template>
-              ({{ orderDetail.payAmount }}元)
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 姓名 </template>
-              {{ orderDetail.appUserName }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 电话 </template>
-              {{ orderDetail.appUserPhoneNumber }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 总金额(元) </template>
-              {{ orderDetail.orderClothPrice }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 时间 </template>
-              {{ orderDetail.createTime }}
-            </el-descriptions-item>
-            <el-descriptions-item :span="2" v-if="userInfoVO.userType == '00'">
-              <template slot="label"> 门店名称 </template>
-              {{ orderDetail.sysOrg ? orderDetail.sysOrg.name : '' }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 订单备注 </template>
-              {{ orderDetail.remark }}
-            </el-descriptions-item>
-          </el-descriptions>
-        </el-col>
-        <el-col :span="24" style="margin-top: 10px">
-          <el-table :data="orderClothDetails" fit highlight-current-row border stripe>
-            <el-table-column label="衣物条码" align="center" prop="washCode" width="180" fixed="left" />
-            <el-table-column label="衣服名称" align="center" prop="clothItemName" width="200">
-              <template slot-scope="scope">
-                <span> {{ calculateClothName(scope.row) }} </span>
-              </template>
+        <Page uri="/mapi/order/cloth/list" :request-params="queryParams" ref="pagination">
+            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="120" fixed="left" />
+            <el-table-column v-if="userInfoVO.userType == '00'" label="门店名称" align="center" prop="sysOrg.name" width="150" />
+            <el-table-column label="衣服数量" align="center" prop="orderClothCount" width="60" />
+            <el-table-column label="合计" align="center" prop="clothItemName" width="200">
+                <template slot-scope="scope">
+                    <span>合计:{{ scope.row.payAmount }}元</span>
+                    <br />
+                    <span v-if="scope.row.payType == '0'">支付方式:微信</span>
+                    <span v-if="scope.row.payType == '1'">支付方式:支付宝</span>
+                    <span v-if="scope.row.payType == '2'">支付方式:现金</span>
+                    <span v-if="scope.row.payType == '3'">支付方式:余额</span>
+                </template>
             </el-table-column>
-
-            <el-table-column label="颜色" align="center" width="150">
-              <template slot-scope="scope">
-                <span v-for="(item, index) in scope.row.orderClothColors">
-                  {{ index == 0 ? item.clothColorName : ',' + item.clothColorName }}
-                </span>
-              </template>
+            <el-table-column label="客户信息" align="center" width="140">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.appUserName ? scope.row.appUserName : '--' }}</span>
+                    <br />
+                    <span>{{ scope.row.appUserPhoneNumber ? scope.row.appUserPhoneNumber : '' }}</span>
+                </template>
             </el-table-column>
-            <el-table-column label="瑕疵" align="center" width="150">
-              <template slot-scope="scope">
-                <span v-for="(item, index) in scope.row.orderClothFlaws">
-                  {{ index == 0 ? item.clothFlawName : ',' + item.clothFlawName }}
-                </span>
-                <el-tag v-if="!scope.row.orderClothFlaws">暂无</el-tag>
-              </template>
+            <el-table-column label="订单时间" align="center" prop="createTime" min-width="200" />
+            <el-table-column label="付款方式" align="center" prop="createTime" min-width="120">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.payTimeType == '0'">收衣付款</span>
+                    <span v-if="scope.row.payTimeType == '1'">取衣付款</span>
+                </template>
             </el-table-column>
-            <el-table-column label="特殊处理" align="center" width="150">
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.orderClothCrafts" size="small" v-for="item in scope.row.orderClothCrafts" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">
-                  {{ item.clothCraftName }}
-                </el-tag>
-                <el-tag v-if="!scope.row.orderClothCrafts">暂无</el-tag>
-              </template>
+            <el-table-column label="预约配送状态" align="center" width="150">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.cloth_appointment_status" :value="scope.row.refundStatus" />
+                </template>
             </el-table-column>
-            
-            <el-table-column label="附件" align="center">
-              <template slot-scope="scope">
-                <el-tag size="small" v-for="item in scope.row.orderClothAdjuncts" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">
-                  {{ item.adjunctName + '*' + item.num }}
-                </el-tag>
-                <el-tag v-if="!scope.row.orderClothAdjuncts">暂无</el-tag>
-              </template>
+            <el-table-column label="订单状态" align="center" width="150">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.cloth_order_status" :value="scope.row.orderStatus" />
+                </template>
             </el-table-column>
-            <el-table-column label="洗衣速度" align="center" prop="clothSpeedName" width="150" />
-            <el-table-column label="挂衣号" align="center" >
-              <template slot-scope="scope">
-                <span v-if="scope.row.clothHanger">
-                  {{ scope.row.clothHanger.name + '#' + scope.row.clothHangerCode }}
-                </span>
-              </template>
+            <el-table-column label="退款状态" align="center" width="150">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
+                </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" prop="flowStatus" width="80">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
-              </template>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="250">
+                <template slot-scope="scope">
+                    <el-button type="text" icon="el-icon-s-order" @click="handleDetail(scope)">详情</el-button>
+                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.orderStatus != '10' && scope.row.orderStatus != '11' && scope.row.orderStatus != '4'" @click="handleClose(scope.row)">撤单 </el-button>
+                    <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType != '00'" @click="btn_lodop(scope.row)">打印</el-button>
+                </template>
             </el-table-column>
-          </el-table>
-        </el-col>
-      </el-row>
+        </Page>
+
+        <!-- 添加或修改洗衣订单衣服明细对话框 -->
+        <el-dialog :title="title" :visible.sync="open" size="70%" append-to-body>
+            <el-row :gutter="15" style="margin-bottom: 80px; margin-left: 20px; width: calc(100% - 20px)">
+                <el-col :span="24">
+                    <el-descriptions class="margin-top" :column="2" border>
+                        <el-descriptions-item>
+                            <template slot="label"> 订单号 </template>
+                            {{ orderDetail.orderNo }}
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <template slot="label"> 支付方式 </template>
+                            <template v-if="orderDetail.payType == '0'">微信</template>
+                            <template v-if="orderDetail.payType == '1'">支付宝</template>
+                            <template v-if="orderDetail.payType == '2'">现金</template>
+                            <template v-if="orderDetail.payType == '3'">余额</template>
+                            ({{ orderDetail.payAmount }}元)
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <template slot="label"> 姓名 </template>
+                            {{ orderDetail.appUserName }}
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <template slot="label"> 电话 </template>
+                            {{ orderDetail.appUserPhoneNumber }}
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <template slot="label"> 总金额(元) </template>
+                            {{ orderDetail.orderClothPrice }}
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <template slot="label"> 时间 </template>
+                            {{ orderDetail.createTime }}
+                        </el-descriptions-item>
+                        <el-descriptions-item :span="2" v-if="userInfoVO.userType == '00'">
+                            <template slot="label"> 门店名称 </template>
+                            {{ orderDetail.sysOrg ? orderDetail.sysOrg.name : '' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <template slot="label"> 订单备注 </template>
+                            {{ orderDetail.remark }}
+                        </el-descriptions-item>
+                    </el-descriptions>
+                </el-col>
+                <el-col :span="24" style="margin-top: 10px">
+                    <el-table :data="orderClothDetails" fit highlight-current-row border stripe>
+                        <el-table-column label="衣物条码" align="center" prop="washCode" width="180" fixed="left" />
+                        <el-table-column label="衣服名称" align="center" prop="clothItemName" width="200">
+                            <template slot-scope="scope">
+                                <span> {{ calculateClothName(scope.row) }} </span>
+                            </template>
+                        </el-table-column>
+
+                        <el-table-column label="颜色" align="center" width="150">
+                            <template slot-scope="scope">
+                                <span v-for="(item, index) in scope.row.orderClothColors">
+                                    {{ index == 0 ? item.clothColorName : ',' + item.clothColorName }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="瑕疵" align="center" width="150">
+                            <template slot-scope="scope">
+                                <span v-for="(item, index) in scope.row.orderClothFlaws">
+                                    {{ index == 0 ? item.clothFlawName : ',' + item.clothFlawName }}
+                                </span>
+                                <el-tag v-if="!scope.row.orderClothFlaws">暂无</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="特殊处理" align="center" width="150">
+                            <template slot-scope="scope">
+                                <el-tag v-if="scope.row.orderClothCrafts" size="small" v-for="item in scope.row.orderClothCrafts" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">
+                                    {{ item.clothCraftName }}
+                                </el-tag>
+                                <el-tag v-if="!scope.row.orderClothCrafts">暂无</el-tag>
+                            </template>
+                        </el-table-column>
 
-      <div slot="footer" class="dialog-footer">
-        <!--        <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>-->
-        <el-button @click="cancel" style="margin-left: 5%">关 闭</el-button>
-      </div>
-    </el-dialog>
+                        <el-table-column label="附件" align="center">
+                            <template slot-scope="scope">
+                                <el-tag size="small" v-for="item in scope.row.orderClothAdjuncts" style="margin-right: 10px; margin-bottom: 2.5px; margin-top: 2.5px">
+                                    {{ item.adjunctName + '*' + item.num }}
+                                </el-tag>
+                                <el-tag v-if="!scope.row.orderClothAdjuncts">暂无</el-tag>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="洗衣速度" align="center" prop="clothSpeedName" width="150" />
+                        <el-table-column label="挂衣号" align="center">
+                            <template slot-scope="scope">
+                                <span v-if="scope.row.clothHanger">
+                                    {{ scope.row.clothHanger.name + '#' + scope.row.clothHangerCode }}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="状态" align="center" prop="flowStatus" width="80">
+                            <template slot-scope="scope">
+                                <dict-tag :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-col>
+            </el-row>
 
-    <el-dialog title="打印操作" :visible.sync="pointerType" width="30%" :before-close="handlePointerClose" class="pointer_content">
-      <div class="pointer_view">
-        <div class="pointer_icon">
-          <i class="el-icon-printer"></i>
-        </div>
-        <div class="btn_box">
-          <div class="btn" @click="setPointer(0)">打印小票</div>
-          <div class="btn" @click="setPointer(1)">打印条码</div>
-          <div class="btn" @click="pointerType = false">关闭</div>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
+            <div slot="footer" class="dialog-footer">
+                <!--        <el-button type="primary" @click="submitForm" style="margin-left: 5%">提交</el-button>-->
+                <el-button @click="cancel" style="margin-left: 5%">关 闭</el-button>
+            </div>
+        </el-dialog>
+
+        <el-dialog title="打印操作" :visible.sync="pointerType" width="30%" :before-close="handlePointerClose" class="pointer_content">
+            <div class="pointer_view">
+                <div class="pointer_icon">
+                    <i class="el-icon-printer"></i>
+                </div>
+                <div class="btn_box">
+                    <div class="btn" @click="setPointer(0)">打印小票</div>
+                    <div class="btn" @click="setPointer(1)">打印条码</div>
+                    <div class="btn" @click="pointerType = false">关闭</div>
+                </div>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -227,263 +223,263 @@ import { getLodop } from '@/utils/lodopUtils'
 import { allOrg } from '@/api/system/store'
 
 export default {
-  name: 'ClothItem',
-  dicts: ['sys_yes_no','cloth_appointment_status', 'order_cloth_flow_status', 'order_cloth_flow_action', 'cloth_order_status', 'goods_order_refund_status'],
-  data() {
-    return {
-      orgList: [],
-      storeList: [],
-      factoryList: [],
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 洗衣订单衣服明细表格数据
-      clothOrderList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        orderStatus: null,
-        orderSource: null,
-        orderNo: null,
-        orgIndex: null
-      },
-      createTimeRange: [],
-      // 表单参数
-      form: {},
-      orderDetail: {},
-      orderClothDetails: [],
-      // 表单校验
-      rules: {},
-      userInfoVO: null,
+    name: 'ClothItem',
+    dicts: ['sys_yes_no', 'cloth_appointment_status', 'order_cloth_flow_status', 'order_cloth_flow_action', 'cloth_order_status', 'goods_order_refund_status'],
+    data() {
+        return {
+            orgList: [],
+            storeList: [],
+            factoryList: [],
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 洗衣订单衣服明细表格数据
+            clothOrderList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                orderStatus: null,
+                orderSource: null,
+                orderNo: null,
+                orgIndex: null
+            },
+            createTimeRange: [],
+            // 表单参数
+            form: {},
+            orderDetail: {},
+            orderClothDetails: [],
+            // 表单校验
+            rules: {},
+            userInfoVO: null,
 
-      LODOP: null,
-      number: 1,
-      pointerList: [],
-      pointerType: false,
-      pointerInfo: null
-    }
-  },
-  created() {
-    this.userInfoVO = this.getUserInfo()
-    allOrg().then((res) => {
-      this.orgList = res.data
-      this.orgList.forEach((org) => {
-        if (org.sourceType == '01') {
-          this.factoryList.push(org)
-        } else {
-          this.storeList.push(org)
+            LODOP: null,
+            number: 1,
+            pointerList: [],
+            pointerType: false,
+            pointerInfo: null
         }
-      })
-    })
-    this.getList()
-  },
-  mounted() {
-    this.number = 1
-    const printerTime = setInterval(() => {
-      this.LODOP = getLodop()
-      this.number++
-      if (this.number == 25) {
-        clearInterval(printerTime)
-      }
-      if (this.LODOP) {
-        clearInterval(printerTime)
-      }
-    }, 200)
-
-    this.pointerList = JSON.parse(this.$cache.local.get('printerSeting'))
-  },
-  methods: {
-    /** 查询洗衣订单衣服明细列表 */
-    getList() {
-      this.loading = true
-      if (null != this.createTimeRange && '' != this.createTimeRange) {
-        this.queryParams['beginCreateTime'] = this.createTimeRange[0]
-        this.queryParams['endCreateTime'] = this.createTimeRange[1]
-      } else {
-        delete this.queryParams.beginCreateTime
-        delete this.queryParams.endCreateTime
-      }
-      if (this.queryParams.orgIndex != null) {
-        this.queryParams.orgId = this.queryParams.orgIndex.split(',')[0]
-        this.queryParams.sourceType = this.queryParams.orgIndex.split(',')[1]
-      } else {
-        delete this.queryParams.orgId
-        delete this.queryParams.sourceType
-      }
-      this.$nextTick(() => {
-        this.$refs.pagination.handleSearch(true)
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.resetForm('form')
-    },
-    calculateClothName(row) {
-      var clothName = row.clothItemName
-      if (row.orderClothTypes) {
-        row.orderClothTypes.forEach((item) => {
-          clothName += ' 【' + item.clothTypeName + '】'
-        })
-      }
-      return clothName
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加洗衣订单衣服明细'
-    },
-    /** 详情按钮 */
-    handleDetail(scope) {
-      console.log('handleDetail')
-      this.reset()
-      this.orderClothDetails = []
-      this.orderDetail = scope.row
-      listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: scope.row.orderNo }).then((res) => {
-        this.orderClothDetails = res.data.records
-        this.title = '订单详情'
-        this.open = true
-      })
-    },
-    handleClose(row) {
-      var _this = this
-      var content = '退单金额如下:'
-      if (row.payType == '0') {
-        content += '微信 '
-      } else if (row.payType == '1') {
-        content += '支付宝 '
-      } else if (row.payType == '2') {
-        content += '现金 '
-      } else if (row.payType == '3') {
-        content += '余额 '
-      }
-      content += row.payAmount + '元!是否确定撤单?'
-      this.$confirm(content).then(function () {
-        refundOrderCloth({ orderId: row.id }).then((res) => {
-          _this.$message({
-            type: 'success',
-            message: '撤单成功'
-          })
-          _this.getList()
-        })
-      })
-    },
-    checkClose(done) {
-      this.$confirm('是否关闭表单,关闭后数据将丢失?')
-        .then(function () {
-          done()
+    created() {
+        this.userInfoVO = this.getUserInfo()
+        allOrg().then((res) => {
+            this.orgList = res.data
+            this.orgList.forEach((org) => {
+                if (org.sourceType == '01') {
+                    this.factoryList.push(org)
+                } else {
+                    this.storeList.push(org)
+                }
+            })
         })
-        .then(() => { })
-        .catch(() => { })
+        this.getList()
     },
-    handlePointerClose(done) {
-      this.$confirm('是否关闭打印操作?')
-        .then(function () {
-          done()
-        })
-        .then(() => { })
-        .catch(() => { })
+    mounted() {
+        this.number = 1
+        const printerTime = setInterval(() => {
+            this.LODOP = getLodop()
+            this.number++
+            if (this.number == 25) {
+                clearInterval(printerTime)
+            }
+            if (this.LODOP) {
+                clearInterval(printerTime)
+            }
+        }, 200)
+
+        this.pointerList = JSON.parse(this.$cache.local.get('printerSeting'))
     },
-    btn_lodop(row) {
-      if (this.userInfoVO.userType == '02') {
-        const obj = {
-          name: this.userInfoVO.storeName,
-          contactPhone: this.userInfoVO.phonenumber,
-          user: this.userInfoVO.nickName
-        }
-        row.sysOrg = obj
-      }
+    methods: {
+        /** 查询洗衣订单衣服明细列表 */
+        getList() {
+            this.loading = true
+            if (null != this.createTimeRange && '' != this.createTimeRange) {
+                this.queryParams['beginCreateTime'] = this.createTimeRange[0]
+                this.queryParams['endCreateTime'] = this.createTimeRange[1]
+            } else {
+                delete this.queryParams.beginCreateTime
+                delete this.queryParams.endCreateTime
+            }
+            if (this.queryParams.orgIndex != null) {
+                this.queryParams.orgId = this.queryParams.orgIndex.split(',')[0]
+                this.queryParams.sourceType = this.queryParams.orgIndex.split(',')[1]
+            } else {
+                delete this.queryParams.orgId
+                delete this.queryParams.sourceType
+            }
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
+            })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.resetForm('form')
+        },
+        calculateClothName(row) {
+            var clothName = row.clothItemName
+            if (row.orderClothTypes) {
+                row.orderClothTypes.forEach((item) => {
+                    clothName += ' 【' + item.clothTypeName + '】'
+                })
+            }
+            return clothName
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id)
+            this.single = selection.length !== 1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset()
+            this.open = true
+            this.title = '添加洗衣订单衣服明细'
+        },
+        /** 详情按钮 */
+        handleDetail(scope) {
+            console.log('handleDetail')
+            this.reset()
+            this.orderClothDetails = []
+            this.orderDetail = scope.row
+            listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: scope.row.orderNo }).then((res) => {
+                this.orderClothDetails = res.rows
+                this.title = '订单详情'
+                this.open = true
+            })
+        },
+        handleClose(row) {
+            var _this = this
+            var content = '退单金额如下:'
+            if (row.payType == '0') {
+                content += '微信 '
+            } else if (row.payType == '1') {
+                content += '支付宝 '
+            } else if (row.payType == '2') {
+                content += '现金 '
+            } else if (row.payType == '3') {
+                content += '余额 '
+            }
+            content += row.payAmount + '元!是否确定撤单?'
+            this.$confirm(content).then(function () {
+                refundOrderCloth({ orderId: row.id }).then((res) => {
+                    _this.$message({
+                        type: 'success',
+                        message: '撤单成功'
+                    })
+                    _this.getList()
+                })
+            })
+        },
+        checkClose(done) {
+            this.$confirm('是否关闭表单,关闭后数据将丢失?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        },
+        handlePointerClose(done) {
+            this.$confirm('是否关闭打印操作?')
+                .then(function () {
+                    done()
+                })
+                .then(() => {})
+                .catch(() => {})
+        },
+        btn_lodop(row) {
+            if (this.userInfoVO.userType == '02') {
+                const obj = {
+                    name: this.userInfoVO.storeName,
+                    contactPhone: this.userInfoVO.phonenumber,
+                    user: this.userInfoVO.nickName
+                }
+                row.sysOrg = obj
+            }
 
-      this.pointerInfo = row
+            this.pointerInfo = row
 
-      listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: row.orderNo }).then((res) => {
-        this.pointerInfo.orderClothDetails = res.data.records
-      })
+            listOrderClothItem({ pageSize: 99999, pageNum: 1, orderNo: row.orderNo }).then((res) => {
+                this.pointerInfo.orderClothDetails = res.data.records
+            })
 
-      this.pointerType = true
-    },
-    setPointer(type) {
-      if (!this.LODOP) {
-        this.$modal.msgError('请安装打印机软件')
-        return
-      }
+            this.pointerType = true
+        },
+        setPointer(type) {
+            if (!this.LODOP) {
+                this.$modal.msgError('请安装打印机软件')
+                return
+            }
 
-      let p_name = ''
+            let p_name = ''
 
-      this.pointerList.forEach((pointer) => {
-        if (pointer.printType == type) {
-          p_name = pointer.printName
-        }
-      })
+            this.pointerList.forEach((pointer) => {
+                if (pointer.printType == type) {
+                    p_name = pointer.printName
+                }
+            })
 
-      // console.log(this.pointerList, p_name)
+            // console.log(this.pointerList, p_name)
 
-      if (type == 0) {
-        this.laundryPrinter(this.LODOP, this.pointerInfo, p_name)
-      } else {
-        this.barCodePrinter(this.LODOP, this.pointerInfo, p_name)
-      }
+            if (type == 0) {
+                this.laundryPrinter(this.LODOP, this.pointerInfo, p_name)
+            } else {
+                this.barCodePrinter(this.LODOP, this.pointerInfo, p_name)
+            }
 
-      this.pointerType = false
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      if (null != this.createTimeRange && '' != this.createTimeRange) {
-        this.queryParams['beginCreateTime'] = this.createTimeRange[0]
-        this.queryParams['endCreateTime'] = this.createTimeRange[1]
-      } else {
-        delete this.queryParams.beginCreateTime
-        delete this.queryParams.endCreateTime
-      }
-      if (this.queryParams.orgIndex != null) {
-        this.queryParams.orgId = this.queryParams.orgIndex.split(',')[0]
-        this.queryParams.sourceType = this.queryParams.orgIndex.split(',')[1]
-      } else {
-        delete this.queryParams.orgId
-        delete this.queryParams.sourceType
-      }
-      this.download(
-        'mapi/order/cloth/export',
-        {
-          ...this.queryParams
+            this.pointerType = false
         },
-        `cloth_order_${new Date().getTime()}.xlsx`
-      )
+        /** 导出按钮操作 */
+        handleExport() {
+            if (null != this.createTimeRange && '' != this.createTimeRange) {
+                this.queryParams['beginCreateTime'] = this.createTimeRange[0]
+                this.queryParams['endCreateTime'] = this.createTimeRange[1]
+            } else {
+                delete this.queryParams.beginCreateTime
+                delete this.queryParams.endCreateTime
+            }
+            if (this.queryParams.orgIndex != null) {
+                this.queryParams.orgId = this.queryParams.orgIndex.split(',')[0]
+                this.queryParams.sourceType = this.queryParams.orgIndex.split(',')[1]
+            } else {
+                delete this.queryParams.orgId
+                delete this.queryParams.sourceType
+            }
+            this.download(
+                'mapi/order/cloth/export',
+                {
+                    ...this.queryParams
+                },
+                `cloth_order_${new Date().getTime()}.xlsx`
+            )
+        }
     }
-  }
 }
 </script>
 

+ 56 - 48
src/views/order/retailOrder/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form :model="queryParams" ref="queryForm" :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" />
             </el-form-item>
@@ -16,11 +16,8 @@
                 <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
             </el-form-item>
             <br />
-            <!--            <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-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>
@@ -29,21 +26,25 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>
-            </el-col>
+            <!--            <el-col :span="1.5">-->
+            <!--                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出 </el-button>-->
+            <!--            </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="orderLoading" fit highlight-current-row border stripe :data="GoodsList">
-            <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
+        <Page uri="/mapi/order/goods/list" :request-params="queryParams" ref="pagination">
             <el-table-column label="订单编号" align="center" prop="orderNo" width="150px" />
-            <el-table-column label="客户姓名" align="center" prop="realName" width="150px" />
-            <el-table-column label="手机号" align="center" prop="phoneNumber" width="150px" />
+            <el-table-column label="客户信息" align="center" width="150">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.realName ? scope.row.realName : '--' }}</span>
+                    <br />
+                    <span>{{ scope.row.phoneNumber ? scope.row.phoneNumber : '' }}</span>
+                </template>
+            </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">
-                    {{ scope.row.deductAmount ? scope.row.deductAmount : '0' }}
+                    {{ scope.row.deductAmount ? scope.row.deductAmount : '--' }}
                 </template>
             </el-table-column>
             <el-table-column label="支付金额" align="center" prop="payAmount" width="100px" />
@@ -57,24 +58,25 @@
                     <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
                 </template>
             </el-table-column>
-
-            <el-table-column label="支付时间" align="center" prop="payTime" width="150px" />
             <el-table-column label="下单时间" align="center" prop="createTime" width="150px" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="150px">
+                <template slot-scope="scope">
+                    {{ scope.row.payTime ? scope.row.payTime : '--' }}
+                </template>
+            </el-table-column>
             <!--      <el-table-column label="发货时间" align="center" prop="sendTime" width="200px"/>-->
             <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>
-                    <el-button type="text" icon="el-icon-check" @click="rePay(scope.row)" v-if="scope.row.orderStatus == '0' && userInfoVO.userType == '02'">重新支付</el-button>
-                    <el-button type="text" icon="el-icon-close" @click="cancelOrder(scope.row)" v-if="scope.row.orderStatus == '0'">取消订单</el-button>
-                    <el-button type="text" icon="el-icon-check" @click="outOrderGoods(scope.row)" v-if="scope.row.orderStatus == '2' && userInfoVO.userType == '00'">出货</el-button>
+                    <el-button type="text" icon="el-icon-check" @click="rePay(scope.row)" v-if="scope.row.orderStatus == '0' && userInfoVO.userType == '02'">重新支付 </el-button>
+                    <el-button type="text" icon="el-icon-close" @click="cancelOrder(scope.row)" v-if="scope.row.orderStatus == '0'">取消订单 </el-button>
+                    <el-button type="text" icon="el-icon-check" @click="outOrderGoods(scope.row)" v-if="scope.row.orderStatus == '2' && userInfoVO.userType == '00'">出货 </el-button>
                     <el-button type="text" icon="el-icon-truck" @click="deliveryInfo(scope.row)" v-if="scope.row.deliveryNo"> 物流信息 </el-button>
-                    <el-button type="text" icon="el-icon-chat-dot-square" @click="refundOrder(scope.row)" v-if="userInfoVO.userType == '00' && scope.row.refundStatus != '1' && scope.row.refundStatus != '2' && scope.row.orderStatus != '0'">撤单</el-button>
-                    <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType != '00'" @click="btn_lodop(scope.row)">打印</el-button>
+                    <el-button type="text" icon="el-icon-chat-dot-square" @click="refundOrder(scope.row)" v-if="userInfoVO.userType == '00' && scope.row.refundStatus != '1' && scope.row.refundStatus != '2' && scope.row.orderStatus != '0' && scope.row.orderStatus != '100'"> 撤单 </el-button>
+                    <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType != '00'" @click="btn_lodop(scope.row)">打印 </el-button>
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
 
         <!--    详情-->
         <el-dialog :title="detailTitle" :visible.sync="openDetail" size="80%">
@@ -85,17 +87,17 @@
                     <el-descriptions-item label="订单状态">
                         <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus" />
                     </el-descriptions-item>
-                    <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }}</el-descriptions-item>
-                    <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }}</el-descriptions-item>
-                    <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.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>
-                    <el-descriptions-item label="物流单号">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }}</el-descriptions-item>
-                    <el-descriptions-item label="收货地址" span="3">{{ detailView.province }}{{ detailView.city }}{{ detailView.area }}{{ detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
-                    <el-descriptions-item label="备注信息" span="3">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }} </el-descriptions-item>
+                    <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }} </el-descriptions-item>
+                    <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.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>
+                    <el-descriptions-item label="物流单号">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }} </el-descriptions-item>
+                    <el-descriptions-item label="收货地址" span="3">{{ detailView.province }}{{ detailView.city }}{{ detailView.area }}{{ detailView.address }}{{ detailView.addressDetail }} </el-descriptions-item>
+                    <el-descriptions-item label="备注信息" span="3">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }} </el-descriptions-item>
                 </el-descriptions>
             </el-card>
             <div class="head-column2">
@@ -132,9 +134,11 @@
         <!--    重新支付页面 -->
         <el-dialog title="订单支付" :visible.sync="openRePayPage" size="60%" append-to-body>
             <el-descriptions title="核对信息" v-if="appUserInfo" :column="3" border :contentStyle="{ 'text-align': 'center' }" style="margin-left: 15px; margin-right: 15px">
-                <el-descriptions-item label="总件数(件)" :labelStyle="{ width: '16%' }" :label-style="{ 'text-align': 'center' }">{{ calculateTotalCount }}</el-descriptions-item>
-                <el-descriptions-item label="抵扣金额(元)" :labelStyle="{ width: '16%' }" :label-style="{ 'text-align': 'center' }">{{ payFrom.deductAmount ? '¥' + payFrom.deductAmount : '¥' + '0' }}</el-descriptions-item>
-                <el-descriptions-item label="卡余额(元)" :labelStyle="{ width: '16%' }" :label-style="{ 'text-align': 'center' }">¥{{ appUserInfo ? appUserInfo.rechargeBalance + appUserInfo.giveBalance : '0.00' }}</el-descriptions-item>
+                <el-descriptions-item label="总件数(件)" :labelStyle="{ width: '16%' }" :label-style="{ 'text-align': 'center' }">{{ calculateTotalCount }} </el-descriptions-item>
+                <el-descriptions-item label="抵扣金额(元)" :labelStyle="{ width: '16%' }" :label-style="{ 'text-align': 'center' }">
+                    {{ payFrom.deductAmount ? '¥' + payFrom.deductAmount : '¥' + '0' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="卡余额(元)" :labelStyle="{ width: '16%' }" :label-style="{ 'text-align': 'center' }"> ¥{{ appUserInfo ? appUserInfo.rechargeBalance + appUserInfo.giveBalance : '0.00' }} </el-descriptions-item>
 
                 <el-descriptions-item label="原价(元)">{{ costTotalPrice }}</el-descriptions-item>
                 <el-descriptions-item label="折后金额(元)">{{ calculatePayMoney }}</el-descriptions-item>
@@ -169,7 +173,7 @@
                             <div v-if="payFrom.payType">
                                 <el-col :span="8">
                                     <el-descriptions :column="2" style="width: 400px" v-if="payFrom.payType == '3' && appUserInfo">
-                                        <el-descriptions-item label="客户姓名">{{ appUserInfo ? appUserInfo.realName : '- -' }}</el-descriptions-item>
+                                        <el-descriptions-item label="客户姓名">{{ appUserInfo ? appUserInfo.realName : '- -' }} </el-descriptions-item>
                                         <el-descriptions-item label="余额(元)"> ¥{{ appUserInfo ? appUserInfo.rechargeBalance + appUserInfo.giveBalance : '0.00' }} </el-descriptions-item>
                                     </el-descriptions>
                                 </el-col>
@@ -198,7 +202,7 @@
                     </el-row>
                     <el-row :gutter="10">
                         <div>
-                            <el-button type="primary" @click="submitSettlement" style="margin-left: 3%; margin-top: 20px">结算</el-button>
+                            <el-button type="primary" @click="submitSettlement" style="margin-left: 3%; margin-top: 20px">结算 </el-button>
                         </div>
                     </el-row>
                 </el-form>
@@ -258,8 +262,8 @@
                         </el-form-item>
 
                         <!-- <el-form-item label="包裹数量" prop="count">
-              <el-input v-model="deliveryVo.count" type="number" placeholder="请输入包裹数量" clearable></el-input>
-            </el-form-item> -->
+  <el-input v-model="deliveryVo.count" type="number" placeholder="请输入包裹数量" clearable></el-input>
+</el-form-item> -->
 
                         <el-form-item label="货物高度" prop="spaceHeight">
                             <el-input v-model="deliveryVo.spaceHeight" placeholder="请输入货物高度" clearable>
@@ -370,8 +374,6 @@ export default {
             openRefundPage: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 realName: null,
                 phoneNumber: null,
                 orderNo: null,
@@ -539,11 +541,9 @@ export default {
             }
         },
         getList() {
-            this.orderLoading = true
-            listGoods({ ...this.queryParams, ...{ goodsType: this.goodsType } }).then((response) => {
-                this.GoodsList = response.rows
-                this.total = response.total
-                this.orderLoading = false
+            this.queryParams.goodsType = this.goodsType
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         /** 搜索按钮操作 */
@@ -874,21 +874,25 @@ export default {
     text-align: center;
     line-height: 40px;
 }
+
 .head-container-two {
     height: 500px;
     display: block;
     overflow-y: scroll;
 }
+
 .head-column1 {
     height: 300px;
     display: block;
     overflow-y: scroll;
 }
+
 .head-column2 {
     height: 600px;
     display: block;
     overflow-y: scroll;
 }
+
 .box-shadow .el-button--medium {
     font-size: 18px;
 }
@@ -903,6 +907,7 @@ export default {
     display: inline-block;
     cursor: pointer;
     position: relative;
+
     &::after {
         content: '';
         position: absolute;
@@ -915,6 +920,7 @@ export default {
         z-index: 50;
         opacity: 0;
     }
+
     .check {
         position: absolute;
         top: -5px;
@@ -928,6 +934,7 @@ export default {
         &::after {
             opacity: 1;
         }
+
         .check {
             opacity: 1;
         }
@@ -940,6 +947,7 @@ export default {
     border-radius: 5px;
     background-color: #f4f4f4;
     color: #555;
+
     .info:first-child {
         margin-bottom: 10px;
     }

+ 321 - 380
src/views/order/serviceOrder/carBeautyOrder.vue

@@ -1,413 +1,354 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单编号" prop="orderNo">
-        <el-input
-          v-model="queryParams.orderNo"
-          placeholder="请输入订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
-          <el-option v-for="dict in dict.type.order_goods_status"
-                     :key="dict.value"
-                     :label="dict.label"
-                     :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入客户姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phoneNumber">
-        <el-input
-          v-model="queryParams.phoneNumber"
-          placeholder="请输入手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付时间">
-        <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 label="下单时间">
-        <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>
-        <el-button icon="el-icon-refresh"   @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="订单编号" prop="orderNo">
+                <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="订单状态" prop="orderStatus">
+                <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
+                    <el-option v-for="dict in dict.type.order_goods_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="客户姓名" prop="realName">
+                <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="手机号" prop="phoneNumber">
+                <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="支付时间">
+                <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 label="下单时间">
+                <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>
+                <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">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-           
-          @click="handleExport"
-          v-hasPermi="['order:goods:export']"
-          v-if="userInfoVO.userType == '00'"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+        <el-row :gutter="10" class="mb8">
+            <!--            <el-col :span="1.5">-->
+            <!--                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>-->
+            <!--            </el-col>-->
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <Page uri="/mapi/order/goods/list" :request-params="queryParams" ref="pagination">
+            <el-table-column label="订单编号" align="center" prop="orderNo" width="150px" />
+            <el-table-column label="客户信息" align="center" width="150">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.realName ? scope.row.realName : '--' }}</span>
+                    <br />
+                    <span>{{ scope.row.phoneNumber ? scope.row.phoneNumber : '' }}</span>
+                </template>
+            </el-table-column>
+            <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 label="订单总价" align="center" prop="totalPrice" width="100px" />
+            <el-table-column label="抵扣金额" align="center" prop="deductAmount" width="100px">
+                <template slot-scope="scope">
+                    {{ scope.row.deductAmount ? scope.row.deductAmount : '--' }}
+                </template>
+            </el-table-column>
+            <el-table-column label="支付金额" align="center" prop="payAmount" width="100px" />
+            <el-table-column label="支付方式" align="center" prop="payType" width="100px">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
+                </template>
+            </el-table-column>
+            <el-table-column label="订单状态" align="center" prop="orderStatus">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="下单时间" align="center" prop="createTime" width="150px" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="150px">
+                <template slot-scope="scope">
+                    {{ scope.row.payTime ? scope.row.payTime : '--' }}
+                </template>
+            </el-table-column>
+            <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>
+                    <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 == '4'">确认</el-button>
+                    <!-- <el-button
 
-    <el-table v-loading="orderLoading" :data="GoodsList" >
-      <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
-      <el-table-column label="订单编号" align="center" prop="orderNo" width="250px"/>
-      <el-table-column label="客户姓名" align="center" prop="realName" width="200px"/>
-      <el-table-column label="手机号" align="center" prop="phoneNumber" width="200px"/>
-      <el-table-column label="订单总价(元)" align="center" prop="totalPrice" width="200px"/>
-      <el-table-column label="抵扣金额(元)" align="center" prop="deductAmount" width="200px">
-        <template slot-scope="scope">
-          {{scope.row.deductAmount?scope.row.deductAmount:'0'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="200px"/>
-      <el-table-column label="订单状态" align="center" prop="orderStatus" width="200px">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付方式" align="center" prop="payType" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="下单时间" align="center" prop="createTime" width="200px"/>
-      <el-table-column label="支付时间" align="center" prop="payTime" width="200px"/>
-<!--      <el-table-column label="发货时间" align="center" prop="sendTime" width="200px"/>-->
-      <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>
-          <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 == '4'"
-          >确认</el-button>
-          <!-- <el-button
-             
             type="text"
             icon="el-icon-check"
             @click="outOrderGoods(scope.row)"
             v-if="scope.row.orderStatus == '2' && userInfoVO.userType == '00'"
           >出货</el-button> -->
-        </template>
-      </el-table-column>
-    </el-table>
+                </template>
+            </el-table-column>
+        </Page>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-
-    <!--    详情-->
-    <el-dialog :title="detailTitle" :visible.sync="openDetail" width="80%" >
-      <el-card >
-        <el-descriptions title="客户信息"   v-show="detailView" :column="3" border
-                         :label-style="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">
-          <el-descriptions-item label="客户姓名" >{{detailView.realName}}</el-descriptions-item>
-          <el-descriptions-item label="客户手机号">{{detailView.phoneNumber }}</el-descriptions-item>
-          <el-descriptions-item label="订单状态">
-            <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus"/>
-          </el-descriptions-item>
-          <el-descriptions-item label="收货联系人">{{detailView.contactName?detailView.contactName:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="收货人手机号">{{detailView.contactPhone?detailView.contactPhone:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="订单总价">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>
-          <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.finishTime?detailView.finishTime:'暂无信息'}}</el-descriptions-item>
-<!--          <el-descriptions-item label="物流公司">{{detailView.deliveryCompany?detailView.deliveryCompany:'暂无信息'}}</el-descriptions-item>-->
-<!--          <el-descriptions-item label="物流单号">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>-->
-          <el-descriptions-item label="收货地址" span="3">{{detailView.province }}{{ detailView.city }}{{ detailView.area }}{{detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
-          <el-descriptions-item label="备注信息" span="3">{{detailView.deliveryNo?detailView.deliveryNo:'暂无信息'}}</el-descriptions-item>
-
-        </el-descriptions>
-      </el-card>
-      <div class="head-column2">
-        <el-table v-loading="detailLoading" :data="detailView.orderGoodsSkuList">
-          <el-table-column label="分类" align="center" prop="goodsCategoryName" />
-          <el-table-column :label="goodsType==0?'商品名称':'材料名称'" align="center" prop="goodsName" width="250px"/>
-          <el-table-column :label="goodsType==0?'商品规格':'材料规格'" align="center" width="250px">
-            <template slot-scope="scope">
-              <div style="text-align: center">{{scope.row.skuName.replace(' ','/')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="数量" align="center" prop="buyNum"/>
-          <el-table-column label="价格(元)" align="center" prop="marketPrice" />
-          <el-table-column label="总和(元)" align="center" >
-            <template slot-scope="scope">
-              <span>{{ scope.row.buyNum * scope.row.marketPrice }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-row :gutter="10" class="box-shadow" style="margin-top: 10px">
-        <el-col :span="21">
-          <el-form label-width="130px" style="height: 80px;padding-top: 20px;text-align: right" :inline="true" size="small">
-            <el-form-item label="总金额(元):" >
-              {{ costTotalPrice }}
-            </el-form-item>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
+        <!--    详情-->
+        <el-dialog :title="detailTitle" :visible.sync="openDetail" width="80%">
+            <el-card>
+                <el-descriptions title="客户信息" v-show="detailView" :column="3" border :label-style="{ 'text-align': 'center' }" :contentStyle="{ 'text-align': 'center' }">
+                    <el-descriptions-item label="客户姓名">{{ detailView.realName }}</el-descriptions-item>
+                    <el-descriptions-item label="客户手机号">{{ detailView.phoneNumber }}</el-descriptions-item>
+                    <el-descriptions-item label="订单状态">
+                        <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus" />
+                    </el-descriptions-item>
+                    <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="订单总价">{{ detailView.totalPrice ? detailView.totalPrice : '暂无信息' }}</el-descriptions-item>
+                    <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.finishTime ? detailView.finishTime : '暂无信息' }}</el-descriptions-item>
+                    <!--          <el-descriptions-item label="物流公司">{{detailView.deliveryCompany?detailView.deliveryCompany:'暂无信息'}}</el-descriptions-item>-->
+                    <!--          <el-descriptions-item label="物流单号">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>-->
+                    <el-descriptions-item label="收货地址" span="3">{{ detailView.province }}{{ detailView.city }}{{ detailView.area }}{{ detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
+                    <el-descriptions-item label="备注信息" span="3">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div class="head-column2">
+                <el-table v-loading="detailLoading" :data="detailView.orderGoodsSkuList">
+                    <el-table-column label="分类" align="center" prop="goodsCategoryName" />
+                    <el-table-column :label="goodsType == 0 ? '商品名称' : '材料名称'" align="center" prop="goodsName" width="250px" />
+                    <el-table-column :label="goodsType == 0 ? '商品规格' : '材料规格'" align="center" width="250px">
+                        <template slot-scope="scope">
+                            <div style="text-align: center">{{ scope.row.skuName.replace(' ', '/') }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="数量" align="center" prop="buyNum" />
+                    <el-table-column label="价格(元)" align="center" prop="marketPrice" />
+                    <el-table-column label="总和(元)" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.buyNum * scope.row.marketPrice }}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <el-row :gutter="10" class="box-shadow" style="margin-top: 10px">
+                <el-col :span="21">
+                    <el-form label-width="130px" style="height: 80px; padding-top: 20px; text-align: right" :inline="true" size="small">
+                        <el-form-item label="总金额(元):">
+                            {{ costTotalPrice }}
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import { getGoods, listGoods, receiveOrder, confirmFinish } from '@/api/order/goods'
 import { findUserByPhoneNumber, getUser } from '@/api/app/user'
 
-
-
 export default {
-  name: "carBeautyOrder",
-  dicts:['order_goods_status','delivery_company','recharge_pay_type'],
-  data() {
-    return {
-      userInfoVO:null,
-      //
-      orderLoading: true,
-      // 遮罩层
-      loading: false,
-      detailLoading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 弹出层标题
-      title: "",
-      detailTitle:"",
-      // 是否显示弹出层
-      open: false,
-      openDetail:false,
-      openRePayPage:false,
-      openDeliveryPage:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        realName:null,
-        phoneNumber:null,
-        orderNo:null,
-        orderStatus:null,
-      },
-      // 表单参数
-      payFrom: {
-      },
-      // 表单校验
-      rules: {
-      },
-      goodsType:null,
-      // 商品订单表格数据
-      GoodsList: [],
-      // 可选商品集合
-      goodsList: null,
-      // 已选商品集合
-      addGoodsList:[],
-      // 自定义一个计算数量的临时对象集合
-      purchaseCountVOList: [],
-      // 总金额
-      totalPrice:0,
-      // 总件数
-      totalCount:0,
-      // 详情数据
-      detailView: {},
-      // 详情总金额
-      costTotalPrice: null,
-      appUserInfo:null,
-      goodsOrderInfo:null,
-      payMoney:null,
-      deliveryVo:{
-        orderId:null,
-        deliveryCompany:null,
-        deliveryNo:null
-      },
-      queryCreateTime: null,
-      queryPayTime: null,
-    };
-  },
-  created() {
-    this.handleUser();
-    this.goodsType = this.getUrlParam('goodsType');
-    this.getList();
-  },
-  computed:{
-    calculateTotalCount(){
-      this.totalCount = 0;
-      this.detailView.orderGoodsSkuList.forEach(vo =>{
-        this.totalCount = this.totalCount + vo.buyNum;
-      });
-      return this.totalCount;
-    },
-    calculatePayMoney(){
-      this.payMoney = this.payFrom.deductAmount?this.costTotalPrice - this.payFrom.deductAmount:this.costTotalPrice;
-      return this.payMoney;
-    }
-  },
-  methods: {
-    handleUser(){
-      this.userInfoVO = this.getUserInfo();
-    },
-    getCreateTime(){
-      if (this.queryCreateTime != null) {
-        this.queryParams.createTimeFrom = this.queryCreateTime[0]
-        this.queryParams.createTimeTo = this.queryCreateTime[1]
-      }
-    },
-    getPayTime(){
-      if (this.queryPayTime != null) {
-        this.queryParams.beginPayTime = this.queryPayTime[0]
-        this.queryParams.endPayTime = this.queryPayTime[1]
-      }
+    name: 'carBeautyOrder',
+    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type'],
+    data() {
+        return {
+            userInfoVO: null,
+            //
+            orderLoading: true,
+            // 遮罩层
+            loading: false,
+            detailLoading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            detailTitle: '',
+            // 是否显示弹出层
+            open: false,
+            openDetail: false,
+            openRePayPage: false,
+            openDeliveryPage: false,
+            // 查询参数
+            queryParams: {
+                realName: null,
+                phoneNumber: null,
+                orderNo: null,
+                orderStatus: null
+            },
+            // 表单参数
+            payFrom: {},
+            // 表单校验
+            rules: {},
+            goodsType: null,
+            // 商品订单表格数据
+            GoodsList: [],
+            // 可选商品集合
+            goodsList: null,
+            // 已选商品集合
+            addGoodsList: [],
+            // 自定义一个计算数量的临时对象集合
+            purchaseCountVOList: [],
+            // 总金额
+            totalPrice: 0,
+            // 总件数
+            totalCount: 0,
+            // 详情数据
+            detailView: {},
+            // 详情总金额
+            costTotalPrice: null,
+            appUserInfo: null,
+            goodsOrderInfo: null,
+            payMoney: null,
+            deliveryVo: {
+                orderId: null,
+                deliveryCompany: null,
+                deliveryNo: null
+            },
+            queryCreateTime: null,
+            queryPayTime: null
+        }
     },
-    getList() {
-      this.orderLoading = true;
-      listGoods({...this.queryParams,...{goodsType:this.goodsType}}).then(response => {
-        this.GoodsList = response.rows;
-        this.total = response.total;
-        this.orderLoading = false;
-      });
+    created() {
+        this.handleUser()
+        this.goodsType = this.getUrlParam('goodsType')
+        this.getList()
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+    computed: {
+        calculateTotalCount() {
+            this.totalCount = 0
+            this.detailView.orderGoodsSkuList.forEach((vo) => {
+                this.totalCount = this.totalCount + vo.buyNum
+            })
+            return this.totalCount
+        },
+        calculatePayMoney() {
+            this.payMoney = this.payFrom.deductAmount ? this.costTotalPrice - this.payFrom.deductAmount : this.costTotalPrice
+            return this.payMoney
+        }
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryCreateTime = null;
-      this.queryParams.createTimeFrom = null;
-      this.queryParams.createTimeTo = null;
+    methods: {
+        handleUser() {
+            this.userInfoVO = this.getUserInfo()
+        },
+        getCreateTime() {
+            if (this.queryCreateTime != null) {
+                this.queryParams.createTimeFrom = this.queryCreateTime[0]
+                this.queryParams.createTimeTo = this.queryCreateTime[1]
+            }
+        },
+        getPayTime() {
+            if (this.queryPayTime != null) {
+                this.queryParams.beginPayTime = this.queryPayTime[0]
+                this.queryParams.endPayTime = this.queryPayTime[1]
+            }
+        },
+        getList() {
+            this.queryParams.goodsType = this.goodsType
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryCreateTime = null
+            this.queryParams.createTimeFrom = null
+            this.queryParams.createTimeTo = null
 
-      this.queryPayTime = null;
-      this.queryParams.beginPayTime = null;
-      this.queryParams.endPayTime = null;
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
+            this.queryPayTime = null
+            this.queryParams.beginPayTime = null
+            this.queryParams.endPayTime = null
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
 
-    // 订单详情
-    orderDetail(row){
-      this.openDetail = true;
-      this.detailTitle = '订单商品详情';
-      this.detailLoading = true;
-      this.detailView = {};
-      const id = row.id
-      getGoods(id).then(response => {
-        this.detailView = response.data;
-        this.costTotalPrice = this.detailView.totalPrice;
-        this.detailLoading = false;
-      });
-    },
+        // 订单详情
+        orderDetail(row) {
+            this.openDetail = true
+            this.detailTitle = '订单商品详情'
+            this.detailLoading = true
+            this.detailView = {}
+            const id = row.id
+            getGoods(id).then((response) => {
+                this.detailView = response.data
+                this.costTotalPrice = this.detailView.totalPrice
+                this.detailLoading = false
+            })
+        },
 
-    //接单
-    btn_receiving(row){
-      this.$confirm('是否确认接单?').then(() => {
-        const vo = {
-          orderId : row.id
-        }
-        receiveOrder(vo).then(response2 => {
-          this.$modal.msgSuccess("接单成功");
-          this.getList();
-        });
-      }).catch(() => {});
-    },
+        //接单
+        btn_receiving(row) {
+            this.$confirm('是否确认接单?')
+                .then(() => {
+                    const vo = {
+                        orderId: row.id
+                    }
+                    receiveOrder(vo).then((response2) => {
+                        this.$modal.msgSuccess('接单成功')
+                        this.getList()
+                    })
+                })
+                .catch(() => {})
+        },
 
-    //确认订单
-    btn_confirm(row){
-      this.$confirm('是否确认完成该订单?').then(() => {
-        const vo = {
-          orderId : row.id
+        //确认订单
+        btn_confirm(row) {
+            this.$confirm('是否确认完成该订单?')
+                .then(() => {
+                    const vo = {
+                        orderId: row.id
+                    }
+                    confirmFinish(vo).then((response2) => {
+                        this.$modal.msgSuccess('确认完成成功')
+                        this.getList()
+                    })
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'mapi/order/goods/export',
+                {
+                    ...this.queryParams,
+                    ...{ goodsType: this.goodsType }
+                },
+                `goods_order_${new Date().getTime()}.xlsx`
+            )
         }
-        confirmFinish(vo).then(response2 => {
-          this.$modal.msgSuccess("确认完成成功");
-          this.getList();
-        });
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('mapi/order/goods/export', {
-        ...this.queryParams, ...{ goodsType: this.goodsType }
-      }, `goods_order_${new Date().getTime()}.xlsx`)
-    },
-  }
-};
+    }
+}
 </script>
 <style>
 .list_title {
-  text-align: center;
-  line-height: 40px;
+    text-align: center;
+    line-height: 40px;
 }
-.head-container-two{
-  height: 500px;
-  display: block;
-  overflow-y: scroll;
+.head-container-two {
+    height: 500px;
+    display: block;
+    overflow-y: scroll;
 }
-.head-column1{
-  height: 300px;
-  display: block;
-  overflow-y: scroll;
+.head-column1 {
+    height: 300px;
+    display: block;
+    overflow-y: scroll;
 }
-.head-column2{
-  height: 600px;
-  display: block;
-  overflow-y: scroll;
+.head-column2 {
+    height: 600px;
+    display: block;
+    overflow-y: scroll;
 }
-.box-shadow .el-button--medium{
-  font-size: 18px;
+.box-shadow .el-button--medium {
+    font-size: 18px;
 }
 </style>

+ 320 - 387
src/views/order/serviceOrder/lifeServicesOrder.vue

@@ -1,415 +1,348 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单编号" prop="orderNo">
-        <el-input
-          v-model="queryParams.orderNo"
-          placeholder="请输入订单编号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="订单状态" prop="orderStatus">
-        <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
-          <el-option v-for="dict in dict.type.order_goods_status"
-                     :key="dict.value"
-                     :label="dict.label"
-                     :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="客户姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入客户姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号" prop="phoneNumber">
-        <el-input
-          v-model="queryParams.phoneNumber"
-          placeholder="请输入手机号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="支付时间">
-        <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 label="下单时间">
-        <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>
-        <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">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-           
-          @click="handleExport"
-          v-hasPermi="['order:goods:export']"
-          v-if="userInfoVO.userType == '00'"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="orderLoading" :data="GoodsList" >
-      <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
-      <el-table-column label="订单编号" align="center" prop="orderNo" width="250px"/>
-      <el-table-column label="客户姓名" align="center" prop="realName" width="200px"/>
-      <el-table-column label="手机号" align="center" prop="phoneNumber" width="200px"/>
-      <el-table-column label="预约时间" align="center" prop="appointmentTime" width="200px"/>
-      <el-table-column label="订单总价(元)" align="center" prop="totalPrice" width="200px"/>
-      <el-table-column label="抵扣金额(元)" align="center" prop="deductAmount" width="200px">
-        <template slot-scope="scope">
-          {{scope.row.deductAmount?scope.row.deductAmount:'0'}}
-        </template>
-      </el-table-column>
-      <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="200px"/>
-      <el-table-column label="订单状态" align="center" prop="orderStatus" width="200px">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="支付方式" align="center" prop="payType" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="下单时间" align="center" prop="createTime" width="200px"/>
-      <el-table-column label="支付时间" align="center" prop="payTime" width="200px"/>
-<!--      <el-table-column label="发货时间" align="center" prop="sendTime" width="200px"/>-->
-      <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>
-          <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 == '4'"
-          >确认</el-button>
-          <!-- <el-button
-             
-            type="text"
-            icon="el-icon-check"
-            @click="outOrderGoods(scope.row)"
-            v-if="scope.row.orderStatus == '2' && userInfoVO.userType == '00'"
-          >出货</el-button> -->
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+            <el-form-item label="订单编号" prop="orderNo">
+                <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="订单状态" prop="orderStatus">
+                <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
+                    <el-option v-for="dict in dict.type.order_goods_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="客户姓名" prop="realName">
+                <el-input v-model="queryParams.realName" placeholder="请输入客户姓名" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="手机号" prop="phoneNumber">
+                <el-input v-model="queryParams.phoneNumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="支付时间">
+                <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 label="下单时间">
+                <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>
+                <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">-->
+            <!--                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>-->
+            <!--            </el-col>-->
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-    <!--    详情-->
-    <el-dialog :title="detailTitle" :visible.sync="openDetail" width="80%" >
-      <el-card >
-        <el-descriptions title="客户信息"   v-show="detailView" :column="3" border
-                         :label-style="{'text-align': 'center'}" :contentStyle="{'text-align': 'center'}">
-          <el-descriptions-item label="客户姓名">{{detailView.realName}}</el-descriptions-item>
-          <el-descriptions-item label="客户手机号">{{detailView.phoneNumber }}</el-descriptions-item>
-          <el-descriptions-item label="订单状态">
-            <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus"/>
-          </el-descriptions-item>
-          <el-descriptions-item label="收货联系人">{{detailView.contactName?detailView.contactName:'暂无信息'}}</el-descriptions-item>
-          <el-descriptions-item label="收货人手机号">{{detailView.contactPhone?detailView.contactPhone:'暂无信息'}}</el-descriptions-item>
-          <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.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>-->
-<!--          <el-descriptions-item label="物流单号">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>-->
-          <el-descriptions-item label="收货地址" span="3">{{detailView.province }}{{ detailView.city }}{{ detailView.area }}{{detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
-          <el-descriptions-item label="备注信息" span="3">{{detailView.deliveryNo?detailView.deliveryNo:'暂无信息'}}</el-descriptions-item>
+        <Page uri="/mapi/order/goods/list" :request-params="queryParams" ref="pagination">
+            <el-table-column label="订单编号" align="center" prop="orderNo" width="150px" />
+            <el-table-column label="客户信息" align="center" width="150">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.realName ? scope.row.realName : '--' }}</span>
+                    <br />
+                    <span>{{ scope.row.phoneNumber ? scope.row.phoneNumber : '' }}</span>
+                </template>
+            </el-table-column>
+            <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 label="订单总价" align="center" prop="totalPrice" width="100px" />
+            <el-table-column label="抵扣金额" align="center" prop="deductAmount" width="100px">
+                <template slot-scope="scope">
+                    {{ scope.row.deductAmount ? scope.row.deductAmount : '--' }}
+                </template>
+            </el-table-column>
+            <el-table-column label="支付金额" align="center" prop="payAmount" width="100px" />
+            <el-table-column label="支付方式" align="center" prop="payType" width="100px">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
+                </template>
+            </el-table-column>
+            <el-table-column label="订单状态" align="center" prop="orderStatus">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="下单时间" align="center" prop="createTime" width="150px" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="150px">
+                <template slot-scope="scope">
+                    {{ scope.row.payTime ? scope.row.payTime : '--' }}
+                </template>
+            </el-table-column>
 
-        </el-descriptions>
-      </el-card>
-      <div class="head-column2">
-        <el-table v-loading="detailLoading" :data="detailView.orderGoodsSkuList">
-          <el-table-column label="分类" align="center" prop="goodsCategoryName" />
-          <el-table-column :label="goodsType==0?'商品名称':'材料名称'" align="center" prop="goodsName" width="250px"/>
-          <el-table-column :label="goodsType==0?'商品规格':'材料规格'" align="center" width="250px">
-            <template slot-scope="scope">
-              <div style="text-align: center">{{scope.row.skuName.replace(' ','/')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="数量" align="center" prop="buyNum"/>
-          <el-table-column label="价格(元)" align="center" prop="marketPrice" />
-          <el-table-column label="总和(元)" align="center" >
-            <template slot-scope="scope">
-              <span>{{ scope.row.buyNum * scope.row.marketPrice }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <el-row :gutter="10" class="box-shadow" style="margin-top: 10px">
-        <el-col :span="21">
-          <el-form label-width="130px" style="height: 80px;padding-top: 20px;text-align: right" :inline="true" size="small">
-            <el-form-item label="总金额(元):" >
-              {{ costTotalPrice }}
-            </el-form-item>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
+            <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>
+                    <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 == '4'">确认</el-button>
+                </template>
+            </el-table-column>
+        </Page>
+        <!--    详情-->
+        <el-dialog :title="detailTitle" :visible.sync="openDetail" width="80%">
+            <el-card>
+                <el-descriptions title="客户信息" v-show="detailView" :column="3" border :label-style="{ 'text-align': 'center' }" :contentStyle="{ 'text-align': 'center' }">
+                    <el-descriptions-item label="客户姓名">{{ detailView.realName }}</el-descriptions-item>
+                    <el-descriptions-item label="客户手机号">{{ detailView.phoneNumber }}</el-descriptions-item>
+                    <el-descriptions-item label="订单状态">
+                        <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus" />
+                    </el-descriptions-item>
+                    <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }}</el-descriptions-item>
+                    <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }}</el-descriptions-item>
+                    <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.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>-->
+                    <!--          <el-descriptions-item label="物流单号">{{detailView.totalPrice?detailView.totalPrice:'暂无信息'}}</el-descriptions-item>-->
+                    <el-descriptions-item label="收货地址" span="3">{{ detailView.province }}{{ detailView.city }}{{ detailView.area }}{{ detailView.address }}{{ detailView.addressDetail }}</el-descriptions-item>
+                    <el-descriptions-item label="备注信息" span="3">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }}</el-descriptions-item>
+                </el-descriptions>
+            </el-card>
+            <div class="head-column2">
+                <el-table v-loading="detailLoading" :data="detailView.orderGoodsSkuList">
+                    <el-table-column label="分类" align="center" prop="goodsCategoryName" />
+                    <el-table-column :label="goodsType == 0 ? '商品名称' : '材料名称'" align="center" prop="goodsName" width="250px" />
+                    <el-table-column :label="goodsType == 0 ? '商品规格' : '材料规格'" align="center" width="250px">
+                        <template slot-scope="scope">
+                            <div style="text-align: center">{{ scope.row.skuName.replace(' ', '/') }}</div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="数量" align="center" prop="buyNum" />
+                    <el-table-column label="价格(元)" align="center" prop="marketPrice" />
+                    <el-table-column label="总和(元)" align="center">
+                        <template slot-scope="scope">
+                            <span>{{ scope.row.buyNum * scope.row.marketPrice }}</span>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <el-row :gutter="10" class="box-shadow" style="margin-top: 10px">
+                <el-col :span="21">
+                    <el-form label-width="130px" style="height: 80px; padding-top: 20px; text-align: right" :inline="true" size="small">
+                        <el-form-item label="总金额(元):">
+                            {{ costTotalPrice }}
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import { getGoods, listGoods, receiveOrder, confirmFinish } from '@/api/order/goods'
 import { findUserByPhoneNumber, getUser } from '@/api/app/user'
 
-
-
 export default {
-  name: "lifeServicesOrder",
-  dicts:['order_goods_status','delivery_company','recharge_pay_type'],
-  data() {
-    return {
-      userInfoVO:null,
-      //
-      orderLoading: true,
-      // 遮罩层
-      loading: false,
-      detailLoading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 弹出层标题
-      title: "",
-      detailTitle:"",
-      // 是否显示弹出层
-      open: false,
-      openDetail:false,
-      openRePayPage:false,
-      openDeliveryPage:false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        realName:null,
-        phoneNumber:null,
-        orderNo:null,
-        orderStatus:null,
-      },
-      // 表单参数
-      payFrom: {
-      },
-      // 表单校验
-      rules: {
-      },
-      goodsType:null,
-      // 商品订单表格数据
-      GoodsList: [],
-      // 可选商品集合
-      goodsList: null,
-      // 已选商品集合
-      addGoodsList:[],
-      // 自定义一个计算数量的临时对象集合
-      purchaseCountVOList: [],
-      // 总金额
-      totalPrice:0,
-      // 总件数
-      totalCount:0,
-      // 详情数据
-      detailView: {},
-      // 详情总金额
-      costTotalPrice: null,
-      appUserInfo:null,
-      goodsOrderInfo:null,
-      payMoney:null,
-      deliveryVo:{
-        orderId:null,
-        deliveryCompany:null,
-        deliveryNo:null
-      },
-      queryCreateTime: null,
-      queryPayTime: null,
-    };
-  },
-  created() {
-    this.handleUser();
-    this.goodsType = this.getUrlParam('goodsType');
-    this.getList();
-  },
-  computed:{
-    calculateTotalCount(){
-      this.totalCount = 0;
-      this.detailView.orderGoodsSkuList.forEach(vo =>{
-        this.totalCount = this.totalCount + vo.buyNum;
-      });
-      return this.totalCount;
-    },
-    calculatePayMoney(){
-      this.payMoney = this.payFrom.deductAmount?this.costTotalPrice - this.payFrom.deductAmount:this.costTotalPrice;
-      return this.payMoney;
-    }
-  },
-  methods: {
-    handleUser(){
-      this.userInfoVO = this.getUserInfo();
-    },
-    getCreateTime(){
-      if (this.queryCreateTime != null) {
-        this.queryParams.createTimeFrom = this.queryCreateTime[0]
-        this.queryParams.createTimeTo = this.queryCreateTime[1]
-      }
-    },
-    getPayTime(){
-      if (this.queryPayTime != null) {
-        this.queryParams.beginPayTime = this.queryPayTime[0]
-        this.queryParams.endPayTime = this.queryPayTime[1]
-      }
+    name: 'lifeServicesOrder',
+    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type'],
+    data() {
+        return {
+            userInfoVO: null,
+            //
+            orderLoading: true,
+            // 遮罩层
+            loading: false,
+            detailLoading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 弹出层标题
+            title: '',
+            detailTitle: '',
+            // 是否显示弹出层
+            open: false,
+            openDetail: false,
+            openRePayPage: false,
+            openDeliveryPage: false,
+            // 查询参数
+            queryParams: {
+                realName: null,
+                phoneNumber: null,
+                orderNo: null,
+                orderStatus: null
+            },
+            // 表单参数
+            payFrom: {},
+            // 表单校验
+            rules: {},
+            goodsType: null,
+            // 商品订单表格数据
+            GoodsList: [],
+            // 可选商品集合
+            goodsList: null,
+            // 已选商品集合
+            addGoodsList: [],
+            // 自定义一个计算数量的临时对象集合
+            purchaseCountVOList: [],
+            // 总金额
+            totalPrice: 0,
+            // 总件数
+            totalCount: 0,
+            // 详情数据
+            detailView: {},
+            // 详情总金额
+            costTotalPrice: null,
+            appUserInfo: null,
+            goodsOrderInfo: null,
+            payMoney: null,
+            deliveryVo: {
+                orderId: null,
+                deliveryCompany: null,
+                deliveryNo: null
+            },
+            queryCreateTime: null,
+            queryPayTime: null
+        }
     },
-    getList() {
-      this.orderLoading = true;
-      listGoods({...this.queryParams,...{goodsType:this.goodsType}}).then(response => {
-        this.GoodsList = response.rows;
-        this.total = response.total;
-        this.orderLoading = false;
-      });
+    created() {
+        this.handleUser()
+        this.goodsType = this.getUrlParam('goodsType')
+        this.getList()
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+    computed: {
+        calculateTotalCount() {
+            this.totalCount = 0
+            this.detailView.orderGoodsSkuList.forEach((vo) => {
+                this.totalCount = this.totalCount + vo.buyNum
+            })
+            return this.totalCount
+        },
+        calculatePayMoney() {
+            this.payMoney = this.payFrom.deductAmount ? this.costTotalPrice - this.payFrom.deductAmount : this.costTotalPrice
+            return this.payMoney
+        }
     },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryCreateTime = null;
-      this.queryParams.createTimeFrom = null;
-      this.queryParams.createTimeTo = null;
+    methods: {
+        handleUser() {
+            this.userInfoVO = this.getUserInfo()
+        },
+        getCreateTime() {
+            if (this.queryCreateTime != null) {
+                this.queryParams.createTimeFrom = this.queryCreateTime[0]
+                this.queryParams.createTimeTo = this.queryCreateTime[1]
+            }
+        },
+        getPayTime() {
+            if (this.queryPayTime != null) {
+                this.queryParams.beginPayTime = this.queryPayTime[0]
+                this.queryParams.endPayTime = this.queryPayTime[1]
+            }
+        },
+        getList() {
+            this.queryParams.goodsType = this.goodsType
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
+            })
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryCreateTime = null
+            this.queryParams.createTimeFrom = null
+            this.queryParams.createTimeTo = null
 
-      this.queryPayTime = null;
-      this.queryParams.beginPayTime = null;
-      this.queryParams.endPayTime = null;
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
+            this.queryPayTime = null
+            this.queryParams.beginPayTime = null
+            this.queryParams.endPayTime = null
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
 
-    // 订单详情
-    orderDetail(row){
-      this.openDetail = true;
-      this.detailTitle = '订单商品详情';
-      this.detailLoading = true;
-      this.detailView = {};
-      const id = row.id
-      getGoods(id).then(response => {
-        this.detailView = response.data;
-        this.costTotalPrice = this.detailView.totalPrice;
-        this.detailLoading = false;
-      });
-    },
+        // 订单详情
+        orderDetail(row) {
+            this.openDetail = true
+            this.detailTitle = '订单商品详情'
+            this.detailLoading = true
+            this.detailView = {}
+            const id = row.id
+            getGoods(id).then((response) => {
+                this.detailView = response.data
+                this.costTotalPrice = this.detailView.totalPrice
+                this.detailLoading = false
+            })
+        },
 
-    //接单
-    btn_receiving(row){
-      this.$confirm('是否确认接单?').then(() => {
-        const vo = {
-          orderId : row.id
-        }
-        receiveOrder(vo).then(response2 => {
-          this.$modal.msgSuccess("接单成功");
-          this.getList();
-        });
-      }).catch(() => {});
-    },
+        //接单
+        btn_receiving(row) {
+            this.$confirm('是否确认接单?')
+                .then(() => {
+                    const vo = {
+                        orderId: row.id
+                    }
+                    receiveOrder(vo).then((response2) => {
+                        this.$modal.msgSuccess('接单成功')
+                        this.getList()
+                    })
+                })
+                .catch(() => {})
+        },
 
-    //确认订单
-    btn_confirm(row){
-      this.$confirm('是否确认完成该订单?').then(() => {
-        const vo = {
-          orderId : row.id
+        //确认订单
+        btn_confirm(row) {
+            this.$confirm('是否确认完成该订单?')
+                .then(() => {
+                    const vo = {
+                        orderId: row.id
+                    }
+                    confirmFinish(vo).then((response2) => {
+                        this.$modal.msgSuccess('确认完成成功')
+                        this.getList()
+                    })
+                })
+                .catch(() => {})
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                'mapi/order/goods/export',
+                {
+                    ...this.queryParams,
+                    ...{ goodsType: this.goodsType }
+                },
+                `goods_order_${new Date().getTime()}.xlsx`
+            )
         }
-        confirmFinish(vo).then(response2 => {
-          this.$modal.msgSuccess("确认完成成功");
-          this.getList();
-        });
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('mapi/order/goods/export', {
-        ...this.queryParams, ...{ goodsType: this.goodsType }
-      }, `goods_order_${new Date().getTime()}.xlsx`)
-    },
-  }
-};
+    }
+}
 </script>
 <style>
 .list_title {
-  text-align: center;
-  line-height: 40px;
+    text-align: center;
+    line-height: 40px;
 }
-.head-container-two{
-  height: 500px;
-  display: block;
-  overflow-y: scroll;
+.head-container-two {
+    height: 500px;
+    display: block;
+    overflow-y: scroll;
 }
-.head-column1{
-  height: 300px;
-  display: block;
-  overflow-y: scroll;
+.head-column1 {
+    height: 300px;
+    display: block;
+    overflow-y: scroll;
 }
-.head-column2{
-  height: 600px;
-  display: block;
-  overflow-y: scroll;
+.head-column2 {
+    height: 600px;
+    display: block;
+    overflow-y: scroll;
 }
-.box-shadow .el-button--medium{
-  font-size: 18px;
+.box-shadow .el-button--medium {
+    font-size: 18px;
 }
 </style>

+ 23 - 16
src/views/refund/refundRetailOrder/index.vue

@@ -22,44 +22,51 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>
-            </el-col>
+            <!--            <el-col :span="1.5">-->
+            <!--                <el-button type="warning" plain icon="el-icon-download" @click="handleExport" v-hasPermi="['order:goods:export']" v-if="userInfoVO.userType == '00'">导出</el-button>-->
+            <!--            </el-col>-->
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
         <Page uri="/mapi/order/goods/refundOrderGoodsList" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <el-table-column label="订单编号" align="center" prop="orderNo" width="190" />
-            <el-table-column label="客户姓名" align="center" prop="realName" width="80px" />
-            <el-table-column label="手机号" align="center" prop="phoneNumber" width="110px" />
-            <el-table-column label="订单总价(元)" align="center" prop="totalPrice" width="120px" />
-            <el-table-column label="抵扣金额(元)" align="center" prop="deductAmount" width="120px">
+            <el-table-column label="客户信息" align="center" width="150">
                 <template slot-scope="scope">
-                    {{ scope.row.deductAmount ? scope.row.deductAmount : '0' }}
+                    <span>{{ scope.row.realName ? scope.row.realName : '--' }}</span>
+                    <br />
+                    <span>{{ scope.row.phoneNumber ? scope.row.phoneNumber : '' }}</span>
                 </template>
             </el-table-column>
+            <el-table-column label="订单总价(元)" align="center" prop="totalPrice" width="120px" />
             <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="120px" />
-            <el-table-column label="订单状态" align="center" prop="orderStatus" width="90px">
+            <el-table-column label="订单状态" align="center" prop="orderStatus" width="100px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
                 </template>
             </el-table-column>
-            <el-table-column label="退款状态" align="center" prop="refundStatus" width="90px">
+            <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="120px" />
+            <el-table-column label="退款描述" align="center" prop="refundReason" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <span>{{ scope.row.refundReason ? scope.row.refundReason : '--' }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款状态" align="center" prop="refundStatus" width="100px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.goods_order_refund_status" :value="scope.row.refundStatus" />
                 </template>
             </el-table-column>
-            <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="120px" />
-            <el-table-column label="退款描述" align="center" prop="refundReason" show-overflow-tooltip />
-            <el-table-column label="退款时间" align="center" prop="refundTime" width="180" />
-            <el-table-column label="支付方式" align="center" prop="payType">
+            <el-table-column label="退款时间" align="center" prop="refundTime" width="140px" />
+            <el-table-column label="支付方式" align="center" prop="payType" width="120px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
                 </template>
             </el-table-column>
-            <el-table-column label="下单时间" align="center" prop="createTime" width="180" />
-            <el-table-column label="支付时间" align="center" prop="payTime" width="180" />
+            <el-table-column label="支付时间" align="center" prop="payTime" width="140">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.payTime ? scope.row.payTime : '--' }}</span>
+                </template>
+            </el-table-column>
             <!--      <el-table-column label="发货时间" align="center" prop="sendTime" width="200px"/>-->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="250">
                 <template slot-scope="scope">

+ 7 - 16
src/views/systemSet/sellGoods/index.vue

@@ -32,8 +32,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="orderLoading" :data="purchaseGoodsList">
-            <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
+        <Page uri="/mapi/order/purchaseGoods/sellGoodsList" :request-params="queryParams" ref="pagination">
             <el-table-column label="订单编号" align="center" prop="orderNo" width="250px" />
             <el-table-column label="门店名称" align="center" prop="orgName" width="150px" v-if="userInfoVO.userType == '01'" />
             <el-table-column label="工厂名称" align="center" prop="orgName" width="150px" v-if="userInfoVO.userType == '00'" />
@@ -65,14 +64,11 @@
                     <el-button type="text" icon="el-icon-check" @click="confirmOrder(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="scope.row.orderStatus == '1'">接单</el-button>
                     <el-button type="text" icon="el-icon-close" @click="refuseOrder(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="scope.row.orderStatus == '1'">拒单</el-button>
                     <el-button type="text" icon="el-icon-shopping-cart-full" @click="selectDeliveryWay(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="scope.row.orderStatus == '2'">出货</el-button>
-
                     <el-button type="text" icon="el-icon-truck" @click="deliveryInfo(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="(scope.row.orderStatus == '3' || scope.row.orderStatus == '4' || scope.row.orderStatus == '5') && scope.row.deliveryWay == '1'">物流信息</el-button>
                     <el-button type="text" icon="el-icon-check" @click="confirmReceive(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="scope.row.orderStatus == '3' || scope.row.orderStatus == '4'">确认交货</el-button>
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
 
         <!--    详情-->
         <el-dialog :title="detailTitle" :visible.sync="openDetail" size="80%">
@@ -291,10 +287,7 @@ export default {
             open: false,
             openDetail: false,
             // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10
-            },
+            queryParams: {},
             // 表单参数
             form: {},
             // 表单校验
@@ -402,7 +395,7 @@ export default {
             })
         })
         this.getList()
-        this.getdeliveryAll()
+        // this.getdeliveryAll()
     },
     watch: {
         'deliveryVo.expectTime': {
@@ -616,11 +609,9 @@ export default {
                 .catch(() => {})
         },
         getList() {
-            this.orderLoading = true
-            sellGoodsList({ ...this.queryParams, ...{ goodsType: this.goodsType } }).then((response) => {
-                this.purchaseGoodsList = response.rows
-                this.total = response.total
-                this.orderLoading = false
+            this.queryParams.goodsType = this.goodsType
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         /** 搜索按钮操作 */

+ 10 - 14
src/views/systemSet/sellGoods/retailStore.vue

@@ -27,7 +27,7 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="orderLoading" :data="purchaseGoodsList">
+        <Page uri="/mapi/order/purchaseGoods/sellGoodsListByHqFactory" :request-params="queryParams" ref="pagination">
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <el-table-column label="订单编号" align="center" prop="orderNo" width="250px" />
             <el-table-column label="门店名称" align="center" prop="orgName" width="150px" v-if="userInfoVO.userType == '01'" />
@@ -48,12 +48,12 @@
                     <span v-if="scope.row.deliveryWay == '0'">到店自取</span>
                     <span v-if="scope.row.deliveryWay == '1'">快递</span>
                     <span v-if="scope.row.deliveryWay == '2'">自送</span>
+                    <span v-else>--</span>
                 </template>
             </el-table-column>
-            <el-table-column label="下单时间" align="center" prop="createTime" width="200px" />
-            <el-table-column label="支付时间" align="center" prop="payTime" width="200px" />
-            <el-table-column label="发货时间" align="center" prop="sendTime" width="200px" />
-            <el-table-column label="确认收货时间" align="center" prop="finishTime" width="200px" />
+            <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" 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>
@@ -64,9 +64,7 @@
                     <el-button type="text" icon="el-icon-check" @click="confirmReceive(scope.row)" v-hasPermi="['order:purchaseGoods:edit']" v-if="scope.row.orderStatus == '3' || scope.row.orderStatus == '4'">确认交货</el-button>
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+        </Page>
 
         <!--    详情-->
         <el-dialog :title="detailTitle" :visible.sync="openDetail" size="80%">
@@ -395,7 +393,7 @@ export default {
             })
         })
         this.getList()
-        this.getdeliveryAll()
+        // this.getdeliveryAll()
     },
     methods: {
         // 获取登录人信息
@@ -570,11 +568,9 @@ export default {
             })
         },
         getList() {
-            this.orderLoading = true
-            sellGoodsListByHqFactory({ ...this.queryParams, ...{ goodsType: this.goodsType } }).then((response) => {
-                this.purchaseGoodsList = response.rows
-                this.total = response.total
-                this.orderLoading = false
+            this.queryParams.goodsType = this.goodsType
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         /** 搜索按钮操作 */