|
|
|
@ -129,7 +129,7 @@ |
|
|
|
<span slot="label" @click="getBaseList(106,1)"><a herf="#">BU</a></span> |
|
|
|
<el-input v-model="modalData.buDesc" readonly style="width: 80px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="应用描述" prop="applicationDesc"> |
|
|
|
<el-form-item label="产品描述" prop="applicationDesc"> |
|
|
|
<el-input v-model="modalData.applicationDesc" clearable style="width: 300px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="产品类别" prop="productCategory"> |
|
|
|
@ -929,16 +929,6 @@ |
|
|
|
<el-input v-model="scope.row.customerPartNo" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="applicationDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="140" |
|
|
|
label="应用描述"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-model="scope.row.applicationDesc" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="productCategory" |
|
|
|
header-align="center" |
|
|
|
@ -951,6 +941,16 @@ |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="applicationDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="140" |
|
|
|
label="产品描述"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input v-model="scope.row.applicationDesc" style="width:98%"></el-input> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
</el-footer> |
|
|
|
@ -1261,7 +1261,7 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
columnProp: "partDesc", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "产品描述", |
|
|
|
columnLabel: "物料名称", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
@ -1271,34 +1271,34 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 101002001, |
|
|
|
serialNumber: '101002001Table4ApplicationDesc', |
|
|
|
serialNumber: '101002001Table4ProductCategory', |
|
|
|
tableId: "101002001Table4", |
|
|
|
tableName: "项目物料", |
|
|
|
columnProp: "applicationDesc", |
|
|
|
columnProp: "productCategory", |
|
|
|
headerAlign: "center", |
|
|
|
align: "left", |
|
|
|
columnLabel: "应用描述", |
|
|
|
align: "center", |
|
|
|
columnLabel: "产品类别", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 160 |
|
|
|
columnWidth: 120 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
functionId: 101002001, |
|
|
|
serialNumber: '101002001Table4ProductCategory', |
|
|
|
serialNumber: '101002001Table4ApplicationDesc', |
|
|
|
tableId: "101002001Table4", |
|
|
|
tableName: "项目物料", |
|
|
|
columnProp: "productCategory", |
|
|
|
columnProp: "applicationDesc", |
|
|
|
headerAlign: "center", |
|
|
|
align: "center", |
|
|
|
columnLabel: "产品类别", |
|
|
|
align: "left", |
|
|
|
columnLabel: "产品描述", |
|
|
|
columnHidden: false, |
|
|
|
columnImage: false, |
|
|
|
status: true, |
|
|
|
fixed: '', |
|
|
|
columnWidth: 120 |
|
|
|
columnWidth: 160 |
|
|
|
}, |
|
|
|
{ |
|
|
|
userId: this.$store.state.user.name, |
|
|
|
@ -2827,7 +2827,7 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.applicationDesc === '' || this.modalData.applicationDesc == null || !String(this.modalData.applicationDesc).trim()) { |
|
|
|
this.$message.warning('请填写应用描述!') |
|
|
|
this.$message.warning('请填写产品描述!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.modalData.productCategory === '' || this.modalData.productCategory == null) { |
|
|
|
@ -3055,7 +3055,7 @@ import CodeGeneration from "../../code/generation.vue"; |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.partList2.some(x => this.isTemporaryImportPart(x) && (x.applicationDesc == null || String(x.applicationDesc).trim() === ''))) { |
|
|
|
this.$message.warning('临时物料应用描述不能为空!') |
|
|
|
this.$message.warning('临时物料产品描述不能为空!') |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.partList2.some(x => this.isTemporaryImportPart(x) && (x.productCategory == null || x.productCategory === ''))) { |
|
|
|
|