Merge branch 'master' of https://gitee.com/vansfa/rt_adminUI

src/api/qw/account.js

@@ -29,8 +29,8 @@ export function addAccount(data) {
 // 审核企微功能账号管理
 export function auditAccount(data) {
   return request({
-    url: '/qw/account',
-    method: 'put',
+    url: '/qw/account/audit',
+    method: 'post',
     data: data
   })
 }

src/api/store/storeOrder.js

@@ -9,6 +9,14 @@ export function listStoreOrder(query) {
   })
 }
 
+// 查询订单明细总数
+export function getOrderItemsNum(query) {
+  return request({
+    url: '/store/storeOrder/orderItemsNum',
+    method: 'get',
+    params: query
+  })
+}
 // 查询尾款订单列表
 export function listPayRemainOrder(query) {
   return request({
@@ -54,6 +62,22 @@ export function getStoreOrder(id) {
   })
 }
 
+// 查询订单详细
+export function getStoreOrderAddress(id) {
+  return request({
+    url: '/store/storeOrder/queryAddress/' + id,
+    method: 'get'
+  })
+}
+
+// 查询订单详细
+export function getStoreOrderPhone(id) {
+  return request({
+    url: '/store/storeOrder/queryPhone/' + id,
+    method: 'get'
+  })
+}
+
 
 export function getExpress(id) {
   return request({
@@ -203,6 +227,14 @@ export function syncExpress(data) {
     data: data
   })
 }
+
+export function updateErp(data) {
+  return request({
+    url: '/store/storeOrder/updateErpOrder',
+    method: 'post',
+    data: data
+  })
+}
 export function addTuiMoney(data) {
   return request({
     url: '/store/storeOrder/addTuiMoney',

src/views/qw/qwAccounts/index.vue

@@ -130,8 +130,8 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-hasPermi="['qw:account:query']"
             @click="handleAudit(scope.row)"
-            v-hasPermi="['qw:account:audit']"
           >审核</el-button>
           <el-button
             size="mini"
@@ -154,6 +154,9 @@
 
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="账号" prop="account">
+          <el-input v-model="form.account" disabled   />
+        </el-form-item>
         <el-form-item label="公司" prop="companyName">
           <el-input v-model="form.companyName" disabled   />
         </el-form-item>
@@ -171,7 +174,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-hasPermi="['qw:account:audit']">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -340,6 +343,7 @@ export default {
       const id = row.id || this.ids
       getAccount(id).then(response => {
         this.form = response.data;
+        this.form.account = row.account; 
         this.form.companyName = row.companyName;
         this.form.companyUserName = row.companyUserName;
         this.form.isAudit="1"

src/views/store/components/productOrder.vue

@@ -44,7 +44,7 @@
           <el-button size="mini" @click="auditPayRemain()" >尾款审核</el-button>
         </div>
         <div class="operate-button-container" >
-          <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流单号</el-button>
+          <el-button size="mini" @click="editDelivery()"  v-hasPermi="['store:storeOrder:editDeliveryId']" >修改物流</el-button>
         </div>
         <div class="operate-button-container" v-if="order.status >=1 && order.extendOrderId == null && order.deliveryId == null"  v-hasPermi="['store:storeOrder:createErpOrder']"  >
           <el-button size="mini" @click="addErpOrder()" >创建ERP订单信息</el-button>
@@ -135,6 +135,7 @@
                 <span v-if="order!=null ">
                   {{order.userPhone }}
                 </span>
+                <el-button icon="el-icon-search" size="mini" @click="handlePhone()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryPhone']"></el-button>
             </el-descriptions-item>
             <el-descriptions-item label="收货地址"  >
               <el-popover
@@ -145,6 +146,7 @@
                 trigger="hover"
                 :content="order.userAddress">
                 <span slot="reference">{{order.userAddress}}</span>
+                <el-button icon="el-icon-search" size="mini" @click="handleAddress()" style="margin-left: 20px;" circle v-hasPermi="['store:storeOrder:queryAddress']"></el-button>
               </el-popover>
             </el-descriptions-item>
             <el-descriptions-item label="档期归属"  >
@@ -288,21 +290,7 @@
           <el-table-column label="支付时间" align="center" prop="payTime" />
       </el-table>
 
-      <div style="margin-top: 20px">
-        <!-- <svg-icon icon-class="marker" style="color: #606266"></svg-icon> -->
-        <span class="font-small">分佣信息</span>
-      </div>
-      <el-table
-        border
-        :data="tuiMoneyLogs"
-        size="small"
-                style="width: 100%;margin-top: 20px" >
-          <el-table-column label="公司名称" align="center" prop="companyName" width="120px" />
-          <el-table-column label="金额" align="center" prop="money" />
-          <el-table-column label="余额" align="center" prop="balance" />
-          <el-table-column label="创建时间" align="center" prop="createTime" />
-          <el-table-column label="备注" align="center" prop="remark" />
-      </el-table>
+      
       <div style="margin-top: 20px">
         <span class="font-small">操作信息</span>
       </div>
@@ -320,6 +308,22 @@
           </template>
         </el-table-column>
       </el-table>
+
+      <div style="margin-top: 20px">
+        <!-- <svg-icon icon-class="marker" style="color: #606266"></svg-icon> -->
+        <span class="font-small">分佣信息</span>
+      </div>
+      <el-table
+        border
+        :data="tuiMoneyLogs"
+        size="small"
+                style="width: 100%;margin-top: 20px" >
+          <el-table-column label="公司名称" align="center" prop="companyName" width="120px" />
+          <el-table-column label="金额" align="center" prop="money" />
+          <el-table-column label="余额" align="center" prop="balance" />
+          <el-table-column label="创建时间" align="center" prop="createTime" />
+          <el-table-column label="备注" align="center" prop="remark" />
+      </el-table>
       </el-card>
     </div>
 
@@ -372,10 +376,23 @@
     </el-dialog>
 
     <el-dialog :title="editDy.title" :visible.sync="editDy.open" width="600px" append-to-body>
-      <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="100px">
+      <el-form ref="editDyForm" :model="editDyForm" :rules="editDyRules" label-width="120px">
+      <div  v-hasPermi="['store:storeOrder:updateErpOrder']"  style="margin-bottom: 20px;" >
+        <el-button size="mini" @click="updateErpOrder" >同步物流单号信息</el-button>
+      </div>
+        <el-form-item label="物流公司" prop="deliverySn" >
+           <el-select style="width:220px" v-model="editDyForm.deliverySn" placeholder="请选择" clearable size="small">
+            <el-option key="SF"  label="顺丰" value="SF" />
+            <el-option key="EMS"  label="邮政" value="EMS" />
+             <el-option key="ZTO"  label="中通" value="ZTO" />
+             <el-option key="JD"  label="京东" value="JD" />
+             <el-option key="DBL"  label="德邦" value="DBL" />
+           </el-select>
+         </el-form-item>
         <el-form-item label="物流单号" prop="deliveryId"  >
           <el-input v-model="editDyForm.deliveryId" placeholder="请输入物流单号" />
         </el-form-item>
+        
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitEditDyForm">确 定</el-button>
@@ -461,7 +478,7 @@
 </template>
 
 <script>
-import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder} from "@/api/store/storeOrder";
+import {auditPayRemain,addTuiMoney,syncExpress,updateExpress,getEroOrder,refundOrderMoney, editTuiMoney,getExpress,finishOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,updateDeliveryId, createErpOrder,updateErp,getStoreOrderAddress,getStoreOrderPhone} from "@/api/store/storeOrder";
 import { getTcmScheduleList } from "@/api/company/schedule";
 export default {
   name: "order",
@@ -491,6 +508,7 @@ export default {
         open:false,
       },
       editDyForm:{
+        deliverySn:null,
         deliveryId:null,
       },
       editForm:{
@@ -503,6 +521,9 @@ export default {
       },
 
       editDyRules:{
+        deliverySn: [
+          { required: true, message: "物流公司不能为空", trigger: "blur" }
+        ],
         deliveryId: [
           { required: true, message: "物流单号不能为空", trigger: "blur" }
         ],
@@ -554,6 +575,18 @@ export default {
     });
   },
   methods: {
+    handleAddress(){
+        const id = this.order.id;
+        getStoreOrderAddress(id).then(response =>{
+            this.order.userAddress = response.address;
+        }) 
+      },
+      handlePhone(){
+        const id = this.order.id;
+        getStoreOrderPhone(id).then(response =>{
+            this.order.userPhone = response.userPhone;
+        }) 
+      },
     showImageDialog() {
       this.dialogVisible = true;
     },
@@ -571,6 +604,21 @@ export default {
           this.getOrder(this.order.id);
         }).catch(function() {});
     },
+    updateErpOrder(){
+      var that=this;
+        this.$confirm('确定同步物流单号信息吗', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          var data={orderId:that.order.id}
+          return updateErp(data);
+        }).then(() => {
+          this.msgSuccess("操作成功");
+          this.getOrder(this.order.id);
+          this.editDy.open = false
+        }).catch(function() {});
+    },
     updateExpress(){
       var that=this;
         this.$confirm('确定同步物流信息吗，同步后将自动发货', "警告", {
@@ -750,6 +798,7 @@ export default {
       this.editDy.open = true;
       this.editDyForm.id = this.order.id;
       this.editDyForm.deliveryId = this.order.deliveryId;
+      this.editDyForm.deliverySn = this.order.deliverySn;
     },
     getOrder(orderId){
         this.orderId=orderId;

src/views/store/storeOrder/index.vue

@@ -202,7 +202,13 @@
           v-hasPermi="['store:storeOrder:exportItems']"
         >导出订单明细</el-button>
       </el-col>
-      
+      <el-col :span="1.5">
+        <el-input
+          v-model="orderItemNum"
+          disabled
+          size="mini"
+          />
+      </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
@@ -468,7 +474,7 @@
 </template>
 
 <script>
-import { importTemplate,exportStoreOrderItems,createUserOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder } from "@/api/store/storeOrder";
+import { importTemplate,exportStoreOrderItems,createUserOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,getOrderItemsNum } from "@/api/store/storeOrder";
 import { getUserList } from "@/api/store/user";
 import { getAddressList } from "@/api/store/userAddress";
 import productOrder from "../components/productOrder";
@@ -557,6 +563,7 @@ export default {
       payTimeRange:[],
       deliveryImportTimeRange:[],
       deliverySendTimeRange:[],
+      orderItemNum:"",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -670,6 +677,7 @@ export default {
       this.scheduleOptions = response.data;
     });
     this.getList();
+    this.getItemsNum();
   },
   methods: {
     handleGenPayUrl(row){
@@ -814,6 +822,43 @@ export default {
         this.loading = false;
       });
     },
+    getItemsNum() {
+      this.loading = true;
+      if(this.queryParams.status=='00'){
+        this.queryParams.status=null;
+      }
+
+      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
+        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
+      }
+      else{
+        this.queryParams.createTimeRange=null;
+      }
+
+      if(this.payTimeRange!=null&&this.payTimeRange.length==2){
+        this.queryParams.payTimeRange=this.payTimeRange[0]+"--"+this.payTimeRange[1]
+      }
+      else{
+        this.queryParams.payTimeRange=null;
+      }
+      if(this.deliveryImportTimeRange!=null&&this.deliveryImportTimeRange.length==2){
+        this.queryParams.deliveryImportTimeRange=this.deliveryImportTimeRange[0]+"--"+this.deliveryImportTimeRange[1]
+      }
+      else{
+        this.queryParams.deliveryImportTimeRange=null;
+      }
+      if(this.deliverySendTimeRange!=null&&this.deliverySendTimeRange.length==2){
+        this.queryParams.deliverySendTimeRange=this.deliverySendTimeRange[0]+"--"+this.deliverySendTimeRange[1]
+      }
+      else{
+        this.queryParams.deliverySendTimeRange=null;
+      }
+      
+      getOrderItemsNum(this.queryParams).then(response => {
+        this.orderItemNum = response.orderItemsNum;
+        this.loading = false;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -832,6 +877,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.getItemsNum();
     },
     /** 重置按钮操作 */
     resetQuery() {