|
@@ -203,14 +203,14 @@
|
|
|
>导出订单明细</el-button>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- type="warning"-->
|
|
|
-<!-- icon="el-icon-s-order"-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- @click="openDeliveryNote"-->
|
|
|
-<!-- >批量更新订单状态</el-button>-->
|
|
|
-<!-- </el-col>-->
|
|
|
-<!-- <el-col :span="1.5">-->
|
|
|
+ <el-button
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-s-order"
|
|
|
+ size="mini"
|
|
|
+ @click="openDeliveryNote"
|
|
|
+ >批量更新订单状态</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
<el-input
|
|
|
v-model="orderItemNum"
|
|
|
disabled
|
|
@@ -477,27 +477,37 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
|
|
|
- <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
|
|
|
+ <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"
|
|
|
+ :headers="upload.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 class="el-upload__tip" slot="tip">
|
|
|
+ <div slot="tip" class="el-upload__tip">
|
|
|
<!-- <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的数据 -->
|
|
|
- <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
|
|
|
+ <el-link
|
|
|
+ style="font-size:12px"
|
|
|
+ type="info"
|
|
|
+ id="templateDownloadLink"
|
|
|
+ >
|
|
|
+ 下载模板
|
|
|
+ </el-link>
|
|
|
</div>
|
|
|
- <div class="el-upload__tip" style="color:red" slot="tip">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
|
|
|
+ <div slot="tip" class="el-upload__tip" style="color:red">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
|
|
|
</el-upload>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="submitFileForm">确 定</el-button>
|
|
|
<el-button @click="upload.open = false">取 消</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="导入结果" :close-on-press-escape="false" :close-on-click-modal="false" :visible.sync="importMsgOpen" width="500px" append-to-body>
|
|
|
- <div class="import-msg" v-html="importMsg">
|
|
|
- </div>
|
|
|
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="importMsgOpen"
|
|
|
+ append-to-body title="导入结果" width="500px"
|
|
|
+ >
|
|
|
+ <h1>操作成功!</h1>
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 批量发货 -->
|
|
@@ -538,7 +548,13 @@
|
|
|
<em>点击上传</em>
|
|
|
</div>
|
|
|
<div slot="tip" class="el-upload__tip">
|
|
|
- <el-link style="font-size:12px" type="info" @click="importDeliveryNoteTemplate">下载模板</el-link>
|
|
|
+ <el-link
|
|
|
+ type="info"
|
|
|
+ id="templateDownloadLink"
|
|
|
+ @click.prevent="importDeliveryNoteTemplate"
|
|
|
+ >
|
|
|
+ 下载模板
|
|
|
+ </el-link>
|
|
|
</div>
|
|
|
<div slot="tip" class="el-upload__tip" style="color:red">提示:仅允许导入“xls”或“xlsx”格式文件!</div>
|
|
|
</el-upload>
|
|
@@ -552,7 +568,19 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { importTemplate,exportStoreOrderItems,createUserOrder,listStoreOrder, getStoreOrder, delStoreOrder, addStoreOrder, updateStoreOrder, exportStoreOrder,getOrderItemsNum } from "@/api/hisStore/storeOrder";
|
|
|
+import {
|
|
|
+ importTemplate,
|
|
|
+ exportStoreOrderItems,
|
|
|
+ createUserOrder,
|
|
|
+ listStoreOrder,
|
|
|
+ getStoreOrder,
|
|
|
+ delStoreOrder,
|
|
|
+ addStoreOrder,
|
|
|
+ updateStoreOrder,
|
|
|
+ exportStoreOrder,
|
|
|
+ getOrderItemsNum,
|
|
|
+ importDeliveryNoteExpressTemplate
|
|
|
+} from '@/api/hisStore/storeOrder'
|
|
|
import { getUserList } from "@/api/hisStore/user";
|
|
|
import { getAddressList } from "@/api/hisStore/userAddress";
|
|
|
import productOrder from "../components/productOrder";
|
|
@@ -729,15 +757,15 @@ export default {
|
|
|
// 是否显示弹出层(用户导入)
|
|
|
open: false,
|
|
|
// 弹出层标题(用户导入)
|
|
|
- title: "",
|
|
|
+ title: '',
|
|
|
// 是否禁用上传
|
|
|
isUploading: false,
|
|
|
// 是否更新已经存在的用户数据
|
|
|
updateSupport: 0,
|
|
|
// 设置上传的请求头部
|
|
|
- headers: { Authorization: "Bearer " + getToken() },
|
|
|
+ headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
// 上传的地址
|
|
|
- url: '',
|
|
|
+ url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importDeliveryNoteExpress',
|
|
|
},
|
|
|
deliveryNoteOpen:false,
|
|
|
miniAppList: [],
|
|
@@ -1117,9 +1145,13 @@ export default {
|
|
|
submitFileForm() {
|
|
|
this.$refs.upload.submit();
|
|
|
},
|
|
|
- importTemplate() {
|
|
|
+ handleDownloadTemplate() {
|
|
|
+ console.log("===== 点击了下载模板,进入 importTemplate 方法 ====="); // 新增这行
|
|
|
importTemplate().then((response) => {
|
|
|
+ console.log("接口返回的下载链接:", response.msg);
|
|
|
this.download(response.msg);
|
|
|
+ }).catch((error) => {
|
|
|
+ console.error("下载模板接口调用失败:", error); // 新增失败回调日志
|
|
|
});
|
|
|
},
|
|
|
// 文件上传中处理
|
|
@@ -1138,7 +1170,6 @@ export default {
|
|
|
// });
|
|
|
this.getList();
|
|
|
},
|
|
|
-
|
|
|
/** 查询部门下拉树结构 */
|
|
|
getTreeselect() {
|
|
|
var that=this;
|
|
@@ -1175,7 +1206,9 @@ export default {
|
|
|
},
|
|
|
//发货单模板下载
|
|
|
importDeliveryNoteTemplate(){
|
|
|
-
|
|
|
+ importDeliveryNoteExpressTemplate().then((response) => {
|
|
|
+ this.download(response.msg)
|
|
|
+ })
|
|
|
},
|
|
|
getAppList() {
|
|
|
this.miniAppList = []
|
|
@@ -1201,7 +1234,6 @@ export default {
|
|
|
this.$message.error('请选择要上传的文件');
|
|
|
return;
|
|
|
}
|
|
|
- this.orderUpload.url = `${process.env.VUE_APP_BASE_API}/store/store/storeOrder/importDeliveryNoteExpress`;
|
|
|
this.$refs.upload.submit();
|
|
|
},
|
|
|
}
|