|
@@ -24,7 +24,7 @@
|
|
|
<good-class
|
|
|
:value="ruleForm.cat_id"
|
|
|
@handleChange="goods_class_change"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:size="'mini'"
|
|
|
:isDetail="type !== 'add'"
|
|
|
:placeholder="'商品分类'"
|
|
@@ -47,7 +47,7 @@
|
|
|
<search-work-company
|
|
|
:value="ruleForm.company_id"
|
|
|
:placeholder="'业务公司'"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:size="'mini'"
|
|
|
:isDetail="type !== 'add'"
|
|
|
@searchChange="company_idsearchChange"
|
|
@@ -59,7 +59,7 @@
|
|
|
<search-supplier
|
|
|
:value="ruleForm.supplierNo"
|
|
|
:placeholder="'供应商'"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:size="'mini'"
|
|
|
:isDetail="type !== 'add'"
|
|
|
@searchChange="supplierNosearchChange"
|
|
@@ -102,7 +102,7 @@
|
|
|
<el-form-item label="商品单位" prop="unit">
|
|
|
<search-unit
|
|
|
:value="ruleForm.unit"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:size="'mini'"
|
|
|
:isDetail="type !== 'add'"
|
|
|
:names="unit_name"
|
|
@@ -152,7 +152,7 @@
|
|
|
v-model="ruleForm.is_stock"
|
|
|
filterable
|
|
|
clearable
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
style="width: 100%"
|
|
|
placeholder="是否库存品"
|
|
|
>
|
|
@@ -169,7 +169,7 @@
|
|
|
<el-form-item label="税点" prop="tax">
|
|
|
<search-tax
|
|
|
:value="ruleForm.tax"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:size="'mini'"
|
|
|
:isDetail="type !== 'add'"
|
|
|
:placeholder="'税点'"
|
|
@@ -182,7 +182,7 @@
|
|
|
<el-input
|
|
|
placeholder="贵金属重量"
|
|
|
v-model="ruleForm.noble_weight"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
type="number"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
@@ -196,7 +196,7 @@
|
|
|
<el-form-item label="贵金属种类" prop="noble_metal">
|
|
|
<search-metal-kind
|
|
|
:value="ruleForm.noble_metal"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:size="'mini'"
|
|
|
:isDetail="type !== 'add'"
|
|
|
:placeholder="'贵金属种类'"
|
|
@@ -210,7 +210,7 @@
|
|
|
v-model="ruleForm.is_gold_price"
|
|
|
filterable
|
|
|
clearable
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
style="width: 100%"
|
|
|
placeholder="启用实时金价"
|
|
|
>
|
|
@@ -265,7 +265,7 @@
|
|
|
<el-select
|
|
|
v-model="ruleForm.good_type"
|
|
|
filterable
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
clearable
|
|
|
style="width: 100%"
|
|
|
placeholder="是否定制"
|
|
@@ -627,12 +627,16 @@
|
|
|
>
|
|
|
<div class="img-show-li-div">
|
|
|
<img :src="img" class="img-show" alt="" />
|
|
|
- <i v-if="type !== 'view'" class="el-icon-close" @click="closeImg(iindex)"></i>
|
|
|
+ <i
|
|
|
+ v-if="type !== 'view'"
|
|
|
+ class="el-icon-close"
|
|
|
+ @click="closeImg(iindex)"
|
|
|
+ ></i>
|
|
|
</div>
|
|
|
</li>
|
|
|
<li
|
|
|
class="img-show-li"
|
|
|
- v-if="ruleForm.good_info_img.length < 10&&type !== 'view'"
|
|
|
+ v-if="ruleForm.good_info_img.length < 10 && type !== 'view'"
|
|
|
>
|
|
|
<div class="activity-upload">
|
|
|
<div class="btnupload" style="position: relative">
|
|
@@ -673,7 +677,7 @@
|
|
|
placeholder="证书费"
|
|
|
v-model="ruleForm.cert_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -688,7 +692,7 @@
|
|
|
placeholder="包装费"
|
|
|
v-model="ruleForm.packing_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -703,7 +707,7 @@
|
|
|
placeholder="成本工艺费"
|
|
|
v-model="ruleForm.cost_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -718,7 +722,7 @@
|
|
|
placeholder="加标费"
|
|
|
v-model="ruleForm.mark_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -733,7 +737,7 @@
|
|
|
placeholder="打样费"
|
|
|
v-model="ruleForm.demo_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -748,7 +752,7 @@
|
|
|
placeholder="开模费"
|
|
|
v-model="ruleForm.open_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -763,7 +767,7 @@
|
|
|
placeholder="调样费"
|
|
|
v-model="ruleForm.sample_fee"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -778,7 +782,7 @@
|
|
|
placeholder="市场价"
|
|
|
v-model="ruleForm.market_price"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -793,7 +797,7 @@
|
|
|
placeholder="含税成本合计"
|
|
|
v-model="ruleForm.nake_price"
|
|
|
type="number"
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
:min="0"
|
|
|
:max="9999999999.99"
|
|
|
:step="2"
|
|
@@ -814,7 +818,7 @@
|
|
|
<li>本</li>
|
|
|
</ul></el-col
|
|
|
>
|
|
|
- <el-col :span="23" class="dmain" >
|
|
|
+ <el-col :span="23" class="dmain">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="启用阶梯" prop="is_step">
|
|
@@ -822,7 +826,7 @@
|
|
|
v-model="ruleForm.is_step"
|
|
|
filterable
|
|
|
clearable
|
|
|
- :disabled="type === 'view'"
|
|
|
+ :disabled="type === 'view' || type === 'editBase'"
|
|
|
style="width: 100%"
|
|
|
placeholder="启用阶梯"
|
|
|
>
|
|
@@ -844,7 +848,6 @@
|
|
|
style="width: 100%; margin: 0 0 20px 0"
|
|
|
>
|
|
|
<el-table-column prop="min_num" label="起订量(>=)" />
|
|
|
-
|
|
|
<el-table-column prop="nake_fee" label="成本合计" />
|
|
|
<el-table-column prop="cost_fee" label="工艺费" />
|
|
|
<el-table-column prop="delivery_fee" label="其中运费" />
|
|
@@ -1022,13 +1025,15 @@ export default {
|
|
|
model.good_info_img = model.good_info_img.toString();
|
|
|
model.unit = model.unit.toString();
|
|
|
let res = {};
|
|
|
- // if (this.id === "003") {
|
|
|
- // delete model["id"];
|
|
|
- // res = await asyncRequest.add(model);
|
|
|
- // } else {
|
|
|
- // res = await asyncRequest.update(model);
|
|
|
- // }
|
|
|
- res = await asyncRequest.add(model);
|
|
|
+ if (this.type === "add") {
|
|
|
+ delete model["id"];
|
|
|
+ delete model["spuCode"];
|
|
|
+ res = await asyncRequest.add(model);
|
|
|
+ } else if (this.type === "editBase") {
|
|
|
+ res = await asyncRequest.update(model);
|
|
|
+ } else {
|
|
|
+ res = await asyncRequest.updateP(model);
|
|
|
+ }
|
|
|
console.log(res);
|
|
|
this.loading = false;
|
|
|
if (res && res.code === 0) {
|
|
@@ -1167,6 +1172,15 @@ export default {
|
|
|
(cat_info || []).forEach((i) => {
|
|
|
cat_id.push(i.id);
|
|
|
});
|
|
|
+ let isok = false;
|
|
|
+ if (cat_id.length > 0) {
|
|
|
+ cat_id.forEach((i) => {
|
|
|
+ if (i === "8") {
|
|
|
+ isok = true;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ this.is_noble = isok;
|
|
|
this.tableData = [];
|
|
|
let list1 =
|
|
|
speclist && speclist.length > 0
|
|
@@ -1257,7 +1271,6 @@ export default {
|
|
|
},
|
|
|
//商品分类选择
|
|
|
goods_class_change(e) {
|
|
|
- console.log(e);
|
|
|
const { value, item } = e;
|
|
|
const { cat_desc } = item;
|
|
|
this.ruleForm.cat_id = value || [];
|