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

src/api/store/storePayment.js

@@ -66,4 +66,13 @@ export function exportStorePayment(query) {
     method: 'get',
     params: query
   })
+}
+
+//同步订单状态
+export function setPayNotify(data) {
+  return request({
+    url: '/store/storePayment/returnPayStatus',
+    method: 'post',
+    data: data
+  })
 }

src/views/company/companyDeduct/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公司名称" prop="companyId">
-       <el-select style="width: 220px" v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+       <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
               <el-option
                 v-for="item in companys"
                 :key="item.companyId"

src/views/company/companyRecharge/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公司名称" prop="companyId">
-       <el-select style="width: 220px" v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
+       <el-select style="width: 220px" filterable v-model="queryParams.companyId" placeholder="请选择公司名" clearable size="small">
               <el-option
                 v-for="item in companys"
                 :key="item.companyId"

src/views/company/companyUser/index.vue

@@ -1,128 +1,20 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="部门ID" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户账号" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户账号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户昵称" prop="nickName">
-        <el-input
-          v-model="queryParams.nickName"
-          placeholder="请输入用户昵称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户类型" prop="userType">
-        <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="用户邮箱" prop="email">
-        <el-input
-          v-model="queryParams.email"
-          placeholder="请输入用户邮箱"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手机号码" prop="phonenumber">
-        <el-input
-          v-model="queryParams.phonenumber"
-          placeholder="请输入手机号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户性别" prop="sex">
-        <el-select v-model="queryParams.sex" placeholder="请选择用户性别" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="头像地址" prop="avatar">
-        <el-input
-          v-model="queryParams.avatar"
-          placeholder="请输入头像地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="密码" prop="password">
-        <el-input
-          v-model="queryParams.password"
-          placeholder="请输入密码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="帐号状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择帐号状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="最后登录IP" prop="loginIp">
-        <el-input
-          v-model="queryParams.loginIp"
-          placeholder="请输入最后登录IP"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="最后登录时间" prop="loginDate">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.loginDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择最后登录时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="最后登录时间" prop="openId">
-        <el-input
-          v-model="queryParams.openId"
-          placeholder="请输入最后登录时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="身份证号" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          placeholder="请输入身份证号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公司ID" prop="companyId">
-        <el-input
-          v-model="queryParams.companyId"
-          placeholder="请输入公司ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      <el-form-item label="推广员" prop="nickName">
+            <el-input v-model="queryParams.nickName" placeholder="请输入" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select v-model="queryParams.status" placeholder="员工状态" clearable size="small" style="width: 240px">
+              <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker v-model="dateRange" size="small" 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>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -171,47 +63,30 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="companyUserList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="部门ID" align="center" prop="deptId" />
-      <el-table-column label="用户账号" align="center" prop="userName" />
-      <el-table-column label="用户昵称" align="center" prop="nickName" />
-      <el-table-column label="用户类型" align="center" prop="userType" />
-      <el-table-column label="用户邮箱" align="center" prop="email" />
-      <el-table-column label="手机号码" align="center" prop="phonenumber" />
-      <el-table-column label="用户性别" align="center" prop="sex" />
-      <el-table-column label="头像地址" align="center" prop="avatar" />
-      <el-table-column label="密码" align="center" prop="password" />
-      <el-table-column label="帐号状态" align="center" prop="status" />
-      <el-table-column label="最后登录IP" align="center" prop="loginIp" />
-      <el-table-column label="最后登录时间" align="center" prop="loginDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.loginDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="备注" align="center" prop="openId" />
-      <el-table-column label="身份证号" align="center" prop="idCard" />
-      <el-table-column label="公司ID" align="center" prop="companyId" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['company:companyUser:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['company:companyUser:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+    <el-table v-loading="loading" border :data="companyUserList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="ID" align="center" prop="userId" :show-overflow-tooltip="true" />
+          <el-table-column label="推广员编号" align="center" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="推广员姓名" align="center" prop="nickName" :show-overflow-tooltip="true"  />
+          <!-- <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" /> -->
+          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
+          <el-table-column label="状态" align="center">
+            <template slot-scope="scope">
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间"  sortable align="center" prop="createTime" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.userType !== '00'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['company:user:edit']">修改</el-button>
+              <el-button v-if="scope.row.userType !== '00'" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['company:user:remove']">删除</el-button>
+              <el-button size="mini" type="text" icon="el-icon-key" @click="handleResetPwd(scope.row)" v-hasPermi="['company:user:resetPwd']">重置</el-button>
+            </template>
+          </el-table-column>
     </el-table>
     
     <pagination

src/views/store/components/productAfterSalesOrder.vue

@@ -191,15 +191,15 @@
     <el-dialog :title="add.title" :visible.sync="add.open" width="500px" append-to-body>
 
       <div slot="footer" class="dialog-footer">
-        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px">
           <el-form-item label="id" prop="id" v-if="false">
-            <el-input v-model="form.id" placeholder="请输入"  />
+            <el-input v-model="addForm.id" placeholder="请输入"  />
           </el-form-item>
           <el-form-item label="快递公司" prop="deliveryName">
-            <el-input v-model="form.deliveryName" placeholder="请输入"  />
+            <el-input v-model="addForm.deliveryName" placeholder="请输入"  />
           </el-form-item>
           <el-form-item label="运单号" prop="deliverySn">
-            <el-input v-model="form.deliverySn" placeholder="请输入"  />
+            <el-input v-model="addForm.deliverySn" placeholder="请输入"  />
           </el-form-item>
         </el-form>
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -230,6 +230,19 @@ export default {
         open:false,
         title:"添加物流"
       },
+      addForm:{
+        id:null,
+        deliveryName:null,
+        deliverySn:null
+      },
+      addRules:{
+        deliveryName: [
+          { required: true, message: "物流名称不能为空", trigger: "blur" }
+        ],
+        deliverySn: [
+          { required: true, message: "物流单号不能为空", trigger: "blur" }
+        ],
+      },
       order:null,
       user:null,
       serviceTypeOptions:[],
@@ -266,8 +279,8 @@ export default {
   methods: {
     submitForm() {
       var id=this.afterSales.id;
-      this.form.id = id;
-      updateStoreAfterSales(this.form).then(response => {
+      this.addForm.id = id;
+      updateStoreAfterSales(this.addForm).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("编辑成功");
                 this.add.open = false;
@@ -280,6 +293,8 @@ export default {
     },
     addDelivery(){
       this.add.open = true;
+      this.addForm.deliveryName = this.afterSales.deliveryName;
+      this.addForm.deliverySn = this.afterSales.deliverySn;
     },
     showOrder(){
       this.show.open=true;

src/views/store/components/productOrder.vue

@@ -292,7 +292,7 @@
         border
         :data="tuiMoneyLogs"
         size="small"
-        style="width: 100%;margin-top: 20px" >
+                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" />
@@ -330,13 +330,23 @@
                     />
             </el-select>
         </el-form-item>
-       <el-form-item label="状态" prop="status" v-if="orderStatus >=1">
+       <el-form-item label="状态" prop="status" >
            <el-select style="width:220px" v-model="editForm.status" placeholder="请选择状态" clearable size="small">
+            <el-option key="0"  label="待支付" value="0" />
             <el-option key="1"  label="待发货" value="1" />
              <el-option key="2"  label="待收货" value="2" />
+             <el-option key="3"  label="交易成功" value="3" />
+             <el-option key="-2"  label="退款中" value="-1" />
              <el-option key="-2"  label="已退款" value="-2" />
+             <el-option key="-3"  label="已取消" value="-3" />
            </el-select>
          </el-form-item>
+         <el-form-item label="详情地址" prop="userAddress"  >
+          <el-input v-model="editForm.userAddress" placeholder="请输入" />
+        </el-form-item>
+        <!-- <el-form-item label="erp单号" prop="extendOrderId"  >
+          <el-input v-model="editForm.extendOrderId" placeholder="请输入" />
+        </el-form-item> -->
         <el-form-item label="备注" prop="mark"  >
           <el-input v-model="editForm.mark" placeholder="请输入备注" />
         </el-form-item>
@@ -470,6 +480,8 @@ export default {
       editForm:{
         orderType:null,
         status:null,
+        userAddress:null,
+        // extendOrderId:null,
         mark:"",
       },
 
@@ -479,6 +491,9 @@ export default {
         ],
       },
       editRules:{
+        userAddress: [
+          { required: true, message: "收货地址不能为空", trigger: "blur" }
+        ],
 
       },
       orderTypeOptions:[],
@@ -687,10 +702,13 @@ export default {
     },
     editOrder(){
         this.edit.open=true;
+        this.editForm.id=this.order.id;
         this.editForm.mark=this.order.mark
         this.editForm.orderType=this.order.orderType.toString();
         this.editForm.status = this.order.status.toString();
-        this.editForm.id=this.order.id;
+        this.editForm.userAddress = this.order.userAddress.toString();
+        // this.editForm.extendOrderId = this.order.extendOrderId.toString();
+        
     },
     //推送管易按钮
     addErpOrder(){

src/views/store/storeOrder/healthStoreList.vue

@@ -1,20 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="公司名" prop="companyId">
-          <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  @change="companyChange" clearable size="small">
-              <el-option
-                v-for="item in companys"
-                :key="item.companyId"
-                :label="item.companyName"
-                :value="item.companyId"
-              />
-        </el-select>
-      </el-form-item>
-
-     <el-form-item >
-          <treeselect style="width: 220px" :clearable="false"  v-model="queryParams.deptId"  :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-     </el-form-item>
 
       <el-form-item label="订单号" prop="orderCode">
         <el-input
@@ -56,16 +42,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="员工姓名" prop="companyUserNickName">
-        <el-input
-
-          v-model="queryParams.companyUserNickName"
-          placeholder="请输入员工姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="产品" prop="productName">
         <el-input
 

src/views/store/storePayment/index.vue

@@ -142,6 +142,14 @@
           @click="handleExport"
           v-hasPermi="['store:storePayment:export']"
         >导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          size="mini"
+          @click="handlePayNotify"
+          v-hasPermi="['store:storePayment:payNotify']"
+        >同步订单状态</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -204,6 +212,19 @@
       @pagination="getList"
     />
 
+    <el-dialog :title="payNotify.title" :visible.sync="payNotify.open" width="600px" append-to-body>
+      <el-form ref="payNotifyForm" :model="payNotifyForm" :rules="payNotifyRules" label-width="100px">
+        <el-form-item label="外部单号" prop="tradeNo"  >
+          <el-input v-model="payNotifyForm.tradeNo" placeholder="请输入物流单号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitPayNotifyForm">确 定</el-button>
+        <el-button @click="payNotify.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
     <!-- 添加或修改支付明细对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -249,7 +270,7 @@
 </template>
 
 <script>
-import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment } from "@/api/store/storePayment";
+import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify } from "@/api/store/storePayment";
 import { getCompanyList } from "@/api/company/company";
 export default {
   name: "StorePayment",
@@ -264,6 +285,18 @@ export default {
       },
       refundRules:{
 
+      },
+      payNotify:{
+        title:"同步订单状态",
+        open:false,
+      },
+      payNotifyForm:{
+        tradeNo:null,
+      },
+      payNotifyRules:{
+        tradeNo: [
+          { required: true, message: "外部单号不能为空", trigger: "blur" }
+        ],
       },
       companys:[],
       statusOptions:[],
@@ -326,6 +359,23 @@ export default {
     this.getList();
   },
   methods: {
+    submitPayNotifyForm(){
+      this.$refs["payNotifyForm"].validate(valid => {
+        if (valid) {
+          setPayNotify(this.payNotifyForm).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess("操作成功");
+              this.payNotify.open = false;
+              this.getList();
+            }
+          });
+        }
+      });  
+    },
+    handlePayNotify(){
+      this.payNotify.open = true;
+      this.payNotifyForm.tradeNo = null;
+    },
     handleClick(tab, event) {
       this.queryParams.businessType=tab.name
       this.getList();