|
@@ -177,6 +177,18 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ <el-form-item label="订单状态" prop="status">
|
|
|
|
|
+ <el-select v-model="queryParams.status" clearable placeholder="请选择订单状态"
|
|
|
|
|
+ size="small" style="width: 200px"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in statusOptions"
|
|
|
|
|
+ :key="item.dictValue"
|
|
|
|
|
+ :label="item.dictLabel"
|
|
|
|
|
+ :value="item.dictValue"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
<el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
|
|
<el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -539,7 +551,8 @@
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<el-dialog :title="upload.title" :visible.sync="upload.open" append-to-body width="400px">
|
|
<el-dialog :title="upload.title" :visible.sync="upload.open" append-to-body width="400px">
|
|
|
- <el-upload ref="upload" :action="upload.url + '?updateSupport=' + upload.updateSupport" :auto-upload="false" :disabled="upload.isUploading"
|
|
|
|
|
|
|
+ <el-upload ref="upload" :action="upload.url + '?updateSupport=' + upload.updateSupport" :auto-upload="false"
|
|
|
|
|
+ :disabled="upload.isUploading"
|
|
|
:headers="upload.headers" :limit="1"
|
|
:headers="upload.headers" :limit="1"
|
|
|
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" accept=".xlsx, .xls" drag
|
|
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" accept=".xlsx, .xls" drag
|
|
|
>
|
|
>
|
|
@@ -562,7 +575,7 @@
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="importMsgOpen"
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="importMsgOpen"
|
|
|
append-to-body title="导入结果" width="500px"
|
|
append-to-body title="导入结果" width="500px"
|
|
|
>
|
|
>
|
|
|
- <h1>{{importMsg}}</h1>
|
|
|
|
|
|
|
+ <h1>{{ importMsg }}</h1>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<!-- 批量发货 -->
|
|
<!-- 批量发货 -->
|
|
@@ -575,25 +588,26 @@
|
|
|
>
|
|
>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<!-- 小程序Appid选择 -->
|
|
<!-- 小程序Appid选择 -->
|
|
|
-<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
|
|
|
|
|
-<!-- <el-form-item label="小程序:" prop="miniAppId">-->
|
|
|
|
|
-<!-- <el-select-->
|
|
|
|
|
-<!-- v-model="ruleForm.miniAppId"-->
|
|
|
|
|
-<!-- clearable-->
|
|
|
|
|
-<!-- placeholder="请选择发货小程序"-->
|
|
|
|
|
-<!-- style="width: 100%"-->
|
|
|
|
|
-<!-- >-->
|
|
|
|
|
-<!-- <el-option-->
|
|
|
|
|
-<!-- v-for="item in miniAppList"-->
|
|
|
|
|
-<!-- :key="item.appId"-->
|
|
|
|
|
-<!-- :label="item.appName"-->
|
|
|
|
|
-<!-- :value="item.appId"-->
|
|
|
|
|
-<!-- />-->
|
|
|
|
|
-<!-- </el-select>-->
|
|
|
|
|
-<!-- </el-form-item>-->
|
|
|
|
|
-<!-- </el-form>-->
|
|
|
|
|
|
|
+ <!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
|
|
|
|
|
+ <!-- <el-form-item label="小程序:" prop="miniAppId">-->
|
|
|
|
|
+ <!-- <el-select-->
|
|
|
|
|
+ <!-- v-model="ruleForm.miniAppId"-->
|
|
|
|
|
+ <!-- clearable-->
|
|
|
|
|
+ <!-- placeholder="请选择发货小程序"-->
|
|
|
|
|
+ <!-- style="width: 100%"-->
|
|
|
|
|
+ <!-- >-->
|
|
|
|
|
+ <!-- <el-option-->
|
|
|
|
|
+ <!-- v-for="item in miniAppList"-->
|
|
|
|
|
+ <!-- :key="item.appId"-->
|
|
|
|
|
+ <!-- :label="item.appName"-->
|
|
|
|
|
+ <!-- :value="item.appId"-->
|
|
|
|
|
+ <!-- />-->
|
|
|
|
|
+ <!-- </el-select>-->
|
|
|
|
|
+ <!-- </el-form-item>-->
|
|
|
|
|
+ <!-- </el-form>-->
|
|
|
|
|
|
|
|
- <el-upload ref="upload" :action="orderUpload.url" :auto-upload="false" :disabled="orderUpload.isUploading" :headers="orderUpload.headers"
|
|
|
|
|
|
|
+ <el-upload ref="upload" :action="orderUpload.url" :auto-upload="false" :disabled="orderUpload.isUploading"
|
|
|
|
|
+ :headers="orderUpload.headers"
|
|
|
:limit="1" :on-progress="handleFileUploadProgress"
|
|
:limit="1" :on-progress="handleFileUploadProgress"
|
|
|
:on-success="handleFileSuccess" accept=".xlsx, .xls" drag
|
|
:on-success="handleFileSuccess" accept=".xlsx, .xls" drag
|
|
|
>
|
|
>
|
|
@@ -628,23 +642,23 @@ import {
|
|
|
updateStoreOrder,
|
|
updateStoreOrder,
|
|
|
exportHealthStoreOrder, exportHealthStoreOrderDetails, exportHealthStoreOrderItemsDetails
|
|
exportHealthStoreOrder, exportHealthStoreOrderDetails, exportHealthStoreOrderItemsDetails
|
|
|
} from '@/api/hisStore/storeOrder'
|
|
} from '@/api/hisStore/storeOrder'
|
|
|
-import { getUserList } from '@/api/hisStore/user'
|
|
|
|
|
-import { getAddressList } from '@/api/hisStore/userAddress'
|
|
|
|
|
|
|
+import {getUserList} from '@/api/hisStore/user'
|
|
|
|
|
+import {getAddressList} from '@/api/hisStore/userAddress'
|
|
|
import productOrder from '../components/productOrder'
|
|
import productOrder from '../components/productOrder'
|
|
|
import productSelect from '../components/productSelect'
|
|
import productSelect from '../components/productSelect'
|
|
|
import addUser from '../components/addUser'
|
|
import addUser from '../components/addUser'
|
|
|
import addUserAddress from '../components/addUserAddress'
|
|
import addUserAddress from '../components/addUserAddress'
|
|
|
-import { getToken } from '@/utils/auth'
|
|
|
|
|
|
|
+import {getToken} from '@/utils/auth'
|
|
|
import QRCode from 'qrcodejs2'
|
|
import QRCode from 'qrcodejs2'
|
|
|
-import { getCompanyList } from '@/api/company/company'
|
|
|
|
|
|
|
+import {getCompanyList} from '@/api/company/company'
|
|
|
|
|
|
|
|
-import { treeselect } from '@/api/company/companyDept'
|
|
|
|
|
|
|
+import {treeselect} from '@/api/company/companyDept'
|
|
|
import Treeselect from '@riophae/vue-treeselect'
|
|
import Treeselect from '@riophae/vue-treeselect'
|
|
|
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
|
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
|
|
-import { getConfigByKey } from '@/api/system/config'
|
|
|
|
|
|
|
+import {getConfigByKey} from '@/api/system/config'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
- components: { productOrder, productSelect, addUser, addUserAddress, Treeselect },
|
|
|
|
|
|
|
+ components: {productOrder, productSelect, addUser, addUserAddress, Treeselect},
|
|
|
name: 'HisHealthStoreOrderList',
|
|
name: 'HisHealthStoreOrderList',
|
|
|
watch: {
|
|
watch: {
|
|
|
// 监听deptId
|
|
// 监听deptId
|
|
@@ -774,13 +788,13 @@ export default {
|
|
|
// 表单校验
|
|
// 表单校验
|
|
|
rules: {
|
|
rules: {
|
|
|
userId: [
|
|
userId: [
|
|
|
- { required: true, message: '会员信息不能为空' }
|
|
|
|
|
|
|
+ {required: true, message: '会员信息不能为空'}
|
|
|
],
|
|
],
|
|
|
addressId: [
|
|
addressId: [
|
|
|
- { required: true, message: '收货信息不能为空' }
|
|
|
|
|
|
|
+ {required: true, message: '收货信息不能为空'}
|
|
|
],
|
|
],
|
|
|
miniAppId: [
|
|
miniAppId: [
|
|
|
- { required: true, message: '发货小程序不能为空' }
|
|
|
|
|
|
|
+ {required: true, message: '发货小程序不能为空'}
|
|
|
],
|
|
],
|
|
|
},
|
|
},
|
|
|
upload: {
|
|
upload: {
|
|
@@ -793,7 +807,7 @@ export default {
|
|
|
// 是否更新已经存在的用户数据
|
|
// 是否更新已经存在的用户数据
|
|
|
updateSupport: 0,
|
|
updateSupport: 0,
|
|
|
// 设置上传的请求头部
|
|
// 设置上传的请求头部
|
|
|
- headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
|
|
|
|
+ headers: {Authorization: 'Bearer ' + getToken()},
|
|
|
// 上传的地址
|
|
// 上传的地址
|
|
|
url: process.env.VUE_APP_BASE_API + '/store/storeOrder/importExpress'
|
|
url: process.env.VUE_APP_BASE_API + '/store/storeOrder/importExpress'
|
|
|
},
|
|
},
|
|
@@ -807,13 +821,13 @@ export default {
|
|
|
// 是否更新已经存在的用户数据
|
|
// 是否更新已经存在的用户数据
|
|
|
updateSupport: 0,
|
|
updateSupport: 0,
|
|
|
// 设置上传的请求头部
|
|
// 设置上传的请求头部
|
|
|
- headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
|
|
|
|
+ headers: {Authorization: 'Bearer ' + getToken()},
|
|
|
// 上传的地址
|
|
// 上传的地址
|
|
|
url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importDeliveryNoteExpress',
|
|
url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importDeliveryNoteExpress',
|
|
|
},
|
|
},
|
|
|
deliveryNoteOpen: false,
|
|
deliveryNoteOpen: false,
|
|
|
miniAppList: [],
|
|
miniAppList: [],
|
|
|
- ruleForm:{
|
|
|
|
|
|
|
+ ruleForm: {
|
|
|
miniAppId: null,
|
|
miniAppId: null,
|
|
|
},
|
|
},
|
|
|
}
|
|
}
|
|
@@ -885,7 +899,7 @@ export default {
|
|
|
compute() {
|
|
compute() {
|
|
|
this.totalMoney = 0
|
|
this.totalMoney = 0
|
|
|
var that = this
|
|
var that = this
|
|
|
- this.products.forEach(function(value) {
|
|
|
|
|
|
|
+ this.products.forEach(function (value) {
|
|
|
that.totalMoney += value.money
|
|
that.totalMoney += value.money
|
|
|
})
|
|
})
|
|
|
console.log(that.totalMoney)
|
|
console.log(that.totalMoney)
|
|
@@ -916,7 +930,7 @@ export default {
|
|
|
if (this.phone == null || this.phone == '') {
|
|
if (this.phone == null || this.phone == '') {
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
- var data = { phone: this.phone }
|
|
|
|
|
|
|
+ var data = {phone: this.phone}
|
|
|
this.userloading = true
|
|
this.userloading = true
|
|
|
this.users = []
|
|
this.users = []
|
|
|
this.address = []
|
|
this.address = []
|
|
@@ -930,7 +944,7 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
getAddressList(userId) {
|
|
getAddressList(userId) {
|
|
|
- var data = { userId: userId }
|
|
|
|
|
|
|
+ var data = {userId: userId}
|
|
|
this.addressloading = true
|
|
this.addressloading = true
|
|
|
this.address = []
|
|
this.address = []
|
|
|
getAddressList(data).then(response => {
|
|
getAddressList(data).then(response => {
|
|
@@ -1100,11 +1114,11 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
- }).then(function() {
|
|
|
|
|
|
|
+ }).then(function () {
|
|
|
return exportHealthStoreOrder(queryParams)
|
|
return exportHealthStoreOrder(queryParams)
|
|
|
}).then(response => {
|
|
}).then(response => {
|
|
|
this.download(response.msg)
|
|
this.download(response.msg)
|
|
|
- }).catch(function() {
|
|
|
|
|
|
|
+ }).catch(function () {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
handleExportItems() {
|
|
handleExportItems() {
|
|
@@ -1136,11 +1150,11 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
- }).then(function() {
|
|
|
|
|
|
|
+ }).then(function () {
|
|
|
return exportHealthStoreOrderItems(queryParams)
|
|
return exportHealthStoreOrderItems(queryParams)
|
|
|
}).then(response => {
|
|
}).then(response => {
|
|
|
this.download(response.msg)
|
|
this.download(response.msg)
|
|
|
- }).catch(function() {
|
|
|
|
|
|
|
+ }).catch(function () {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
/** 导出按钮操作 */
|
|
@@ -1173,11 +1187,11 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
- }).then(function() {
|
|
|
|
|
|
|
+ }).then(function () {
|
|
|
return exportHealthStoreOrderDetails(queryParams)
|
|
return exportHealthStoreOrderDetails(queryParams)
|
|
|
}).then(response => {
|
|
}).then(response => {
|
|
|
this.download(response.msg)
|
|
this.download(response.msg)
|
|
|
- }).catch(function() {
|
|
|
|
|
|
|
+ }).catch(function () {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
handleExportItemsDetails() {
|
|
handleExportItemsDetails() {
|
|
@@ -1209,11 +1223,11 @@ export default {
|
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
type: 'warning'
|
|
|
- }).then(function() {
|
|
|
|
|
|
|
+ }).then(function () {
|
|
|
return exportHealthStoreOrderItemsDetails(queryParams)
|
|
return exportHealthStoreOrderItemsDetails(queryParams)
|
|
|
}).then(response => {
|
|
}).then(response => {
|
|
|
this.download(response.msg)
|
|
this.download(response.msg)
|
|
|
- }).catch(function() {
|
|
|
|
|
|
|
+ }).catch(function () {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
handleImport() {
|
|
handleImport() {
|
|
@@ -1248,7 +1262,7 @@ export default {
|
|
|
/** 查询部门下拉树结构 */
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
|
getTreeselect() {
|
|
|
var that = this
|
|
var that = this
|
|
|
- var param = { companyId: this.companyId }
|
|
|
|
|
|
|
+ var param = {companyId: this.companyId}
|
|
|
treeselect(param).then((response) => {
|
|
treeselect(param).then((response) => {
|
|
|
this.deptOptions = response.data
|
|
this.deptOptions = response.data
|
|
|
console.log(this.deptOptions)
|
|
console.log(this.deptOptions)
|
|
@@ -1290,13 +1304,13 @@ export default {
|
|
|
this.miniAppList = []
|
|
this.miniAppList = []
|
|
|
const key = 'courseMa.config'
|
|
const key = 'courseMa.config'
|
|
|
getConfigByKey(key).then(response => {
|
|
getConfigByKey(key).then(response => {
|
|
|
- const { code, data } = response
|
|
|
|
|
|
|
+ const {code, data} = response
|
|
|
if (code === 200) {
|
|
if (code === 200) {
|
|
|
let value = data?.configValue
|
|
let value = data?.configValue
|
|
|
if (value) {
|
|
if (value) {
|
|
|
const appList = JSON.parse(value)
|
|
const appList = JSON.parse(value)
|
|
|
this.miniAppList = appList.filter(v => v.type === '1').map(v => {
|
|
this.miniAppList = appList.filter(v => v.type === '1').map(v => {
|
|
|
- return { appId: v.appid, appName: v.name }
|
|
|
|
|
|
|
+ return {appId: v.appid, appName: v.name}
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|