|
@@ -82,7 +82,7 @@
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
-
|
|
|
|
|
|
+
|
|
<pagination
|
|
<pagination
|
|
v-show="tableData.total > 0"
|
|
v-show="tableData.total > 0"
|
|
:limit.sync="queryParams.size"
|
|
:limit.sync="queryParams.size"
|
|
@@ -90,7 +90,7 @@
|
|
:total="Number(tableData.total)"
|
|
:total="Number(tableData.total)"
|
|
@pagination="fetch"
|
|
@pagination="fetch"
|
|
/>
|
|
/>
|
|
-
|
|
|
|
|
|
+
|
|
<tenant-edit
|
|
<tenant-edit
|
|
ref="edit"
|
|
ref="edit"
|
|
:dialog-visible="dialog.isVisible"
|
|
:dialog-visible="dialog.isVisible"
|
|
@@ -103,12 +103,12 @@
|
|
:dialog-visible="tenantViewVisible"
|
|
:dialog-visible="tenantViewVisible"
|
|
@close="viewClose"
|
|
@close="viewClose"
|
|
/>
|
|
/>
|
|
-
|
|
|
|
- <programnc-mgr
|
|
|
|
- ref="programnc"
|
|
|
|
|
|
+
|
|
|
|
+ <programnc-mgr
|
|
|
|
+ ref="programnc"
|
|
:dialog-visible="dialogProg.isVisible"
|
|
:dialog-visible="dialogProg.isVisible"
|
|
:title="dialogProg.title"
|
|
:title="dialogProg.title"
|
|
- @close="editProgClose"
|
|
|
|
|
|
+ @close="editProgClose"
|
|
@success="editProgSuccess"
|
|
@success="editProgSuccess"
|
|
></programnc-mgr>
|
|
></programnc-mgr>
|
|
<!--<el-dialog
|
|
<!--<el-dialog
|
|
@@ -117,7 +117,7 @@
|
|
width="750px"
|
|
width="750px"
|
|
:append-to-body="true"
|
|
:append-to-body="true"
|
|
>
|
|
>
|
|
-
|
|
|
|
|
|
+
|
|
</el-dialog>-->
|
|
</el-dialog>-->
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -188,7 +188,7 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted () {
|
|
mounted () {
|
|
-
|
|
|
|
|
|
+
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
// 【Radio】按钮值变化-事件
|
|
// 【Radio】按钮值变化-事件
|
|
@@ -220,7 +220,7 @@
|
|
handleCurrentChange(val) {
|
|
handleCurrentChange(val) {
|
|
this.currentRow = val;
|
|
this.currentRow = val;
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
// 【程序管理】按钮-事件
|
|
// 【程序管理】按钮-事件
|
|
addProgram(){
|
|
addProgram(){
|
|
this.dialogProg.title = this.$t("prepare.common.addProgram"); // this.$t("common.add")
|
|
this.dialogProg.title = this.$t("prepare.common.addProgram"); // this.$t("common.add")
|
|
@@ -229,12 +229,12 @@
|
|
// 打开弹出框
|
|
// 打开弹出框
|
|
this.dialogProg.isVisible = true;
|
|
this.dialogProg.isVisible = true;
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
// 【程序管理-取消】按钮-事件
|
|
// 【程序管理-取消】按钮-事件
|
|
editProgClose(){
|
|
editProgClose(){
|
|
this.dialogProg.isVisible = false;
|
|
this.dialogProg.isVisible = false;
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
// 【程序管理-确定】按钮-事件
|
|
// 【程序管理-确定】按钮-事件
|
|
editProgSuccess(obj, type){
|
|
editProgSuccess(obj, type){
|
|
console.log("【程序管理-确定】按钮: ", obj);
|
|
console.log("【程序管理-确定】按钮: ", obj);
|
|
@@ -255,7 +255,7 @@
|
|
this.tableData = arr;
|
|
this.tableData = arr;
|
|
}
|
|
}
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
viewClose () {
|
|
viewClose () {
|
|
this.tenantViewVisible = false
|
|
this.tenantViewVisible = false
|
|
},
|
|
},
|
|
@@ -271,7 +271,7 @@
|
|
this.tableData.push(objData)
|
|
this.tableData.push(objData)
|
|
}else{
|
|
}else{
|
|
// console.log("in的值:", objData)
|
|
// console.log("in的值:", objData)
|
|
- // console.log("当前选择的数据:", this.currentRow)
|
|
|
|
|
|
+ // console.log("当前选择的数据:", this.currentRow)
|
|
this.tableData.map(item => {
|
|
this.tableData.map(item => {
|
|
// key是唯一的,
|
|
// key是唯一的,
|
|
if(item.key == this.currentRow.key){
|
|
if(item.key == this.currentRow.key){
|
|
@@ -290,24 +290,24 @@
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
onSelectChange (selection) {
|
|
onSelectChange (selection) {
|
|
this.selection = selection
|
|
this.selection = selection
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
search () {
|
|
search () {
|
|
this.fetch({
|
|
this.fetch({
|
|
...this.queryParams
|
|
...this.queryParams
|
|
})
|
|
})
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
reset () {
|
|
reset () {
|
|
this.queryParams = initQueryParams({})
|
|
this.queryParams = initQueryParams({})
|
|
this.$refs.table.clearSort()
|
|
this.$refs.table.clearSort()
|
|
this.$refs.table.clearFilter()
|
|
this.$refs.table.clearFilter()
|
|
this.search()
|
|
this.search()
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
add () {
|
|
add () {
|
|
this.$refs.edit.type = "add"
|
|
this.$refs.edit.type = "add"
|
|
this.$refs.edit.setTenant(false, this.selectedEq, this.selectedTray)
|
|
this.$refs.edit.setTenant(false, this.selectedEq, this.selectedTray)
|
|
@@ -318,7 +318,7 @@
|
|
this.$refs.table.clearSelection()
|
|
this.$refs.table.clearSelection()
|
|
},
|
|
},
|
|
delete (ids) {
|
|
delete (ids) {
|
|
-
|
|
|
|
|
|
+
|
|
},
|
|
},
|
|
view (row) {
|
|
view (row) {
|
|
this.$refs.view.setTenant(row)
|
|
this.$refs.view.setTenant(row)
|
|
@@ -342,7 +342,7 @@
|
|
}
|
|
}
|
|
this.edit(this.selection[0]);
|
|
this.edit(this.selection[0]);
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
// [NC程序]修改-事件
|
|
// [NC程序]修改-事件
|
|
edit (row) {
|
|
edit (row) {
|
|
this.$refs.programnc.setTenant(row, this.selectedEq)
|
|
this.$refs.programnc.setTenant(row, this.selectedEq)
|
|
@@ -351,9 +351,9 @@
|
|
// 打开弹出框
|
|
// 打开弹出框
|
|
this.dialogProg.isVisible = true;
|
|
this.dialogProg.isVisible = true;
|
|
},
|
|
},
|
|
-
|
|
|
|
|
|
+
|
|
fetch (params = {}) {
|
|
fetch (params = {}) {
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -378,4 +378,4 @@
|
|
.itemDiv{
|
|
.itemDiv{
|
|
margin: 10px 0;
|
|
margin: 10px 0;
|
|
}
|
|
}
|
|
-</style>
|
|
|
|
|
|
+</style>
|