|
@@ -191,15 +191,15 @@
|
|
|
>导出订单明细
|
|
>导出订单明细
|
|
|
</el-button>
|
|
</el-button>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
-<!-- <el-col :span="1.5">-->
|
|
|
|
|
-<!-- <el-button-->
|
|
|
|
|
-<!-- icon="el-icon-s-order"-->
|
|
|
|
|
-<!-- size="mini"-->
|
|
|
|
|
-<!-- type="warning"-->
|
|
|
|
|
-<!-- @click="openDeliveryNote"-->
|
|
|
|
|
-<!-- >批量发货-->
|
|
|
|
|
-<!-- </el-button>-->
|
|
|
|
|
-<!-- </el-col>-->
|
|
|
|
|
|
|
+ <el-col :span="1.5">
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ icon="el-icon-s-order"
|
|
|
|
|
+ size="mini"
|
|
|
|
|
+ type="warning"
|
|
|
|
|
+ @click="openDeliveryNote"
|
|
|
|
|
+ >批量更新订单状态
|
|
|
|
|
+ </el-button>
|
|
|
|
|
+ </el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
|
|
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
|
|
@@ -488,8 +488,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"
|
|
|
>
|
|
>
|
|
|
- <div class="import-msg" v-html="importMsg">
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <h1>操作成功!</h1>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<!-- 批量发货 -->
|
|
<!-- 批量发货 -->
|
|
@@ -502,23 +501,23 @@
|
|
|
>
|
|
>
|
|
|
<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"
|
|
@@ -536,7 +535,7 @@
|
|
|
</el-upload>
|
|
</el-upload>
|
|
|
<el-divider></el-divider>
|
|
<el-divider></el-divider>
|
|
|
<el-button @click="deliveryNoteOpen = false">取 消</el-button>
|
|
<el-button @click="deliveryNoteOpen = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="submitDeliveryNote('ruleForm')">确 定</el-button>
|
|
|
|
|
|
|
+ <el-button type="primary" @click="submitDeliveryNote">确 定</el-button>
|
|
|
</span>
|
|
</span>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
|
</div>
|
|
</div>
|
|
@@ -614,7 +613,6 @@ export default {
|
|
|
addressloading: false,
|
|
addressloading: false,
|
|
|
userloading: false,
|
|
userloading: false,
|
|
|
users: [],
|
|
users: [],
|
|
|
- userStatusOptions: [],
|
|
|
|
|
show: {
|
|
show: {
|
|
|
open: false,
|
|
open: false,
|
|
|
title: '订单详情'
|
|
title: '订单详情'
|
|
@@ -737,7 +735,7 @@ export default {
|
|
|
// 设置上传的请求头部
|
|
// 设置上传的请求头部
|
|
|
headers: { Authorization: 'Bearer ' + getToken() },
|
|
headers: { Authorization: 'Bearer ' + getToken() },
|
|
|
// 上传的地址
|
|
// 上传的地址
|
|
|
- url: null,
|
|
|
|
|
|
|
+ url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importDeliveryNoteExpress',
|
|
|
},
|
|
},
|
|
|
deliveryNoteOpen: false,
|
|
deliveryNoteOpen: false,
|
|
|
miniAppList: [],
|
|
miniAppList: [],
|
|
@@ -1110,7 +1108,7 @@ export default {
|
|
|
//打开发货单
|
|
//打开发货单
|
|
|
openDeliveryNote() {
|
|
openDeliveryNote() {
|
|
|
this.deliveryNoteOpen = true
|
|
this.deliveryNoteOpen = true
|
|
|
- this.getAppList();
|
|
|
|
|
|
|
+ // this.getAppList();
|
|
|
},
|
|
},
|
|
|
handleClose(done) {
|
|
handleClose(done) {
|
|
|
this.$confirm('确认关闭?')
|
|
this.$confirm('确认关闭?')
|
|
@@ -1143,21 +1141,13 @@ export default {
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
// 提交发货单
|
|
// 提交发货单
|
|
|
- submitDeliveryNote(formName) {
|
|
|
|
|
- this.$refs[formName].validate((valid) => {
|
|
|
|
|
- if (valid) {
|
|
|
|
|
- const uploadFiles = this.$refs.upload.uploadFiles;
|
|
|
|
|
- if (uploadFiles.length === 0) {
|
|
|
|
|
- this.$message.error('请选择要上传的文件');
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
- this.orderUpload.url = `${process.env.VUE_APP_BASE_API}/store/store/storeOrder/importDeliveryNoteExpress?miniAppId=${this.ruleForm.miniAppId}`;
|
|
|
|
|
- this.$refs.upload.submit();
|
|
|
|
|
- } else {
|
|
|
|
|
- console.log('error submit!!');
|
|
|
|
|
- return false;
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ submitDeliveryNote() {
|
|
|
|
|
+ const uploadFiles = this.$refs.upload.uploadFiles;
|
|
|
|
|
+ if (uploadFiles.length === 0) {
|
|
|
|
|
+ this.$message.error('请选择要上传的文件');
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$refs.upload.submit();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|