|
|
@@ -8,6 +8,7 @@
|
|
|
v-loading="loading"
|
|
|
label-width="85px"
|
|
|
class="demo-ruleForm"
|
|
|
+
|
|
|
>
|
|
|
<el-row>
|
|
|
<el-col
|
|
|
@@ -185,6 +186,17 @@
|
|
|
@selectChange="selectAreaorigin_place"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="发货地" prop="delivery_place">
|
|
|
+ <select-area
|
|
|
+ :placeholder="'发货地'"
|
|
|
+ :value="ruleForm.delivery_place"
|
|
|
+ :size="'mini'"
|
|
|
+ :disabled="type === 'view'"
|
|
|
+ :is-detail="id !== 'add'"
|
|
|
+ @selectChange="selectAreadelivery_place"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12" style="padding: 0 0 0 15px">
|
|
|
<el-table
|
|
|
@@ -192,7 +204,7 @@
|
|
|
:size="'mini'"
|
|
|
border
|
|
|
style="width: 100%"
|
|
|
- max-height="120px"
|
|
|
+ max-height="175px"
|
|
|
>
|
|
|
<el-table-column prop="spec_name" label="规格类型" />
|
|
|
<el-table-column prop="spec_value_name" label="规格值" />
|
|
|
@@ -559,7 +571,7 @@
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
|
|
|
- <el-col :span="18">
|
|
|
+ <el-col :span="24">
|
|
|
<el-form-item label="采购备注" prop="remark">
|
|
|
<el-input
|
|
|
placeholder="采购备注"
|
|
|
@@ -579,7 +591,7 @@
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <!-- <el-col :span="24">
|
|
|
<el-form-item
|
|
|
label="商品图片(<1mb)"
|
|
|
prop="good_img"
|
|
|
@@ -603,6 +615,61 @@
|
|
|
></file-upload>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
+ </el-col> -->
|
|
|
+
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item
|
|
|
+ label="商品图片(<1mb)"
|
|
|
+ prop="good_img"
|
|
|
+ v-if="ruleForm.good_img"
|
|
|
+ class="activity-upload"
|
|
|
+ >
|
|
|
+ <div class="btnupload" style="position: relative; margin-left:10px;" v-for="(item,index) in ruleForm.good_img" :key=index>
|
|
|
+ <img
|
|
|
+
|
|
|
+ :src="ruleForm.good_img[index]"
|
|
|
+ class="avatar"
|
|
|
+ />
|
|
|
+ <i
|
|
|
+ v-if="
|
|
|
+ type == 'add' ||
|
|
|
+ type === 'editBase' ||
|
|
|
+ type === 'edit'
|
|
|
+ "
|
|
|
+ class="el-icon-close"
|
|
|
+ @click="closeImg(index, 'good_img')"
|
|
|
+ ></i>
|
|
|
+
|
|
|
+ </div>
|
|
|
+ <div v-if="type == 'view' ? false : true">
|
|
|
+ <i class="el-icon-plus avatar-uploader-icon" style="position: relative; width:50px;height:50px;">
|
|
|
+ <file-upload
|
|
|
+ class="Upload"
|
|
|
+ :accept="'.jpg,.png,.jpeg'"
|
|
|
+ :multiple="true"
|
|
|
+ :disabled="type === 'view'"
|
|
|
+ :uploadcondition="beforeAvatarUpload"
|
|
|
+ @UploadErrorEvent="UploadErrorEventgood_img"
|
|
|
+ @UploadSuccessEvent="UploadSuccessEventgood_img"
|
|
|
+ ></file-upload>
|
|
|
+ </i>
|
|
|
+ </div>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
+ <!-- <i class="el-icon-plus avatar-uploader-icon">
|
|
|
+
|
|
|
+ </i>
|
|
|
+ <file-upload
|
|
|
+ class="Upload"
|
|
|
+ :accept="'.jpg,.png,.jpeg'"
|
|
|
+ :multiple="true"
|
|
|
+ :disabled="false"
|
|
|
+ :uploadcondition="beforeAvatarUpload"
|
|
|
+ @UploadErrorEvent="UploadErrorEventgood_img"
|
|
|
+ @UploadSuccessEvent="UploadSuccessEventgood_img"
|
|
|
+ ></file-upload> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
@@ -706,6 +773,11 @@ export default {
|
|
|
// this.computedCost();
|
|
|
},
|
|
|
methods: {
|
|
|
+ //图片悬浮删除
|
|
|
+ closeImg(index, key) {
|
|
|
+ this.ruleForm[key].splice(index, 1);
|
|
|
+ this.$refs.ruleForm.validateField(key);
|
|
|
+ },
|
|
|
//加法精度问题
|
|
|
accAdd(arg1, arg2) {
|
|
|
var r1, r2, m;
|
|
|
@@ -911,6 +983,7 @@ export default {
|
|
|
weight, // string 重量
|
|
|
supply_area, // string 供货区域 1 全国2 除偏远地区
|
|
|
origin_place, // string 产地
|
|
|
+ delivery_place, // string 发货地
|
|
|
delivery_day, // string 物流天数
|
|
|
expire_day, // string 信息有效期
|
|
|
good_img, //
|
|
|
@@ -967,6 +1040,9 @@ export default {
|
|
|
tax: tax ? tax + "%" : "",
|
|
|
supply_area: supply_area || "",
|
|
|
origin_place: origin_place ? origin_place.split(",") : [],
|
|
|
+ delivery_place: delivery_place ? delivery_place.split(",") : [],
|
|
|
+
|
|
|
+
|
|
|
cert_fee: cert_fee || "0.00",
|
|
|
pakge_fee: pakge_fee || "0.00",
|
|
|
cost_fee: cost_fee || "0.00",
|
|
|
@@ -986,7 +1062,7 @@ export default {
|
|
|
other_config: other_config || "",
|
|
|
remark: remark || "",
|
|
|
cost_desc: cost_desc || "",
|
|
|
- good_img: good_img || "",
|
|
|
+ good_img: good_img || [],
|
|
|
};
|
|
|
|
|
|
this.status = status;
|
|
|
@@ -1002,6 +1078,10 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async submitForm() {
|
|
|
+ if(this.ruleForm.good_img.length>10){
|
|
|
+ this.$message.warning("上传图片不能超过10张")
|
|
|
+ return;
|
|
|
+ }
|
|
|
await this.$refs.ruleForm.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
this.loading = true;
|
|
|
@@ -1015,6 +1095,9 @@ export default {
|
|
|
model.brandid = model.brandid.toString();
|
|
|
model.supplierNo = model.supplierNo.toString();
|
|
|
model.origin_place = model.origin_place.toString();
|
|
|
+ model.delivery_place = model.delivery_place.toString();
|
|
|
+
|
|
|
+
|
|
|
model.unit_id = model.unit_id.toString();
|
|
|
model.config = model.config.toString();
|
|
|
model.tax = parseInt(model.tax + "") + "";
|
|
|
@@ -1073,6 +1156,7 @@ export default {
|
|
|
this.brand_name = "";
|
|
|
// this.type === "add" ? this.askItem.brand : "";
|
|
|
this.unit_name = "";
|
|
|
+ let good_img = this.askItem.good_img ? this.askItem.good_img.split(",") : []
|
|
|
//this.type === "add" ? this.askItem.unit_name : "";
|
|
|
this.ruleForm = {
|
|
|
infoNo: this.id || "",
|
|
|
@@ -1092,6 +1176,7 @@ export default {
|
|
|
tax: "",
|
|
|
supply_area: "",
|
|
|
origin_place: [],
|
|
|
+ delivery_place:[],
|
|
|
cert_fee: "0.00",
|
|
|
pakge_fee: "0.00",
|
|
|
cost_fee: "0.00",
|
|
|
@@ -1117,8 +1202,9 @@ export default {
|
|
|
other_config: this.type === "add" ? this.askItem.other_config : "",
|
|
|
remark: "",
|
|
|
cost_desc: this.type === "add" ? this.askItem.cost_desc : "",
|
|
|
- good_img: this.type === "add" ? this.askItem.good_img : "",
|
|
|
+ good_img: this.type === "add" ? good_img : [],
|
|
|
};
|
|
|
+
|
|
|
if (this.type === "add") {
|
|
|
this.spec_tableData = JSON.parse(
|
|
|
JSON.stringify(this.askItem.specinfo)
|
|
|
@@ -1262,6 +1348,13 @@ export default {
|
|
|
this.ruleForm.origin_place = e;
|
|
|
this.$refs.ruleForm.validateField("origin_place");
|
|
|
},
|
|
|
+ //发货地省市区
|
|
|
+ selectAreadelivery_place(e) {
|
|
|
+ this.ruleForm.delivery_place = e;
|
|
|
+ this.$refs.ruleForm.validateField("delivery_place");
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
|
|
|
//图片上传成功
|
|
|
async UploadSuccessEventgood_img(data) {
|
|
|
@@ -1270,17 +1363,22 @@ export default {
|
|
|
|
|
|
//图片上传成功
|
|
|
async UploadSuccessEvent(type, data) {
|
|
|
+ if(this.ruleForm.good_img.length>10){
|
|
|
+ this.$message.warning("上传图片最多不能超过10张")
|
|
|
+ return;
|
|
|
+ }
|
|
|
const { url } = data;
|
|
|
if (url === "noToken") {
|
|
|
await this.logout();
|
|
|
} else {
|
|
|
if (type === 1) {
|
|
|
- this.ruleForm.good_img = url;
|
|
|
+ this.ruleForm.good_img.push(url);
|
|
|
this.$refs.ruleForm.validateField("good_img");
|
|
|
} else if (type === 2) {
|
|
|
- this.ruleForm.good_img = url;
|
|
|
+ this.ruleForm.good_img.push(url);
|
|
|
this.$refs.ruleForm.validateField("good_img");
|
|
|
}
|
|
|
+ console.log(this.ruleForm.good_img.length)
|
|
|
this.$message.success("图片上传成功!");
|
|
|
}
|
|
|
},
|
|
|
@@ -1339,6 +1437,7 @@ export default {
|
|
|
tax: "",
|
|
|
supply_area: "",
|
|
|
origin_place: [],
|
|
|
+ delivery_place:[],
|
|
|
cert_fee: "0.00",
|
|
|
pakge_fee: "0.00",
|
|
|
cost_fee: "0.00",
|
|
|
@@ -1357,7 +1456,7 @@ export default {
|
|
|
other_config: "",
|
|
|
remark: "",
|
|
|
cost_desc: "",
|
|
|
- good_img: "",
|
|
|
+ good_img: [],
|
|
|
};
|
|
|
},
|
|
|
addFormData() {
|
|
|
@@ -1383,6 +1482,7 @@ export default {
|
|
|
tax: "",
|
|
|
supply_area: "",
|
|
|
origin_place: [],
|
|
|
+ delivery_place:[],
|
|
|
cert_fee: "0.00",
|
|
|
pakge_fee: "0.00",
|
|
|
cost_fee: "0.00",
|
|
|
@@ -1401,7 +1501,7 @@ export default {
|
|
|
other_config: "",
|
|
|
remark: "",
|
|
|
cost_desc: "",
|
|
|
- good_img: "",
|
|
|
+ good_img: [],
|
|
|
};
|
|
|
},
|
|
|
},
|
|
|
@@ -1422,5 +1522,22 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+i.el-icon-close {
|
|
|
+ position: absolute;
|
|
|
+ z-index: 2;
|
|
|
+ top: 0;
|
|
|
+ right: 0;
|
|
|
+ color: #63cbe7;
|
|
|
+ font-weight: bold;
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+
|
|
|
+// /deep/ .fileUp {
|
|
|
+// opacity: 10 !important;
|
|
|
+// width: 228px !important;
|
|
|
+// height: 200px !important;
|
|
|
+// outline: none;
|
|
|
+// position: static !important;
|
|
|
+// }
|
|
|
</style>
|
|
|
|
