|
|
@@ -127,6 +127,16 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="小程序" prop="appId">
|
|
|
+ <el-select v-model="queryParams.appId" placeholder="请选择所属小程序" clearable size="small">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in appMallOptions"
|
|
|
+ :key="dict.appid"
|
|
|
+ :label="dict.name + '(' + dict.appid + ')'"
|
|
|
+ :value="dict.appid"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </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>
|
|
|
@@ -150,6 +160,15 @@
|
|
|
@click="handlePayNotify"
|
|
|
v-hasPermi="['store:storePayment:payNotify']"
|
|
|
>同步订单状态</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-s-order"
|
|
|
+ size="mini"
|
|
|
+ type="success"
|
|
|
+ @click="wxOneClickShipping"
|
|
|
+ >微信一键线下自提发货
|
|
|
+ </el-button>
|
|
|
</el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
@@ -177,6 +196,7 @@
|
|
|
<el-table-column label="所属公司" align="center" prop="companyName" />
|
|
|
<el-table-column label="所属部门" align="center" prop="deptName" />
|
|
|
<el-table-column label="员工" align="center" prop="companyUserNickName" />
|
|
|
+ <el-table-column label="小程序名称" align="center" prop="miniProgramName" width="120px" />
|
|
|
<el-table-column label="状态" align="center" prop="status" >
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag prop="status" v-for="(item, index) in statusOptions" v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
|
|
|
@@ -275,12 +295,13 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify } from "@/api/hisStore/storePayment";
|
|
|
+import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify, oneClickShipping} from "@/api/hisStore/storePayment";
|
|
|
import { getCompanyList } from "@/api/company/company";
|
|
|
export default {
|
|
|
name: "HisStorePayment",
|
|
|
data() {
|
|
|
return {
|
|
|
+ appMallOptions:[],
|
|
|
payModeOptions:[
|
|
|
{ dictLabel: "微信支付", dictValue: "wx" },
|
|
|
{ dictLabel: "汇付", dictValue: "hf" }
|
|
|
@@ -350,6 +371,7 @@ export default {
|
|
|
deptId: null,
|
|
|
bankTransactionId:null,
|
|
|
companyUserNickName:null,
|
|
|
+ appId:null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
@@ -367,8 +389,16 @@ export default {
|
|
|
this.companys = response.data;
|
|
|
});
|
|
|
this.getList();
|
|
|
+ // 获取小程序选项列表
|
|
|
+ this.getAppMallOptions();
|
|
|
},
|
|
|
methods: {
|
|
|
+ // 获取小程序选项列表
|
|
|
+ getAppMallOptions() {
|
|
|
+ getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
|
|
|
+ this.appMallOptions = response.rows;
|
|
|
+ })
|
|
|
+ },
|
|
|
submitPayNotifyForm(){
|
|
|
this.$refs["payNotifyForm"].validate(valid => {
|
|
|
if (valid) {
|
|
|
@@ -473,6 +503,9 @@ export default {
|
|
|
},
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
+ this.dateRange=[];
|
|
|
+ this.refundDateRange=[];
|
|
|
+ this.createTimeRange=[];
|
|
|
this.resetForm("queryForm");
|
|
|
this.handleQuery();
|
|
|
},
|
|
|
@@ -548,6 +581,21 @@ export default {
|
|
|
}).then(response => {
|
|
|
this.download(response.msg);
|
|
|
}).catch(function() {});
|
|
|
+ },
|
|
|
+ wxOneClickShipping(){
|
|
|
+ this.$confirm('是否同步微信线下发货?', '一键发货', {
|
|
|
+ confirmButtonText: '是',
|
|
|
+ cancelButtonText: '否',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ oneClickShipping().then(response => {
|
|
|
+ if(response.code === 200) {
|
|
|
+ this.$message.success("操作成功！")
|
|
|
+ this.getList();
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }).catch(() => {
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
};
|
