|
|
@@ -39,7 +39,8 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="工单编号" min-width="150px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.number }}</span>
|
|
|
+ <!-- <span>{{ scope.row.number }}</span> -->
|
|
|
+ <el-button type="primary" size="mini" @click="form_see(scope.row)">{{ scope.row.number }}</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="类型" min-width="150px" align="center">
|
|
|
@@ -57,7 +58,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="对象" min-width="150px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button type="primary" size="mini" @click="form_record_see(scope.row)">查看</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="form_see(scope.row)">查看</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="任务" min-width="150px" align="center">
|
|
|
@@ -122,15 +123,15 @@
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="工单类型：" prop="name">
|
|
|
- <el-select v-model="addForm.formula_id" placeholder="请选择" class="filter-item" style="width: 100%;" >
|
|
|
+ <el-form-item label="工单类型：" prop="work_order_category_id">
|
|
|
+ <el-select v-model="addForm.work_order_category_id" placeholder="请选择" class="filter-item" style="width: 100%;" >
|
|
|
<el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="负责人员：" prop="formula_id">
|
|
|
- <el-select v-model="addForm.formula_id" placeholder="请选择" class="filter-item" style="width: 100%;" @change = "change_person" >
|
|
|
+ <el-form-item label="负责人员：" prop="user_id">
|
|
|
+ <el-select v-model="addForm.user_id" placeholder="请选择" class="filter-item" style="width: 100%;" @change = "change_person" >
|
|
|
<el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -138,21 +139,21 @@
|
|
|
</el-row>
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="工单任务：" prop="name">
|
|
|
+ <el-form-item label="工单任务：" prop="remark">
|
|
|
<el-input v-model="addForm.remark" type="textarea" maxlength="200" :rows="3" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="负责人手机号：" prop="name">
|
|
|
- <el-input v-model="addForm.remark" type="input" />
|
|
|
+ <el-form-item label="负责人手机号：" prop="user_phone">
|
|
|
+ <el-input v-model="addForm.user_phone" type="input" disabled />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
- <el-row :gutter="20">
|
|
|
+ <!-- <el-row :gutter="20">
|
|
|
<el-transfer :titles="['栏舍组名称', '栏舍名称组']" v-model="transDataChooseRight1" :data="transDataList1" :props="{ key: 'id', label: 'name' }" @change="change_transData1"></el-transfer>
|
|
|
- </el-row>
|
|
|
+ </el-row> -->
|
|
|
|
|
|
<el-row :gutter="20">
|
|
|
<el-transfer :titles="['栏舍名称', '栏舍名称']" v-model="transDataChooseRight2" :data="transDataList2" :props="{ key: 'id', label: 'name' }" @change="change_transData2"></el-transfer>
|
|
|
@@ -220,7 +221,7 @@ export default {
|
|
|
tableLoading: false,
|
|
|
//表格内容
|
|
|
tableList:[
|
|
|
- { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
|
|
|
+ { number:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
|
|
|
// { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
|
|
|
// { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
|
|
|
// { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
|
|
|
@@ -259,7 +260,7 @@ export default {
|
|
|
addFormStatus: '',
|
|
|
addFormTxt: { edit: '修改', create: '新增' },
|
|
|
addForm:{
|
|
|
- name:'',id:''
|
|
|
+ remark:'',user_phone:'', work_order_category_id:undefined,user_id:undefined,id:undefined,
|
|
|
},
|
|
|
|
|
|
addFormRules:{
|
|
|
@@ -353,21 +354,21 @@ export default {
|
|
|
})
|
|
|
|
|
|
|
|
|
- ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=1000', {name:""}).then(e => {
|
|
|
- console.log("穿梭框1：",e)
|
|
|
+ // ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=1000', {name:""}).then(e => {
|
|
|
+ // console.log("穿梭框1：",e)
|
|
|
|
|
|
- //打印请求成功结果
|
|
|
- if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0 ){
|
|
|
- me.transDataList1 = []
|
|
|
- } else {
|
|
|
- var transDataList1 = e.data.list
|
|
|
- transDataList1.forEach(function(item){
|
|
|
- item.name = item.name + "（犊牛数量："+ item.calf_number + "）"
|
|
|
- })
|
|
|
- me.transDataList1 = transDataList1
|
|
|
- }
|
|
|
+ // //打印请求成功结果
|
|
|
+ // if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0 ){
|
|
|
+ // me.transDataList1 = []
|
|
|
+ // } else {
|
|
|
+ // var transDataList1 = e.data.list
|
|
|
+ // transDataList1.forEach(function(item){
|
|
|
+ // item.name = item.name + "（犊牛数量："+ item.calf_number + "）"
|
|
|
+ // })
|
|
|
+ // me.transDataList1 = transDataList1
|
|
|
+ // }
|
|
|
|
|
|
- })
|
|
|
+ // })
|
|
|
|
|
|
|
|
|
ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
|
|
|
@@ -439,6 +440,15 @@ export default {
|
|
|
me.searchData.min_operation_time = ''
|
|
|
me.searchData.max_operation_time = ''
|
|
|
}
|
|
|
+
|
|
|
+ if (me.searchData.inputDatetime2 !== '' && me.searchData.inputDatetime2 !== null) {
|
|
|
+ me.searchData.start_created_time = parseTime(me.searchData.inputDatetime2[0], '{y}-{m}-{d}')
|
|
|
+ me.searchData.end_created_time = parseTime(me.searchData.inputDatetime2[1], '{y}-{m}-{d}')
|
|
|
+ } else {
|
|
|
+ me.searchData.inputDatetime2 = ''
|
|
|
+ me.searchData.start_created_time = ''
|
|
|
+ me.searchData.end_created_time = ''
|
|
|
+ }
|
|
|
me.get_table_data()
|
|
|
|
|
|
},
|
|
|
@@ -485,7 +495,12 @@ export default {
|
|
|
|
|
|
//清空弹窗表单信息
|
|
|
reset_form(){
|
|
|
- this.addForm.name = ''
|
|
|
+ this.addForm.remark = ''
|
|
|
+ this.addForm.user_phone = ''
|
|
|
+ this.addForm.work_order_category_id = undefined
|
|
|
+ this.addForm.user_id = undefined
|
|
|
+ this.addForm.id = undefined
|
|
|
+
|
|
|
},
|
|
|
|
|
|
//新增
|
|
|
@@ -498,6 +513,9 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//编辑
|
|
|
form_edit(row) {
|
|
|
console.log('行内容row=========', row)
|
|
|
@@ -624,14 +642,10 @@ export default {
|
|
|
|
|
|
change_person(value){
|
|
|
var me = this
|
|
|
- console.log("更改牛号Id",value)
|
|
|
- var item = me.cowNameList.find(obj => obj.calf_code == value)
|
|
|
- console.log("更改牛号当前的内容",item)
|
|
|
- me.addForm.calf_code = item.calf_code
|
|
|
- me.addForm.calf_category_id = item.calf_category_id
|
|
|
- me.addForm.calf_category_name = item.calf_category_name
|
|
|
- me.addForm.original_barn_id = item.barn_id
|
|
|
- me.addForm.original_barn_name = item.barn_name
|
|
|
+ console.log("更改人员Id",value)
|
|
|
+ var item = me.personList.find(obj => obj.id == value)
|
|
|
+ console.log("更改人员当前的内容",item)
|
|
|
+ addForm.user_phone = item.phone
|
|
|
|
|
|
},
|
|
|
|
