|
|
@@ -177,7 +177,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12" v-show="ruleForm.good_code">
|
|
|
<el-row>
|
|
|
- <el-col :span="24">
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item label="活动类型" prop="goodtype">
|
|
|
<el-cascader
|
|
|
v-model="ruleForm.goodtype"
|
|
|
@@ -190,7 +190,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
- <!-- <el-col :span="12">
|
|
|
+ <el-col :span="12">
|
|
|
<el-form-item label="凭证文件" prop="proof_id">
|
|
|
<el-tooltip
|
|
|
effect="dark"
|
|
|
@@ -261,7 +261,7 @@
|
|
|
<li v-else class="shiping">暂无凭证</li>
|
|
|
</ul>
|
|
|
</el-form-item>
|
|
|
- </el-col> -->
|
|
|
+ </el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="剩余库存">
|
|
|
<el-input
|
|
|
@@ -626,12 +626,12 @@
|
|
|
@refresh="addrRefresh"
|
|
|
/>
|
|
|
|
|
|
- <!-- <show-voucher-model
|
|
|
+ <show-voucher-model
|
|
|
:showModel="showVoucher"
|
|
|
:id="goods_sitem.spuCode"
|
|
|
@cancel="showVoucher = false"
|
|
|
@searchChange="resvoucher"
|
|
|
- /> -->
|
|
|
+ />
|
|
|
</el-col>
|
|
|
<el-col
|
|
|
:span="24"
|
|
|
@@ -777,7 +777,7 @@ export default {
|
|
|
platform_id: "",
|
|
|
arrtime: "", //要求到货时间
|
|
|
new_good_price: "0",
|
|
|
- // proof_id: "", //凭证ID
|
|
|
+ proof_id: "", //凭证ID
|
|
|
proof_type: "", //凭证类型
|
|
|
proof_url: "", //凭证地址
|
|
|
activity_stock: "0",
|
|
|
@@ -830,13 +830,13 @@ export default {
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
- // proof_id: [
|
|
|
- // {
|
|
|
- // required: true,
|
|
|
- // message: "请选择凭证文件",
|
|
|
- // trigger: "change",
|
|
|
- // },
|
|
|
- // ],
|
|
|
+ proof_id: [
|
|
|
+ {
|
|
|
+ required: false,
|
|
|
+ message: "请选择凭证文件",
|
|
|
+ trigger: "change",
|
|
|
+ },
|
|
|
+ ],
|
|
|
|
|
|
goodtype: [
|
|
|
{
|
|
|
@@ -1015,20 +1015,20 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- // resvoucher(e) {
|
|
|
- // const { id, proof_type, proof_url } = e;
|
|
|
- // this.ruleForm.proof_id = id || "";
|
|
|
- // this.ruleForm.proof_type = proof_type || "";
|
|
|
- // this.ruleForm.proof_url = proof_url || "";
|
|
|
- // this.$refs.ruleForm.validateField("proof_id");
|
|
|
- // this.showVoucher = false;
|
|
|
- // },
|
|
|
- // proof_close() {
|
|
|
- // this.ruleForm.proof_id = "";
|
|
|
- // this.ruleForm.proof_type = "";
|
|
|
- // this.ruleForm.proof_url = "";
|
|
|
- // this.$refs.ruleForm.validateField("proof_id");
|
|
|
- // },
|
|
|
+ resvoucher(e) {
|
|
|
+ const { id, proof_type, proof_url } = e;
|
|
|
+ this.ruleForm.proof_id = id || "";
|
|
|
+ this.ruleForm.proof_type = proof_type || "";
|
|
|
+ this.ruleForm.proof_url = proof_url || "";
|
|
|
+ this.$refs.ruleForm.validateField("proof_id");
|
|
|
+ this.showVoucher = false;
|
|
|
+ },
|
|
|
+ proof_close() {
|
|
|
+ this.ruleForm.proof_id = "";
|
|
|
+ this.ruleForm.proof_type = "";
|
|
|
+ this.ruleForm.proof_url = "";
|
|
|
+ this.$refs.ruleForm.validateField("proof_id");
|
|
|
+ },
|
|
|
addrRefresh(e) {
|
|
|
const { list } = e;
|
|
|
this.addrForm.order_addr.push(...list);
|
