|
@@ -754,7 +754,6 @@
|
|
v-model="scope.row.eLength"
|
|
v-model="scope.row.eLength"
|
|
size="small"
|
|
size="small"
|
|
placeholder="请输入内容"
|
|
placeholder="请输入内容"
|
|
- :disabled="scope.row.eType == 4"
|
|
|
|
></el-input>
|
|
></el-input>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -1018,7 +1017,6 @@
|
|
v-model="scope.row.eLength"
|
|
v-model="scope.row.eLength"
|
|
size="small"
|
|
size="small"
|
|
placeholder="请输入内容"
|
|
placeholder="请输入内容"
|
|
- :disabled="scope.row.eType == 4"
|
|
|
|
></el-input>
|
|
></el-input>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -1536,13 +1534,13 @@ export default {
|
|
|
|
|
|
//数据类型的默认长度
|
|
//数据类型的默认长度
|
|
dataTypeDefaultMap: {
|
|
dataTypeDefaultMap: {
|
|
- 1: 255,//字符串
|
|
|
|
- 2: 20,//整数
|
|
|
|
- 3: 20,//小数
|
|
|
|
- 4: 0,//日期
|
|
|
|
- 5: 20,//数值
|
|
|
|
- 6: 255,//签名
|
|
|
|
- 7: 255,//文件
|
|
|
|
|
|
+ 1: 250,//字符串
|
|
|
|
+ 2: 50,//整数
|
|
|
|
+ 3: 50,//小数
|
|
|
|
+ 4: 50,//日期
|
|
|
|
+ 5: 50,//数值
|
|
|
|
+ 6: 50,//签名
|
|
|
|
+ 7: 100,//文件
|
|
},
|
|
},
|
|
|
|
|
|
defaultExpandedKeys:[],
|
|
defaultExpandedKeys:[],
|
|
@@ -1830,7 +1828,7 @@ export default {
|
|
});
|
|
});
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (this.eleForm.elementList[i].eType != 4 && !this.eleForm.elementList[i].eLength) {
|
|
|
|
|
|
+ if ( !this.eleForm.elementList[i].eLength) {
|
|
this.$message({
|
|
this.$message({
|
|
type: "warning",
|
|
type: "warning",
|
|
message: "请填写第" + (i + 1) + "条长度"
|
|
message: "请填写第" + (i + 1) + "条长度"
|
|
@@ -1840,10 +1838,10 @@ export default {
|
|
}
|
|
}
|
|
this.eleForm.elementList.forEach((element) => {
|
|
this.eleForm.elementList.forEach((element) => {
|
|
element.eAllowDeviation = (element.allow ? element.allow : '') + (element.deviation ? element.deviation : '');
|
|
element.eAllowDeviation = (element.allow ? element.allow : '') + (element.deviation ? element.deviation : '');
|
|
- if (element.eType == 4) {
|
|
|
|
- this.$set(element, 'eLength', 0);
|
|
|
|
- //element.eLength = 0;
|
|
|
|
- }
|
|
|
|
|
|
+ // if (element.eType == 4) {
|
|
|
|
+ // this.$set(element, 'eLength', 0);
|
|
|
|
+ // //element.eLength = 0;
|
|
|
|
+ // }
|
|
})
|
|
})
|
|
saveFormAndElement(this.eleForm).then(() => {
|
|
saveFormAndElement(this.eleForm).then(() => {
|
|
//console.log(res)
|
|
//console.log(res)
|
|
@@ -1946,10 +1944,11 @@ export default {
|
|
row.eAllowDeviation = (row.allow ? row.allow : '') + (row.deviation ? row.deviation : '');
|
|
row.eAllowDeviation = (row.allow ? row.allow : '') + (row.deviation ? row.deviation : '');
|
|
row.fId = this.curEleTable.id;
|
|
row.fId = this.curEleTable.id;
|
|
row.initTableName = this.curEleTable.initTableName;
|
|
row.initTableName = this.curEleTable.initTableName;
|
|
- if (row.eType == 4) {
|
|
|
|
- this.$set(row, 'eLength', 0);
|
|
|
|
- //row.eLength = 0;
|
|
|
|
- } else if (!row.eLength) {
|
|
|
|
|
|
+ // if (row.eType == 4) {
|
|
|
|
+ // this.$set(row, 'eLength', 0);
|
|
|
|
+ // //row.eLength = 0;
|
|
|
|
+ // } else
|
|
|
|
+ if (!row.eLength) {
|
|
this.$message({
|
|
this.$message({
|
|
type: "warning",
|
|
type: "warning",
|
|
message: "请填写长度"
|
|
message: "请填写长度"
|
|
@@ -2009,7 +2008,7 @@ export default {
|
|
});
|
|
});
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if (this.editEleList[i].eType != 4 && !this.editEleList[i].eLength) {
|
|
|
|
|
|
+ if ( !this.editEleList[i].eLength) {
|
|
this.$message({
|
|
this.$message({
|
|
type: "warning",
|
|
type: "warning",
|
|
message: "请填写第" + (i + 1) + "条长度"
|
|
message: "请填写第" + (i + 1) + "条长度"
|
|
@@ -2020,10 +2019,10 @@ export default {
|
|
if (this.editEleList.length > 0) {
|
|
if (this.editEleList.length > 0) {
|
|
this.editEleList.forEach((element) => {
|
|
this.editEleList.forEach((element) => {
|
|
element.eAllowDeviation = (element.allow ? element.allow : '') + (element.deviation ? element.deviation : '');
|
|
element.eAllowDeviation = (element.allow ? element.allow : '') + (element.deviation ? element.deviation : '');
|
|
- if (element.eType == 4) {
|
|
|
|
- this.$set(element, 'eLength', 0);
|
|
|
|
- //element.eLength = 0;
|
|
|
|
- }
|
|
|
|
|
|
+ // if (element.eType == 4) {
|
|
|
|
+ // this.$set(element, 'eLength', 0);
|
|
|
|
+ // //element.eLength = 0;
|
|
|
|
+ // }
|
|
})
|
|
})
|
|
updateBatchElements(this.editEleList, this.curEleTable.initTableName).then(() => {
|
|
updateBatchElements(this.editEleList, this.curEleTable.initTableName).then(() => {
|
|
this.editEleVisible = false;
|
|
this.editEleVisible = false;
|