xiaobai
/
equipment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

优化分配任务接口

master
李磊 3 years ago
parent
0504fcb2f3
commit
f00f3cf7ee
2 changed files with 19 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/views/allot/components/chengya_list.vue
  2. 27
      src/views/allot/rwd_list.vue

12
src/views/allot/components/chengya_list.vue
View File

@ -135,9 +135,9 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker v-model="renwudan.xiadariqi" type="date" placeholder="选择下达日期" style="width: 150px;" /> <el-date-picker v-model="renwudan.xiadariqi" type="date" value-format="yyyy-MM-dd" placeholder="选择下达日期" style="width: 150px;" />
<el-date-picker v-model="renwudan.yuejianriqi" type="date" placeholder="选择约检日期" style="width: 150px;" @blur="setWanchengqixian()" /> <el-date-picker v-model="renwudan.yuejianriqi" type="date" value-format="yyyy-MM-dd" placeholder="选择约检日期" style="width: 150px;" @blur="setWanchengqixian()" />
<el-date-picker v-model="renwudan.wanchengqixian" type="date" placeholder="选择完成期限" style="width: 150px;" /> <el-date-picker v-model="renwudan.wanchengqixian" type="date" value-format="yyyy-MM-dd" placeholder="选择完成期限" style="width: 150px;" />
<el-select v-model="renwudan.jianyanleixing" :collapse-tags="true" placeholder="请选择检验类型" style="width: 130px;"> <el-select v-model="renwudan.jianyanleixing" :collapse-tags="true" placeholder="请选择检验类型" style="width: 130px;">
<el-option key="初检" label="初检" value="初检" /> <el-option key="初检" label="初检" value="初检" />
<el-option key="复检" label="复检" value="复检" /> <el-option key="复检" label="复检" value="复检" />
@ -310,7 +310,7 @@ export default {
this.allotList = data this.allotList = data
this.allotSbzl = this.allotList[0].shebeizhongleidaima this.allotSbzl = this.allotList[0].shebeizhongleidaima
this.renwudan = { this.renwudan = {
xiadariqi: new Date() xiadariqi: this.formatter.dateFormat('YYYY-MM-dd')
} }
if (this.multipleSelection[0].shebeileixing !== undefined && this.multipleSelection[0].shebeileixing !== null) { if (this.multipleSelection[0].shebeileixing !== undefined && this.multipleSelection[0].shebeileixing !== null) {
this.title = '任务分配（' + this.multipleSelection[0].shebeileixing + '）' this.title = '任务分配（' + this.multipleSelection[0].shebeileixing + '）'
@ -435,7 +435,7 @@ export default {
}) })
}, },
clearSearch() { clearSearch() {
this.listQuery.bjState="2" this.listQuery.bjState = '2'
this.getList() this.getList()
}, },
// 表格单击选中行 getAllotListByBjdId // 表格单击选中行 getAllotListByBjdId
@ -648,7 +648,7 @@ export default {
setWanchengqixian() { setWanchengqixian() {
var date = new Date(this.renwudan.yuejianriqi) var date = new Date(this.renwudan.yuejianriqi)
date.setMonth(date.getMonth() + 1) date.setMonth(date.getMonth() + 1)
this.$set(this.renwudan, 'wanchengqixian', date) this.$set(this.renwudan, 'wanchengqixian', this.formatter.dateFormat('YYYY-MM-dd', date))
}, },
tableRowZhongjian({ row, rowIndex }) { tableRowZhongjian({ row, rowIndex }) {
if (row.zhongjianState === 1) { if (row.zhongjianState === 1) {

27
src/views/allot/rwd_list.vue
View File

@ -13,11 +13,11 @@
</sticky> </sticky>
<el-form> <el-form>
<el-form-item> <el-form-item>
<el-input v-model="listQuery.searchRwd.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
<el-select v-model="listQuery.searchRwd.teamId" placeholder="请选择检验小组" style="width: 150px;" @change="handleFilter"> <el-select v-model="listQuery.teamId" placeholder="请选择检验小组" style="width: 150px;" @change="handleFilter">
<el-option v-for="team in teams" :key="team.id" :label="team.name" :value="team.id" /> <el-option v-for="team in teams" :key="team.id" :label="team.name" :value="team.id" />
</el-select> </el-select>
<el-input v-model="listQuery.searchRwd.shiyongdanwei" placeholder="使用单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" /> <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位" clearable style="width: 400px" @keyup.enter.native="handleFilter" />
<el-button type="primary" icon="el-icon-search" @click="handleFilter"> <el-button type="primary" icon="el-icon-search" @click="handleFilter">
查询 查询
</el-button> </el-button>
@ -25,7 +25,7 @@
清除 清除
</el-button> </el-button>
<br> <br>
<el-select v-model="listQuery.searchRwd.quhuamingcheng" style="width: 120px" placeholder="请选择所属区划" clearable value="" @change="handleFilter"> <el-select v-model="listQuery.quhuamingcheng" style="width: 120px" placeholder="请选择所属区划" clearable value="" @change="handleFilter">
<el-option <el-option
v-for="item in areas" v-for="item in areas"
:key="item.value" :key="item.value"
@ -33,14 +33,14 @@
:value="item.label" :value="item.label"
/> />
</el-select> </el-select>
<el-select v-model="listQuery.searchRwd.jianyanleibie" style="width: 120px" placeholder="请选择检验类别" clearable value="" @change="handleFilter"> <el-select v-model="listQuery.jianyanleibie" style="width: 120px" placeholder="请选择检验类别" clearable value="" @change="handleFilter">
<el-option value="DJ" label="定期检验" /> <el-option value="DJ" label="定期检验" />
<el-option value="JJ" label="监督检验" /> <el-option value="JJ" label="监督检验" />
</el-select> </el-select>
<el-date-picker v-model="listQuery.searchRwd.yuejianriqiStart" type="date" placeholder="约检日期（起）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> <el-date-picker v-model="listQuery.yuejianriqiStart" type="date" placeholder="约检日期（起）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
<el-date-picker v-model="listQuery.searchRwd.yuejianriqiEnd" type="date" placeholder="约检日期（止）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> <el-date-picker v-model="listQuery.yuejianriqiEnd" type="date" placeholder="约检日期（止）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
<el-date-picker v-model="listQuery.searchRwd.createTimeStart" type="date" placeholder="创建日期（起）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> <el-date-picker v-model="listQuery.createTimeStart" type="date" placeholder="创建日期（起）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
<el-date-picker v-model="listQuery.searchRwd.createTimeEnd" type="date" placeholder="创建日期（止）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" /> <el-date-picker v-model="listQuery.createTimeEnd" type="date" placeholder="创建日期（止）" value-format="yyyy-MM-dd" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -92,7 +92,7 @@
<el-table-column align="center" label="组名称" prop="teamName" width="100" /> <el-table-column align="center" label="组名称" prop="teamName" width="100" />
<el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="100" /> <el-table-column align="center" label="区划名称" prop="quhuamingcheng" width="100" />
<el-table-column align="center" label="组长" prop="groupLeader" :formatter="formatter.getChineseName" width="70" /> <el-table-column align="center" label="组长" prop="groupLeader" :formatter="formatter.getChineseName" width="70" />
<el-table-column align="center" label="组成员" prop="jianyanrenyuan" /> <el-table-column :formatter="formatter.getChineseName" align="center" label="组成员" prop="jianyanrenyuan" />
<el-table-column align="center" label="约检日期" prop="yuejianriqi" width="100" /> <el-table-column align="center" label="约检日期" prop="yuejianriqi" width="100" />
<el-table-column align="center" label="创建日期" prop="createTime" width="100" /> <el-table-column align="center" label="创建日期" prop="createTime" width="100" />
<el-table-column align="center" label="查看报检" width="60"> <el-table-column align="center" label="查看报检" width="60">
@ -131,9 +131,8 @@ export default {
listQuery: { listQuery: {
pageNum: 1, // 页码 pageNum: 1, // 页码
pageSize: 20, // 每页条数 pageSize: 20, // 每页条数
searchRwd: { // 任务分配人 跟 超级管理员可以查看所有 其他人只能看自己 // 任务分配人 跟 超级管理员可以查看所有 其他人只能看自己
isLookRwdAll: this.hasRole('JDFPRW') || this.hasRole('FPRW') || this.hasRole('ADMIN') isLookRwdAll: this.hasRole('JDFPRW') || this.hasRole('FPRW') || this.hasRole('ADMIN'),
},
orderBy: 'id desc' orderBy: 'id desc'
}, },
multipleSelection: [], multipleSelection: [],
@ -210,7 +209,7 @@ export default {
this.selection = val this.selection = val
}, },
clearSearch() { clearSearch() {
this.listQuery.searchRwd = { this.listQuery = {
} }
this.getList() this.getList()
}, },

Write Preview
Loading…
Cancel
Save