|
|
@@ -180,7 +180,7 @@
|
|
|
<el-form-item :label="f.label">
|
|
|
<template>
|
|
|
<div class="form-line">
|
|
|
-
|
|
|
+
|
|
|
<component :is="f.tagType" v-model="form.extField[f.prop]" :disabled="f.extAttribute?.disabled"
|
|
|
clearable :isProhibit="f.modelType == 'dict' ? f.extAttribute?.disabled : false
|
|
|
" :dictName="f.modelType == 'dict' ? f.label : ''"></component>
|
|
|
@@ -193,6 +193,18 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
</el-card>
|
|
|
+ <el-card shadow="never">
|
|
|
+ <headerTitle title="扩展标签"></headerTitle>
|
|
|
+ <!-- {{ form.extTagField }} -->
|
|
|
+ <el-form label-width="100px" >
|
|
|
+ <el-form-item label="是否消耗品">
|
|
|
+ <el-radio-group v-model="form.extTagField.isConsumables">
|
|
|
+ <el-radio :label="1">是</el-radio>
|
|
|
+ <el-radio :label="0">否</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </el-card>
|
|
|
|
|
|
<!-- 自定义编码 -->
|
|
|
<CodeDialog ref="codeRefs" v-if="codeShow" @close="codeShow = false" @chooseCode="chooseCode" />
|
|
|
@@ -330,7 +342,12 @@ export default {
|
|
|
weightUnit: '',
|
|
|
packingUnit: '',
|
|
|
isEnabled: 1,
|
|
|
- extField: {}
|
|
|
+ extField: {},
|
|
|
+ // isConsumables:2,
|
|
|
+ extTagField: {
|
|
|
+ isConsumables: 0,
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
lbjtList: [
|
|
|
{
|
|
|
@@ -472,10 +489,16 @@ export default {
|
|
|
weightUnit: '',
|
|
|
packingUnit: '',
|
|
|
extField: {},
|
|
|
+ extTagField: {
|
|
|
+ isConsumables: 0,
|
|
|
+ },
|
|
|
measureType: 1,
|
|
|
isEnabled: 1,
|
|
|
|
|
|
};
|
|
|
+
|
|
|
+ console.log(this.form);
|
|
|
+
|
|
|
this.categorySales = {};
|
|
|
this.purchaseInfo = {};
|
|
|
this.remarkform = {
|
|
|
@@ -741,8 +764,17 @@ export default {
|
|
|
fieldModel({ relevance: 't_main_category' }).then((res) => {
|
|
|
this.fileList = res;
|
|
|
|
|
|
+ if(!this.form.extTagField){
|
|
|
+ this.form.extTagField={
|
|
|
+ isConsumables:0
|
|
|
+ }; // 初始化动态模型属性
|
|
|
+
|
|
|
+ }
|
|
|
+ // this.$set(this.form.extTagField, 'isConsumables', 0); // 初始化动态模型属性
|
|
|
+
|
|
|
this.fileList.forEach((f) => {
|
|
|
this.$set(this.form.extField, f.prop, ''); // 初始化动态模型属性
|
|
|
+ // this.$set(this.form.extTagField, f.prop, ''); // 初始化动态模型属性
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
@@ -826,12 +858,13 @@ export default {
|
|
|
// 保存
|
|
|
submit() {
|
|
|
|
|
|
+
|
|
|
this.$refs.manageForm.validate(async (valid) => {
|
|
|
|
|
|
|
|
|
let productionValid = await this.$refs.productionRefs.getFormValid();
|
|
|
let warehouseValid = await this.$refs.warehouseRefs.getFormValid();
|
|
|
-
|
|
|
+
|
|
|
|
|
|
if (!valid || !productionValid || !warehouseValid) {
|
|
|
return false;
|
|
|
@@ -890,6 +923,8 @@ export default {
|
|
|
(item) => item.status == 1
|
|
|
);
|
|
|
this.form.extField.packingSpecification = packagingSpecificationList
|
|
|
+
|
|
|
+
|
|
|
.map((item) => {
|
|
|
return [
|
|
|
`${item.minPackageCell}${item.packageUnit}/${item.minConversionUnit}`,
|
chencc