|
@@ -221,7 +221,23 @@
|
|
label="项目名称"
|
|
label="项目名称"
|
|
width="250px"
|
|
width="250px"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
- ></el-table-column>
|
|
|
|
|
|
+ ><template slot-scope="scope">
|
|
|
|
+ <el-form-item
|
|
|
|
+ v-if="scope.row.isSelection"
|
|
|
|
+ :prop="scope.row.itemid + '.itemname'"
|
|
|
|
+ :rules="dialog.editorBox.form.rules.itemname"
|
|
|
|
+ >
|
|
|
|
+ <el-input clearable
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ v-model="tableFormDataObj[scope.row.itemid].itemname"
|
|
|
|
+ ></el-input>
|
|
|
|
+ <template slot="error" slot-scope="scope">
|
|
|
|
+ <p class="error" :title="scope.error">{{ scope.error }}</p>
|
|
|
|
+ </template>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <span v-else>{{ scope.row.itemname }}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
sortable
|
|
sortable
|
|
prop="itemdesc"
|
|
prop="itemdesc"
|
|
@@ -322,7 +338,30 @@
|
|
width="85px"
|
|
width="85px"
|
|
v-if="filterForm.seqshow"
|
|
v-if="filterForm.seqshow"
|
|
:show-overflow-tooltip="true"
|
|
:show-overflow-tooltip="true"
|
|
- ></el-table-column>
|
|
|
|
|
|
+ ></el-table-column>
|
|
|
|
+ <el-table-column
|
|
|
|
+ sortable
|
|
|
|
+ prop="digits"
|
|
|
|
+ label="精度"
|
|
|
|
+ width="85px"
|
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
|
+ ><template slot-scope="scope">
|
|
|
|
+ <el-form-item
|
|
|
|
+ v-if="scope.row.isSelection"
|
|
|
|
+ :prop="scope.row.itemid + '.digits'"
|
|
|
|
+ :rules="dialog.editorBox.form.rules.digits"
|
|
|
|
+ >
|
|
|
|
+ <el-input clearable
|
|
|
|
+ type="number"
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ v-model="tableFormDataObj[scope.row.itemid].digits"
|
|
|
|
+ ></el-input>
|
|
|
|
+ <template slot="error" slot-scope="scope">
|
|
|
|
+ <p class="error" :title="scope.error">{{ scope.error }}</p>
|
|
|
|
+ </template>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ <span v-else>{{ scope.row.digits }}</span>
|
|
|
|
+ </template></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
sortable
|
|
sortable
|
|
prop="showno"
|
|
prop="showno"
|
|
@@ -581,7 +620,17 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
- <!-- <el-row>
|
|
|
|
|
|
+ <el-row>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="精度" prop="digits">
|
|
|
|
+ <el-input clearable
|
|
|
|
+ style="width: 100%;"
|
|
|
|
+ v-model="dialog.editorBox.form.data.digits"
|
|
|
|
+ default= "1"
|
|
|
|
+ type='number'
|
|
|
|
+ ></el-input>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
<el-col :span="12">
|
|
<el-col :span="12">
|
|
<el-form-item label="顺序号" prop="seqno">
|
|
<el-form-item label="顺序号" prop="seqno">
|
|
<el-input clearable
|
|
<el-input clearable
|
|
@@ -693,7 +742,8 @@ export default {
|
|
unitid: '',
|
|
unitid: '',
|
|
seqno: '',
|
|
seqno: '',
|
|
fid: '',
|
|
fid: '',
|
|
- showno: ''
|
|
|
|
|
|
+ showno: '',
|
|
|
|
+ digits: ''
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
energyid: [
|
|
energyid: [
|
|
@@ -711,6 +761,9 @@ export default {
|
|
showno: [
|
|
showno: [
|
|
{ required: true, message: '该项不能为空', trigger: 'change' },
|
|
{ required: true, message: '该项不能为空', trigger: 'change' },
|
|
{ validator: zCheckNumber2, trigger: 'change' }
|
|
{ validator: zCheckNumber2, trigger: 'change' }
|
|
|
|
+ ],
|
|
|
|
+ digits: [
|
|
|
|
+ { required: true, message: '该项不能为空', trigger: 'change' }
|
|
]
|
|
]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -901,7 +954,8 @@ export default {
|
|
defaulman: item.defaulman,
|
|
defaulman: item.defaulman,
|
|
modificationtime: item.modificationtime,
|
|
modificationtime: item.modificationtime,
|
|
useflag: item.useflag,
|
|
useflag: item.useflag,
|
|
- showno: item.showno
|
|
|
|
|
|
+ showno: item.showno,
|
|
|
|
+ digits: item.digits
|
|
})
|
|
})
|
|
}
|
|
}
|
|
that.tableData = arr;
|
|
that.tableData = arr;
|
|
@@ -995,7 +1049,8 @@ export default {
|
|
workprocid: that.dialog.editorBox.form.data.workprocid,
|
|
workprocid: that.dialog.editorBox.form.data.workprocid,
|
|
propertyid: that.dialog.editorBox.form.data.propertyid,
|
|
propertyid: that.dialog.editorBox.form.data.propertyid,
|
|
unitid: that.dialog.editorBox.form.data.unitid,
|
|
unitid: that.dialog.editorBox.form.data.unitid,
|
|
- fid: that.dialog.editorBox.form.data.fid
|
|
|
|
|
|
+ fid: that.dialog.editorBox.form.data.fid,
|
|
|
|
+ digits: that.dialog.editorBox.form.data.digits
|
|
};
|
|
};
|
|
that.$refs['dialog_form'].validate((valid) => {
|
|
that.$refs['dialog_form'].validate((valid) => {
|
|
if (valid) {
|
|
if (valid) {
|
|
@@ -1020,7 +1075,8 @@ export default {
|
|
itemtype: 'B',
|
|
itemtype: 'B',
|
|
tablename: 'T_RM_BALANCE_VALUE',
|
|
tablename: 'T_RM_BALANCE_VALUE',
|
|
itemdesc: SubmitData.itemdesc,
|
|
itemdesc: SubmitData.itemdesc,
|
|
- fid: SubmitData.fid
|
|
|
|
|
|
+ fid: SubmitData.fid,
|
|
|
|
+ digits: SubmitData.digits
|
|
};
|
|
};
|
|
that.loading = true;
|
|
that.loading = true;
|
|
that.axios.post('pass/ems/v1/trmactitems/', addData, {
|
|
that.axios.post('pass/ems/v1/trmactitems/', addData, {
|
|
@@ -1100,14 +1156,16 @@ export default {
|
|
let SubmitData = [];
|
|
let SubmitData = [];
|
|
for (let key in that.tableFormDataObj) {
|
|
for (let key in that.tableFormDataObj) {
|
|
SubmitData.push({
|
|
SubmitData.push({
|
|
- itemid: that.tableFormDataObj[key].itemid,
|
|
|
|
|
|
+ itemid: that.tableFormDataObj[key].itemid,
|
|
|
|
+ itemname: that.tableFormDataObj[key].itemname,
|
|
itemdesc: that.tableFormDataObj[key].itemdesc,
|
|
itemdesc: that.tableFormDataObj[key].itemdesc,
|
|
energyid: that.tableFormDataObj[key].energyid,
|
|
energyid: that.tableFormDataObj[key].energyid,
|
|
workprocid: that.tableFormDataObj[key].workprocid,
|
|
workprocid: that.tableFormDataObj[key].workprocid,
|
|
propertyid: that.tableFormDataObj[key].propertyid,
|
|
propertyid: that.tableFormDataObj[key].propertyid,
|
|
unitid: that.tableFormDataObj[key].unitid,
|
|
unitid: that.tableFormDataObj[key].unitid,
|
|
fid: that.tableFormDataObj[key].fid,
|
|
fid: that.tableFormDataObj[key].fid,
|
|
- showno: that.tableFormDataObj[key].showno
|
|
|
|
|
|
+ showno: that.tableFormDataObj[key].showno,
|
|
|
|
+ digits: that.tableFormDataObj[key].digits
|
|
});
|
|
});
|
|
}
|
|
}
|
|
that.loading = true;
|
|
that.loading = true;
|