|
|
@@ -24,7 +24,7 @@
|
|
|
<el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
|
|
|
<el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
+ </el-dropdown>
|
|
|
<el-button class="export" style="float: right;" @click="handleHistoryRecord">历史记录</el-button>
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
@@ -83,7 +83,7 @@
|
|
|
<el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
|
|
|
<template slot-scope="{row}">
|
|
|
<el-button v-if="isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
|
|
|
- <span v-if="isRoleEdit" class="centerSpan">|</span>
|
|
|
+ <span v-if="isRoleEdit" class="centerSpan">|</span>
|
|
|
<el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -93,18 +93,18 @@
|
|
|
|
|
|
<!-- 新增/编辑 -->
|
|
|
<el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
- <template slot="title">
|
|
|
- <div class="avue-crud__dialog__header">
|
|
|
- <span class="el-dialog__title">
|
|
|
- <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
|
|
|
- {{ textMap[create.dialogStatus] }}
|
|
|
- </span>
|
|
|
- <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
|
|
|
- <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
|
- <svg-icon v-else icon-class="fullscreen" />
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
+ <template slot="title">
|
|
|
+ <div class="avue-crud__dialog__header">
|
|
|
+ <span class="el-dialog__title">
|
|
|
+ <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
|
|
|
+ {{ textMap[create.dialogStatus] }}
|
|
|
+ </span>
|
|
|
+ <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
|
|
|
+ <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
|
+ <svg-icon v-else icon-class="fullscreen" />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<div class="app-add">
|
|
|
<el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="150px" style="width: 100%;margin:0 auto 50px">
|
|
|
<el-row>
|
|
|
@@ -199,29 +199,29 @@
|
|
|
<el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
- </el-dialog>
|
|
|
- <!-- 历史记录 -->
|
|
|
- <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="historyRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
- <template slot="title">
|
|
|
- <div class="avue-crud__dialog__header">
|
|
|
- <span class="el-dialog__title">
|
|
|
- <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
|
|
|
- {{ textMap[historyRecord.dialogStatus] }}
|
|
|
- </span>
|
|
|
- <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
|
|
|
- <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
|
- <svg-icon v-else icon-class="fullscreen" />
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- <div class="historyRecord">
|
|
|
- <keep-alive>
|
|
|
- <component :is="historyRecord.myComponent" ref="historyRecord" />
|
|
|
- </keep-alive>
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
- <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
+ </el-dialog>
|
|
|
+ <!-- 历史记录 -->
|
|
|
+ <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="historyRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
+ <template slot="title">
|
|
|
+ <div class="avue-crud__dialog__header">
|
|
|
+ <span class="el-dialog__title">
|
|
|
+ <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
|
|
|
+ {{ textMap[historyRecord.dialogStatus] }}
|
|
|
+ </span>
|
|
|
+ <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
|
|
|
+ <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
|
+ <svg-icon v-else icon-class="fullscreen" />
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <div class="historyRecord">
|
|
|
+ <keep-alive>
|
|
|
+ <component :is="historyRecord.myComponent" ref="historyRecord" />
|
|
|
+ </keep-alive>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button class="cancelClose cancelClose1" @click="historyRecord.dialogFormVisible = false; ">关闭</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -238,7 +238,7 @@ export default {
|
|
|
name: 'FecalScreen',
|
|
|
components: { Pagination },
|
|
|
data() {
|
|
|
- return {
|
|
|
+ return {
|
|
|
dialogFull: false,
|
|
|
isRoleEdit: [],
|
|
|
requestParams: [
|
|
|
@@ -310,15 +310,15 @@ export default {
|
|
|
},
|
|
|
textMap: {
|
|
|
create: '新增',
|
|
|
- update: '编辑',
|
|
|
+ update: '编辑',
|
|
|
historyRecord: '历史记录'
|
|
|
},
|
|
|
- historyRecord: {
|
|
|
- dialogFormVisible: false,
|
|
|
- dialogStatus: '',
|
|
|
- myComponent: null
|
|
|
- },
|
|
|
- requestParam: {},
|
|
|
+ historyRecord: {
|
|
|
+ dialogFormVisible: false,
|
|
|
+ dialogStatus: '',
|
|
|
+ myComponent: null
|
|
|
+ },
|
|
|
+ requestParam: {},
|
|
|
requestParam2: {},
|
|
|
download: {
|
|
|
getdataListParm: {
|
|
|
@@ -520,7 +520,7 @@ export default {
|
|
|
handleCreate() {
|
|
|
console.log('点击了新增')
|
|
|
this.resetTemp()
|
|
|
- this.getNoteTakerList()
|
|
|
+ this.getNoteTakerList()
|
|
|
this.dialogFull = false
|
|
|
this.create.dialogStatus = 'create'
|
|
|
this.create.dialogFormVisible = true
|
|
|
@@ -551,36 +551,36 @@ export default {
|
|
|
console.log('新增保存发送参数', this.requestParam)
|
|
|
if (response.msg !== 'fail') {
|
|
|
this.saveData()
|
|
|
- } else {
|
|
|
- const checkStr = new RegExp('Duplicate entry :pbto')
|
|
|
- if (checkStr.test(response.data)) {
|
|
|
- this.$notify({ title: '保存失败', message: '同一栏舍不可重复录入', type: 'warning', duration: 2000 })
|
|
|
- } else {
|
|
|
- this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
+ } else {
|
|
|
+ const checkStr = new RegExp('Duplicate entry :pbto')
|
|
|
+ if (checkStr.test(response.data)) {
|
|
|
+ this.$notify({ title: '保存失败', message: '同一栏舍不可重复录入', type: 'warning', duration: 2000 })
|
|
|
+ } else {
|
|
|
+ this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- },
|
|
|
- saveData() {
|
|
|
- this.requestParam2.name = 'insertDungHistory'
|
|
|
- this.create.temp.pastureid = Cookies.get('pastureid')
|
|
|
- this.create.temp.changetime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
- this.create.temp.species = 'fps'
|
|
|
- this.create.temp.fourrate = ''
|
|
|
- this.create.temp.fourweight = ''
|
|
|
- this.requestParam2.parammaps = this.create.temp
|
|
|
- PostDataByName(this.requestParam2).then(response => {
|
|
|
- console.log('新增保存发送参数', this.requestParam1)
|
|
|
- if (response.msg !== 'fail') {
|
|
|
- this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
|
|
|
- this.create.dialogFormVisible = false
|
|
|
- this.getList()
|
|
|
- } else {
|
|
|
- this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
- }
|
|
|
- })
|
|
|
+ },
|
|
|
+ saveData() {
|
|
|
+ this.requestParam2.name = 'insertDungHistory'
|
|
|
+ this.create.temp.pastureid = Cookies.get('pastureid')
|
|
|
+ this.create.temp.changetime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
+ this.create.temp.species = 'fps'
|
|
|
+ this.create.temp.fourrate = ''
|
|
|
+ this.create.temp.fourweight = ''
|
|
|
+ this.requestParam2.parammaps = this.create.temp
|
|
|
+ PostDataByName(this.requestParam2).then(response => {
|
|
|
+ console.log('新增保存发送参数', this.requestParam1)
|
|
|
+ if (response.msg !== 'fail') {
|
|
|
+ this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
|
|
|
+ this.create.dialogFormVisible = false
|
|
|
+ this.getList()
|
|
|
+ } else {
|
|
|
+ this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
createDataAgain() {
|
|
|
console.log('点击了新增保存')
|
|
|
@@ -607,7 +607,7 @@ export default {
|
|
|
PostDataByName(this.requestParam).then(response => {
|
|
|
console.log('新增保存发送参数', this.requestParam)
|
|
|
if (response.msg !== 'fail') {
|
|
|
- this.saveData()
|
|
|
+ this.saveData()
|
|
|
this.resetTemp()
|
|
|
this.getList()
|
|
|
this.getNoteTakerList()
|
|
|
@@ -626,7 +626,7 @@ export default {
|
|
|
this.create.temp = Object.assign({}, row)
|
|
|
this.create.temp.id = row.id
|
|
|
|
|
|
- this.getNoteTakerList()
|
|
|
+ this.getNoteTakerList()
|
|
|
this.dialogFull = false
|
|
|
this.create.dialogStatus = 'update'
|
|
|
this.create.dialogFormVisible = true
|
|
|
@@ -655,7 +655,7 @@ export default {
|
|
|
PostDataByName(this.requestParam).then(response => {
|
|
|
console.log('新增保存发送参数', this.requestParam)
|
|
|
if (response.msg !== 'fail') {
|
|
|
- this.saveData()
|
|
|
+ this.saveData()
|
|
|
this.getList()
|
|
|
} else {
|
|
|
this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
@@ -749,6 +749,50 @@ export default {
|
|
|
this.$message({ type: 'error', message: '请选择一条粪便筛', duration: 2000 })
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
+ // 改成多条，后端接口未改正确，先注释
|
|
|
+ // handleCopy() {
|
|
|
+ // console.log('点击了复制')
|
|
|
+ // if (this.selectList.length == 0) {
|
|
|
+ // this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
|
|
|
+ // } else {
|
|
|
+ // MessageBox.confirm('是否确认复制此信息?', {
|
|
|
+ // confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
|
|
|
+ // }).then(() => {
|
|
|
+
|
|
|
+ // var send_data = {
|
|
|
+ // "common":{"returnmap":"0"},
|
|
|
+ // "data":[
|
|
|
+ // {
|
|
|
+ // "name":"insertSpotList",
|
|
|
+ // "resultmaps":{
|
|
|
+ // "list":this.selectList
|
|
|
+ // },
|
|
|
+ // "children":[
|
|
|
+ // {
|
|
|
+ // "name":"copyDungsieve","type":"e",
|
|
|
+ // "parammaps":{
|
|
|
+ // "pastureid":"@insertSpotList.pastureid"
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // ]
|
|
|
+ // }
|
|
|
+ // ]
|
|
|
+ // }
|
|
|
+ // ExecDataByConfig(send_data).then(response => {
|
|
|
+ // if (response.msg === 'fail') {
|
|
|
+ // this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
+ // } else {
|
|
|
+ // this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
|
|
|
+ // this.getList()
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // }).catch(() => {
|
|
|
+ // this.$message({ type: 'info', message: '已取消复制' })
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // },
|
|
|
// 导出
|
|
|
handleExport(item) {
|
|
|
if (item == 1) {
|
|
|
@@ -851,15 +895,15 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
)
|
|
|
- },
|
|
|
- handleHistoryRecord() {
|
|
|
- console.log('点击历史记录')
|
|
|
- this.dialogFull = false
|
|
|
- this.historyRecord.dialogStatus = 'historyRecord'
|
|
|
- this.historyRecord.dialogFormVisible = true
|
|
|
- const vue = this
|
|
|
- var myComponent = () => import('./historyRecord.vue')
|
|
|
- return vue.historyRecord.myComponent = myComponent
|
|
|
+ },
|
|
|
+ handleHistoryRecord() {
|
|
|
+ console.log('点击历史记录')
|
|
|
+ this.dialogFull = false
|
|
|
+ this.historyRecord.dialogStatus = 'historyRecord'
|
|
|
+ this.historyRecord.dialogFormVisible = true
|
|
|
+ const vue = this
|
|
|
+ var myComponent = () => import('./historyRecord.vue')
|
|
|
+ return vue.historyRecord.myComponent = myComponent
|
|
|
}
|
|
|
|
|
|
}
|
