|
|
@@ -302,7 +302,16 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="溯源码" prop="verifyCode">
|
|
|
<el-input
|
|
|
- v-model="queryParams.verifyCodes"
|
|
|
+ v-model="queryParams.verifyCode"
|
|
|
+ clearable
|
|
|
+ placeholder="请输入溯源码"
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="产品批次号" prop="batchNumber">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.batchNumber"
|
|
|
clearable
|
|
|
placeholder="请输入溯源码"
|
|
|
size="small"
|
|
|
@@ -391,6 +400,18 @@
|
|
|
>删除
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ plain
|
|
|
+ icon="el-icon-folder-add"
|
|
|
+ size="mini"
|
|
|
+ v-hasPermi="['store:healthStoreOrder:exportItems:importCodeNoteExpress']"
|
|
|
+ v-if="loginType === '1'"
|
|
|
+ @click="openCode"
|
|
|
+ >+批量导入
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
|
|
|
@@ -406,7 +427,8 @@
|
|
|
<el-table v-loading="loading" :data="storeOrderList" border height="500" @selection-change="handleSelectionChange">
|
|
|
<el-table-column align="center" type="selection" width="55"/>
|
|
|
<el-table-column align="center" label="订单号" prop="orderCode" width="200px"/>
|
|
|
- <el-table-column label="溯源码" align="center" prop="verifyCodes" width="200px" />
|
|
|
+ <el-table-column label="溯源码" align="center" prop="verifyCode" width="200px" />
|
|
|
+ <el-table-column label="产品批次号" align="center" prop="batchNumber" width="200px" />
|
|
|
<el-table-column align="center" label="店铺名称" prop="storeName" width="150px">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.storeName }} </span>
|
|
|
@@ -748,6 +770,35 @@
|
|
|
<el-button type="primary" @click="submitDeliveryNote">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <el-dialog
|
|
|
+ :before-close="handleClose"
|
|
|
+ :visible.sync="codeOpen"
|
|
|
+ center
|
|
|
+ title="批量导入编码"
|
|
|
+ width="35%"
|
|
|
+ >
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-upload ref="upload" :action="codeUpload.url" :auto-upload="false" :disabled="codeUpload.isUploading"
|
|
|
+ :headers="codeUpload.headers"
|
|
|
+ :limit="1" :on-progress="handleFileUploadProgress"
|
|
|
+ :on-success="handleFileSuccess" accept=".xlsx, .xls" drag
|
|
|
+ >
|
|
|
+ <i class="el-icon-upload"></i>
|
|
|
+ <div class="el-upload__text">
|
|
|
+ 将文件拖到此处，或
|
|
|
+ <em>点击上传</em>
|
|
|
+ </div>
|
|
|
+ <div slot="tip" class="el-upload__tip">
|
|
|
+ <el-link style="font-size:12px" type="info" @click="importCodeTemplate">下载模板</el-link>
|
|
|
+ </div>
|
|
|
+ <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
|
|
|
+ </el-upload>
|
|
|
+ <el-divider></el-divider>
|
|
|
+ <el-button @click="codeOpen = false">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitDeliveryNote">确 定</el-button>
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -762,6 +813,7 @@ import {
|
|
|
delStoreOrder,
|
|
|
addStoreOrder,
|
|
|
updateStoreOrder,
|
|
|
+ importCodeExpressTemplate,
|
|
|
exportHealthStoreOrder, exportHealthStoreOrderDetails, exportHealthStoreOrderItemsDetails
|
|
|
} from '@/api/hisStore/storeOrder'
|
|
|
import {getUserList} from '@/api/hisStore/user'
|
|
|
@@ -788,6 +840,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ loginType:null,
|
|
|
importMsgOpen: false,
|
|
|
importMsg: '',
|
|
|
deliveryPayStatusOptions: [],
|
|
|
@@ -894,7 +947,7 @@ export default {
|
|
|
isDel: null,
|
|
|
cost: null,
|
|
|
verifyCode: null,
|
|
|
- verifyCodes:null,
|
|
|
+ batchNumber:null,
|
|
|
storeId: null,
|
|
|
shippingType: null,
|
|
|
isChannel: null,
|
|
|
@@ -957,13 +1010,31 @@ export default {
|
|
|
// 上传的地址
|
|
|
url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importDeliveryNoteExpress',
|
|
|
},
|
|
|
+ codeUpload: {
|
|
|
+ // 是否显示弹出层（用户导入）
|
|
|
+ open: false,
|
|
|
+ // 弹出层标题（用户导入）
|
|
|
+ title: '',
|
|
|
+ // 是否禁用上传
|
|
|
+ isUploading: false,
|
|
|
+ // 是否更新已经存在的用户数据
|
|
|
+ updateSupport: 0,
|
|
|
+ // 设置上传的请求头部
|
|
|
+ headers: {Authorization: 'Bearer ' + getToken()},
|
|
|
+ // 上传的地址
|
|
|
+ url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importCodeNoteExpress',
|
|
|
+ },
|
|
|
deliveryNoteOpen: false,
|
|
|
+ codeOpen: false,
|
|
|
miniAppList: [],
|
|
|
ruleForm: {
|
|
|
miniAppId: null,
|
|
|
},
|
|
|
}
|
|
|
},
|
|
|
+ mounted() {
|
|
|
+ this.loginType = localStorage.getItem('loginType');
|
|
|
+ },
|
|
|
created() {
|
|
|
getCompanyList().then(response => {
|
|
|
this.companys = response.data
|
|
|
@@ -1157,7 +1228,8 @@ export default {
|
|
|
/** 重置按钮操作 */
|
|
|
resetQuery() {
|
|
|
this.resetForm('queryForm')
|
|
|
- this.queryParams.verifyCodes = null;
|
|
|
+ this.queryParams.verifyCode = null;
|
|
|
+ this.queryParams.batchNumber = null;
|
|
|
this.handleQuery()
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
@@ -1422,6 +1494,11 @@ export default {
|
|
|
this.deliveryNoteOpen = true
|
|
|
// this.getAppList();
|
|
|
},
|
|
|
+ //打开溯源码导入单号
|
|
|
+ openCode() {
|
|
|
+ this.codeOpen = true
|
|
|
+ // this.getAppList();
|
|
|
+ },
|
|
|
handleClose(done) {
|
|
|
this.$confirm('确认关闭？')
|
|
|
.then(_ => {
|
|
|
@@ -1436,6 +1513,12 @@ export default {
|
|
|
this.download(response.msg)
|
|
|
})
|
|
|
},
|
|
|
+ //编码导入模板下载
|
|
|
+ importCodeTemplate() {
|
|
|
+ importCodeExpressTemplate().then((response) => {
|
|
|
+ this.download(response.msg)
|
|
|
+ })
|
|
|
+ },
|
|
|
getAppList() {
|
|
|
this.miniAppList = []
|
|
|
const key = 'courseMa.config'
|
