Browse Source

门类管理bug修改

master
z_yu 3 years ago
parent
commit
23868dd9b3
  1. 2
      src/views/category/fileNoFormat/index.vue
  2. 5
      src/views/category/fileNoFormat/module/sortDialog.vue
  3. 5
      src/views/category/listBrowsing/module/sortDialog.vue
  4. 5
      src/views/category/orderingRule/module/sortDialog.vue
  5. 5
      src/views/category/sortDialog.vue
  6. 10
      src/views/components/BindingTagDlg.vue
  7. 2
      src/views/components/category/PreviewForm.vue

2
src/views/category/fileNoFormat/index.vue

@ -10,7 +10,7 @@
<el-table ref="leftTable" v-loading="table.left.loading" :data="table.left.data" style="width: 400px;" height="calc(100vh - 302px)" @selection-change="(val)=>selectionChangeHandler(val,'left')" @row-click="(row,column,e)=>clickRowHandler(row,column,e,'leftTable')">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="fieldCnName" label="隐藏字段" align="center" />
<el-table-column prop="fieldCnName" label="字段名称" align="center" />
</el-table>
<!--表单渲染-->
<eForm />

5
src/views/category/fileNoFormat/module/sortDialog.vue

@ -57,6 +57,11 @@ export default {
})
order(this.sortTableData).then(() => {
this.sortVisible = false
this.$notify({
title: '保存成功',
type: 'success',
duration: 2500
})
this.$emit('refresh')
})
}

5
src/views/category/listBrowsing/module/sortDialog.vue

@ -57,6 +57,11 @@ export default {
})
order(this.sortTableData).then(() => {
this.sortVisible = false
this.$notify({
title: '保存成功',
type: 'success',
duration: 2500
})
this.$emit('refresh')
})
}

5
src/views/category/orderingRule/module/sortDialog.vue

@ -57,6 +57,11 @@ export default {
})
order(this.sortTableData).then(() => {
this.sortVisible = false
this.$notify({
title: '保存成功',
type: 'success',
duration: 2500
})
this.$emit('refresh')
})
}

5
src/views/category/sortDialog.vue

@ -60,6 +60,11 @@ export default {
})
sort(data).then(() => {
this.sortVisible = false
this.$notify({
title: '保存成功',
type: 'success',
duration: 2500
})
this.$emit('treeNodeSort', this.sortTableData)
})
}

10
src/views/components/BindingTagDlg.vue

@ -279,7 +279,7 @@ export default {
this.coverBindingVisible = true
resolve()
} else if (res === 1) {
let writeRes = await RFID.writeEPC({ op: 'RFID_WriteEPC', sDevID: 'D001', EAS: '1', Type: this.bindingType, Code: this.bindingId, Tid: this.readData.tid })
let writeRes = await RFID.writeEPC({ op: 'RFID_WriteEPC', sDevID: 'D002', EAS: '1', Type: this.bindingType, Code: this.bindingId, Tid: this.readData.tid })
writeRes = JSON.parse(writeRes)
if (writeRes.code === '0') {
this.step = 5
@ -308,15 +308,15 @@ export default {
},
async opened() {
if (!this.isBinding) {
await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D001' })
await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D001' })
await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D002' })
await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D002' })
await this.startBind()
}
},
async nextStep() {
this.isBinding = false
await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D001' })
await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D001' })
await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: 'D002' })
await this.readEpc({ op: 'RFID_ReadEpc', sDevID: 'D002' })
await this.startBind()
},
//

2
src/views/components/category/PreviewForm.vue

@ -330,6 +330,8 @@ export default {
}
}
}
// addOrUpdateForm[item.fieldName] = item.isDefaultValue
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.preview-content {

Loading…
Cancel
Save