|
@@ -37,9 +37,7 @@ export default {
|
|
puOrderItemList: [],
|
|
puOrderItemList: [],
|
|
puOrderExecuteList: [],
|
|
puOrderExecuteList: [],
|
|
},
|
|
},
|
|
-
|
|
|
|
tabColumns: NewTabColumns,
|
|
tabColumns: NewTabColumns,
|
|
-
|
|
|
|
tabName: "puOrderItemList",
|
|
tabName: "puOrderItemList",
|
|
};
|
|
};
|
|
},
|
|
},
|
|
@@ -224,11 +222,8 @@ export default {
|
|
puOrderExecuteList: [],
|
|
puOrderExecuteList: [],
|
|
};
|
|
};
|
|
},
|
|
},
|
|
- // 保存
|
|
|
|
- async handleSava() {
|
|
|
|
- // orderAddForm
|
|
|
|
- console.log(this.params, "params");
|
|
|
|
-
|
|
|
|
|
|
+ // 判断保存条件
|
|
|
|
+ judgeSaveCondition(cb){
|
|
this.$refs['orderAddForm'].validate(async (valid) => {
|
|
this.$refs['orderAddForm'].validate(async (valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
|
|
|
|
@@ -237,7 +232,30 @@ export default {
|
|
this.$message.error('请填写订单行!');
|
|
this.$message.error('请填写订单行!');
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
- try {
|
|
|
|
|
|
+
|
|
|
|
+ // puOrderItemList
|
|
|
|
+ let isPrice = this.params.puOrderItemList.filter(item => !item.whetherCompleteInquiry);
|
|
|
|
+
|
|
|
|
+ if(isPrice.length){
|
|
|
|
+
|
|
|
|
+ this.$message.error('询价失败!');
|
|
|
|
+ return false
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ console.log(isPrice,'isPrice');
|
|
|
|
+ cb();
|
|
|
|
+ } else {
|
|
|
|
+ console.log('error submit!!');
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ },
|
|
|
|
+ // 保存
|
|
|
|
+ handleSava() {
|
|
|
|
+ console.log(this.params,'this.params---------');
|
|
|
|
+ this.judgeSaveCondition(async()=>{
|
|
|
|
+ try {
|
|
|
|
+ this.loading = true;
|
|
const { code, msg } = await orderApi.create(this.params);
|
|
const { code, msg } = await orderApi.create(this.params);
|
|
if (code === 200) {
|
|
if (code === 200) {
|
|
this.handleCancel();
|
|
this.handleCancel();
|
|
@@ -245,13 +263,9 @@ export default {
|
|
} catch (err) {
|
|
} catch (err) {
|
|
//
|
|
//
|
|
} finally {
|
|
} finally {
|
|
- // this.setVisible(false);
|
|
|
|
|
|
+ this.loading = false;
|
|
}
|
|
}
|
|
- } else {
|
|
|
|
- console.log('error submit!!');
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ })
|
|
},
|
|
},
|
|
// 保存并新增
|
|
// 保存并新增
|
|
async handleSubmit() {
|
|
async handleSubmit() {
|
|
@@ -284,7 +298,7 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
// 子表参照改变之后
|
|
// 子表参照改变之后
|
|
- handleReferChange(val, type, source) {
|
|
|
|
|
|
+ handleReferChange(val, source, type) {
|
|
console.log(val, "val");
|
|
console.log(val, "val");
|
|
console.log(source, "source");
|
|
console.log(source, "source");
|
|
console.log(type, "type");
|
|
console.log(type, "type");
|
|
@@ -380,9 +394,11 @@ export default {
|
|
<h3>新增</h3>
|
|
<h3>新增</h3>
|
|
<div style="text-align: right">
|
|
<div style="text-align: right">
|
|
<el-button size="mini" @click="handleCancel">取消</el-button>
|
|
<el-button size="mini" @click="handleCancel">取消</el-button>
|
|
- <el-button size="mini" type="danger" @click="handleSava"
|
|
|
|
- >保存</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button
|
|
|
|
+ size="mini"
|
|
|
|
+ type="danger"
|
|
|
|
+ @click="handleSava"
|
|
|
|
+ >保存</el-button>
|
|
<!-- <el-button size="mini" type="info" @click="handleSubmit">
|
|
<!-- <el-button size="mini" type="info" @click="handleSubmit">
|
|
保存并新增
|
|
保存并新增
|
|
</el-button> -->
|
|
</el-button> -->
|
|
@@ -537,7 +553,7 @@ export default {
|
|
<el-form-item
|
|
<el-form-item
|
|
label-width="0"
|
|
label-width="0"
|
|
:prop="`${column.key}.${scope.$index}.${[cColumn.key]}`"
|
|
:prop="`${column.key}.${scope.$index}.${[cColumn.key]}`"
|
|
- :rules="{ required: cColumn.require, message: `${cColumn.title}不能为空`, trigger: 'change' }"
|
|
|
|
|
|
+ :rules="{ required: cColumn.require || false, message: `${cColumn.title}不能为空`, trigger: 'change' }"
|
|
>
|
|
>
|
|
<el-tag v-if="cColumn.key === 'index'" >
|
|
<el-tag v-if="cColumn.key === 'index'" >
|
|
{{ scope.$index + 1 }}
|
|
{{ scope.$index + 1 }}
|