|
@@ -76,11 +76,11 @@
|
|
|
<el-button type="primary" @click="onSubmit('form', '2')" v-if="(form.status == '1' || form.status == '2-') && status == '0'">
|
|
|
保存
|
|
|
</el-button>
|
|
|
- <el-button type="primary" @click="onSubmit('form', '2-')" v-if="(form.status == '1' || form.status == '2-') && status == '1'"
|
|
|
- >添加保存</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" @click="onSubmit('form', '2-')" v-if="(form.status == '1' || form.status == '2-') && status == '1'">
|
|
|
+ 添加保存
|
|
|
+ </el-button>
|
|
|
<el-button type="primary" @click="onSubmit('form', '2')" v-if="form.status == '2'"> 保存 </el-button>
|
|
|
- <el-button type="warning" @click="onConfirm('3', '是否确认收货')" v-if="form.status == '2' && transport.length <= 1"> 确认收货 </el-button>
|
|
|
+ <el-button type="warning" @click="onConfirm('3', '是否确认收货')" v-if="form.status == '2'"> 确认收货 </el-button>
|
|
|
<el-button type="warning" @click="onConfirm('2', '是否确认全部发货')" v-if="form.status == '2-'"> 确认全部发货 </el-button>
|
|
|
</el-col>
|
|
|
</el-form-item>
|
|
@@ -153,9 +153,11 @@ export default {
|
|
|
return {
|
|
|
activit: {},
|
|
|
logList: [],
|
|
|
+ shop: {},
|
|
|
status: 0,
|
|
|
// 物流
|
|
|
reverse: false,
|
|
|
+ // 加载
|
|
|
loading: false,
|
|
|
rules: {
|
|
|
shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
|
|
@@ -179,7 +181,6 @@ export default {
|
|
|
],
|
|
|
// 弹框
|
|
|
dialog: { title: '信息管理', show: false, type: '1' },
|
|
|
- shop: {},
|
|
|
};
|
|
|
},
|
|
|
created() {},
|
|
@@ -214,9 +215,7 @@ export default {
|
|
|
let data = this.fieldform;
|
|
|
data.id = moment(new Date()).valueOf();
|
|
|
let info = this.goodsList.find((f) => f.id == data.id);
|
|
|
- if (info == '' || info == undefined) {
|
|
|
- this.goodsList.push(data);
|
|
|
- }
|
|
|
+ if (info == '' || info == undefined) this.goodsList.push(data);
|
|
|
this.toClose();
|
|
|
},
|
|
|
onstatus(status) {
|
|
@@ -285,6 +284,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ // 确认收货-确认全部发货
|
|
|
async onConfirm(val, text = '是否确认') {
|
|
|
this.$confirm(text, '提示', {
|
|
|
confirmButtonText: '确定',
|