|
|
@@ -224,8 +224,8 @@
|
|
|
<el-select
|
|
|
filterable clearable
|
|
|
v-model="filterForm.data.energyid"
|
|
|
- placeholder=""
|
|
|
- multiple
|
|
|
+ placeholder=""
|
|
|
+ multiple
|
|
|
collapse-tags
|
|
|
style="width: 100%;"
|
|
|
>
|
|
|
@@ -383,13 +383,13 @@
|
|
|
label="项目描述"
|
|
|
min-width="100px"
|
|
|
:show-overflow-tooltip="true"
|
|
|
- ></el-table-column>
|
|
|
- <el-table-column
|
|
|
- sortable
|
|
|
- prop="seqno"
|
|
|
- label="序号"
|
|
|
- min-width="64px"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
+ ></el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ sortable
|
|
|
+ prop="seqno"
|
|
|
+ label="序号"
|
|
|
+ min-width="64px"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
></el-table-column>
|
|
|
<el-table-column
|
|
|
class-name="gn-TableDownloadExcel-none"
|
|
|
@@ -562,33 +562,32 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
- prop="factoryid"
|
|
|
- label="工厂"
|
|
|
- width="96px"
|
|
|
+ prop="propertyid"
|
|
|
+ label="属性"
|
|
|
+ width="105px"
|
|
|
:show-overflow-tooltip="true"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
v-if="scope.row.isSelection"
|
|
|
- :prop="scope.row.itemid + '.factoryid'"
|
|
|
- :rules="dialog.editorBox.form2.rules.factoryid"
|
|
|
+ :prop="scope.row.itemid + '.propertyid'"
|
|
|
+ :rules="dialog.editorBox.form2.rules.propertyid"
|
|
|
>
|
|
|
<el-select
|
|
|
filterable
|
|
|
clearable
|
|
|
style="width: 100%;"
|
|
|
- v-model="tableFormDataObj[scope.row.itemid].factoryid"
|
|
|
- @change="getName(scope.row.itemid, scope.$index, scope.row)"
|
|
|
+ v-model="tableFormDataObj[scope.row.itemid].propertyid"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="item of nameObj.factoryid.arr"
|
|
|
+ v-for="item of nameObj.propertyid.arr"
|
|
|
:key="item.id"
|
|
|
:value="item.id"
|
|
|
:label="item.name"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <span v-else>{{ nameObj.factoryid.obj[scope.row.factoryid] ? nameObj.factoryid.obj[scope.row.factoryid] : scope.row.factoryid }}</span>
|
|
|
+ <span v-else>{{ nameObj.propertyid.obj[scope.row.propertyid] ? nameObj.propertyid.obj[scope.row.propertyid] : scope.row.propertyid }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -726,27 +725,58 @@
|
|
|
</el-form-item>
|
|
|
<span v-else>{{scope.row.itemdesc}}</span>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- sortable
|
|
|
- prop="seqno"
|
|
|
- label="序号"
|
|
|
- min-width="64px"
|
|
|
- :show-overflow-tooltip="true"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-form-item
|
|
|
- v-if="scope.row.isSelection"
|
|
|
- :prop="scope.row.itemid + '.seqno'"
|
|
|
- :rules="dialog.editorBox.form2.rules.seqno"
|
|
|
- >
|
|
|
- <el-input @keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
- clearable style="width: 100%;"
|
|
|
- v-model.trim="tableFormDataObj[scope.row.itemid].seqno"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <span v-else>{{scope.row.seqno}}</span>
|
|
|
- </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ sortable
|
|
|
+ prop="seqno"
|
|
|
+ label="序号"
|
|
|
+ min-width="64px"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item
|
|
|
+ v-if="scope.row.isSelection"
|
|
|
+ :prop="scope.row.itemid + '.seqno'"
|
|
|
+ :rules="dialog.editorBox.form2.rules.seqno"
|
|
|
+ >
|
|
|
+ <el-input @keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
+ clearable style="width: 100%;"
|
|
|
+ v-model.trim="tableFormDataObj[scope.row.itemid].seqno"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <span v-else>{{scope.row.seqno}}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ sortable
|
|
|
+ prop="factoryid"
|
|
|
+ label="工厂"
|
|
|
+ width="96px"
|
|
|
+ :show-overflow-tooltip="true"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-form-item
|
|
|
+ v-if="scope.row.isSelection"
|
|
|
+ :prop="scope.row.itemid + '.factoryid'"
|
|
|
+ :rules="dialog.editorBox.form2.rules.factoryid"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="tableFormDataObj[scope.row.itemid].factoryid"
|
|
|
+ @change="getName(scope.row.itemid, scope.$index, scope.row)"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item of nameObj.factoryid.arr"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <span v-else>{{ nameObj.factoryid.obj[scope.row.factoryid] ? nameObj.factoryid.obj[scope.row.factoryid] : scope.row.factoryid }}</span>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
sortable
|
|
|
@@ -918,15 +948,15 @@
|
|
|
>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="12" v-if="dialog.editorBox.type !== 'add'">
|
|
|
- <el-form-item label="序号" prop="seqno" :rules="dialog.editorBox.form1.rules.seqno">
|
|
|
- <el-input clearable
|
|
|
- style="width: 100%;"
|
|
|
- v-model="dialog.editorBox.form1.data.seqno"
|
|
|
- >
|
|
|
- </el-input>
|
|
|
- </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="12" v-if="dialog.editorBox.type !== 'add'">
|
|
|
+ <el-form-item label="序号" prop="seqno" :rules="dialog.editorBox.form1.rules.seqno">
|
|
|
+ <el-input clearable
|
|
|
+ style="width: 100%;"
|
|
|
+ v-model="dialog.editorBox.form1.data.seqno"
|
|
|
+ >
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
@@ -1402,6 +1432,9 @@ export default {
|
|
|
workprocid: [
|
|
|
{ required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
],
|
|
|
+ propertyid: [
|
|
|
+ { required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
+ ],
|
|
|
mintimegranid: [
|
|
|
{ required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
],
|
|
|
@@ -1416,9 +1449,9 @@ export default {
|
|
|
bz: [],
|
|
|
useflag: [
|
|
|
{ required: true, message: '该项不能为空', trigger: 'change' }
|
|
|
- ],
|
|
|
- seqno: [
|
|
|
- { validator: zCheckNumber2, trigger: 'change' }
|
|
|
+ ],
|
|
|
+ seqno: [
|
|
|
+ { validator: zCheckNumber2, trigger: 'change' }
|
|
|
]
|
|
|
}
|
|
|
}
|
|
|
@@ -1768,7 +1801,7 @@ export default {
|
|
|
name: item.ITEMNAME,
|
|
|
desc: item.ITEMDESC,
|
|
|
level: node.level + 1,
|
|
|
- indextype: item.INDEXTYPE,
|
|
|
+ indextype: item.INDEXTYPE,
|
|
|
seqno: item.SEQNO
|
|
|
})
|
|
|
}
|
|
|
@@ -1833,10 +1866,10 @@ export default {
|
|
|
mintimegranid: item.mintimegranid,
|
|
|
warnvalue: item.warnvalue,
|
|
|
useflag: item.useflag,
|
|
|
- propertyid: item.useflag,
|
|
|
+ propertyid: item.propertyid,
|
|
|
seqno: item.seqno,
|
|
|
})
|
|
|
- }
|
|
|
+ }
|
|
|
console.log('测试');
|
|
|
that.table.table2.data = arr;
|
|
|
that.table.table2.total = res.data.total;
|
|
|
@@ -1982,7 +2015,7 @@ export default {
|
|
|
itemname: that.dialog.editorBox.form1.data.itemname,
|
|
|
indextype: that.dialog.editorBox.form1.data.indextype,
|
|
|
itemdesc: that.dialog.editorBox.form1.data.itemdesc,
|
|
|
- parentid: that.filterForm.node.level === 2 ? that.filterForm.node.id : null,
|
|
|
+ parentid: that.filterForm.node.level === 2 ? that.filterForm.node.id : null,
|
|
|
seqno: that.dialog.editorBox.form1.data.seqno
|
|
|
// itemflag: that.filterForm.node.level
|
|
|
};
|
|
|
@@ -2020,7 +2053,7 @@ export default {
|
|
|
id: that.dialog.editorBox.form2.data.workprocid,
|
|
|
name: that.nameObj.workprocid.obj[that.dialog.editorBox.form2.data.workprocid]
|
|
|
},
|
|
|
- itemflag: that.filterForm.node.level,
|
|
|
+ itemflag: that.filterForm.node.level,
|
|
|
seqno: that.dialog.editorBox.form2.data.seqno
|
|
|
}
|
|
|
}
|
|
|
@@ -2130,9 +2163,10 @@ export default {
|
|
|
itemdesc: that.tableFormDataObj[key].itemdesc,
|
|
|
bz: that.tableFormDataObj[key].bz,
|
|
|
mintimegranid: that.tableFormDataObj[key].mintimegranid,
|
|
|
- useflag: that.tableFormDataObj[key].useflag,
|
|
|
- seqno: that.tableFormDataObj[key].seqno,
|
|
|
- code: that.tableFormDataObj[key].seqno
|
|
|
+ useflag: that.tableFormDataObj[key].useflag,
|
|
|
+ seqno: that.tableFormDataObj[key].seqno,
|
|
|
+ code: that.tableFormDataObj[key].code,
|
|
|
+ propertyid:that.tableFormDataObj[key].propertyid
|
|
|
});
|
|
|
}
|
|
|
that.loading = true;
|
|
|
@@ -2176,7 +2210,9 @@ export default {
|
|
|
this.$message.error('精度为非负整数');
|
|
|
} else if (col && col === 'warnvalue') {
|
|
|
this.$message.error('超标警告数值为0-100');
|
|
|
- } else {
|
|
|
+ } else if(col && col === 'propertyid'){
|
|
|
+ this.$message.error('请填写属性');
|
|
|
+ }else {
|
|
|
this.$message.error('数据不完整或者格式错误');
|
|
|
}
|
|
|
}
|
|
|
@@ -2296,6 +2332,7 @@ export default {
|
|
|
let SubmitData = [{
|
|
|
itemid: row.itemid,
|
|
|
workprocid: row.workprocid,
|
|
|
+ propertyid:row.propertyid,
|
|
|
factoryid: row.factoryid,
|
|
|
useflag: useflag,
|
|
|
mintimegranid: row.mintimegranid
|
tangpy