|
|
@@ -109,7 +109,7 @@
|
|
|
<!-- <el-button type="primary" v-if="isButtonEdit " size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button> -->
|
|
|
<el-button type="primary" v-if="isButtonEdit " size="mini" icon="el-icon-edit" @click="form_set1(scope.row)">发送设置1</el-button>
|
|
|
|
|
|
- <el-button type="primary" v-if="isButtonEdit " size="mini" icon="el-icon-edit" @click="form_set2(scope.row)">发送设置1</el-button>
|
|
|
+ <el-button type="primary" v-if="isButtonEdit " size="mini" icon="el-icon-edit" @click="form_set2(scope.row)">发送设置2</el-button>
|
|
|
|
|
|
|
|
|
<el-button type="primary" v-if="isButtonEdit " size="mini" icon="el-icon-edit" @click="form_edit1(scope.row)">修改1</el-button>
|
|
|
@@ -201,8 +201,8 @@
|
|
|
<el-row :gutter="20" >
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="工单分类：" prop="work_order_category_id">
|
|
|
- <el-select v-model="seeForm1.work_order_category_id" placeholder="请选择" style="width: 100%;" :disabled=" addFormStatus1=='see'">
|
|
|
- <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
+ <el-select v-model="seeForm1.work_order_category_id" placeholder="请选择" style="width: 100%;" disabled >
|
|
|
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -282,29 +282,36 @@
|
|
|
<div class="">
|
|
|
<el-form ref="resultFormRef1" :model="resultForm1" label-position="right" label-width="140px" style="width:90%;margin:0 auto 50px">
|
|
|
|
|
|
-
|
|
|
- <el-row :gutter="20">
|
|
|
|
|
|
+ <el-row :gutter="20">
|
|
|
|
|
|
-
|
|
|
<el-table :data="tableResultList1" style="width: 100%;margin-bottom: 20px;" row-key="id" border >
|
|
|
<el-table-column prop="cowshedGroup" label="序号" min-width="100px" > </el-table-column>
|
|
|
-
|
|
|
+ <el-table-column prop="cowshed" label="工单号" min-width="200px" > </el-table-column>
|
|
|
<el-table-column prop="cowshed" label="派单时间" min-width="200px" > </el-table-column>
|
|
|
- <el-table-column prop="num" label="状态" min-width="200px" > </el-table-column>
|
|
|
+ <el-table-column label="状态" min-width="150px" align="center" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if = "scope.row.status == 1">未派发</span>
|
|
|
+ <span v-if = "scope.row.status == 2">未完成</span>
|
|
|
+ <span v-if = "scope.row.status == 3">已关闭</span>
|
|
|
+ <span v-if = "scope.row.status == 4">已完成</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="num" label="执行人" min-width="200px" > </el-table-column>
|
|
|
<el-table-column prop="num" label="执行时间" min-width="200px" > </el-table-column>
|
|
|
<el-table-column prop="num" label="用时" min-width="200px" > </el-table-column>
|
|
|
+ <el-table-column label="工单对象" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
|
|
|
+ <template slot-scope="scope">
|
|
|
+
|
|
|
+ <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_result_detail_see1(scope.row)">查看</el-button>
|
|
|
+
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
|
|
|
</el-table>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
</el-row>
|
|
|
|
|
|
-
|
|
|
-
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button type="primary" @click="result_dialog_close1()">确认</el-button>
|
|
|
@@ -314,6 +321,35 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
+ <!-- 弹窗 执行结果 一次性工单 执行结果详情-->
|
|
|
+ <el-dialog title="工单信息" :visible.sync="resultFormDetailShow1" @close="result_detail_dialog_close1" width="80%">
|
|
|
+ <div class="">
|
|
|
+ <el-form ref="resultFormDetailRef1" :model="resultFormDetail1" label-position="right" label-width="140px" style="width:90%;margin:0 auto 50px">
|
|
|
+
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <!-- <el-table :data="tableResultDetailList1" style="width: 100%;margin-bottom: 20px;" row-key="id" border :span-method="ObjectSpanMethod" > -->
|
|
|
+ <el-table :data="tableResultDetailList1" style="width: 100%;margin-bottom: 20px;" row-key="id" border >
|
|
|
+ <el-table-column prop="cowshedGroup" label="栏舍组" min-width="200px" > </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column prop="cowshed" label="栏舍" min-width="200px" > </el-table-column>
|
|
|
+ <el-table-column prop="num" label="数量" min-width="200px" > </el-table-column>
|
|
|
+
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="result_detail_dialog_close1()">确认</el-button>
|
|
|
+
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
|
|
|
<!-- 弹窗 新增or修改 周期工单 -->
|
|
|
<el-dialog :title="addFormTxt2[addFormStatus2]" :visible.sync="addFormShow2" @close="add_dialog_close2" width="50%">
|
|
|
@@ -376,18 +412,18 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="条件" min-width="250px" align="center" >
|
|
|
<template slot-scope="scope">
|
|
|
- <span class="ifClass" >{{ scope.row.sql_name }}</span>
|
|
|
+ <!-- <span class="ifClass" >{{ scope.row.sql_name }}</span> -->
|
|
|
|
|
|
<span class="ifClass" >{{ scope.row.field_name }}</span>
|
|
|
|
|
|
- <span class="ifClass" >{{ scope.row.condition_key }}</span>
|
|
|
+ <!-- <span class="ifClass" >{{ scope.row.condition_key }}</span> -->
|
|
|
|
|
|
<span class="ifClass" >{{ scope.row.condition_value }}</span>
|
|
|
|
|
|
<span >{{ scope.row.value }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- 操作
|
|
|
+
|
|
|
|
|
|
<el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -487,13 +523,13 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="工单分类：" prop="work_order_category_id">
|
|
|
<el-select v-model="seeForm2.work_order_category_id" placeholder="请选择" style="width: 100%;" >
|
|
|
- <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" disabled />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="工单任务：" prop="remark">
|
|
|
- <el-input v-model="seeForm2.remark" type="textarea" maxlength="200" :rows="1" />
|
|
|
+ <el-input v-model="seeForm2.remark" type="textarea" maxlength="200" :rows="1" disabled />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -501,7 +537,7 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="状态：" prop="is_show">
|
|
|
<el-select v-model="seeForm2.is_show" placeholder="请选择" style="width: 100%;" >
|
|
|
- <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
+ <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" disabled />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -512,37 +548,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
- <el-row :gutter="20" >
|
|
|
|
|
|
- <el-col :span="9">
|
|
|
- <el-form-item label="执行设置：" prop="set_id">
|
|
|
- <el-select v-model="seeForm2.set_id" placeholder="请选择" style="width: 100%;" >
|
|
|
- <el-option v-for="item in setList1" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="5">
|
|
|
- <el-select v-model="seeForm2.set_id" placeholder="天周月" style="width: 100%;" >
|
|
|
- <el-option v-for="item in setList2" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
- </el-select>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="5">
|
|
|
- <el-select v-model="seeForm2.set_id" placeholder="周几" style="width: 100%;" >
|
|
|
- <el-option v-for="item in setList31" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
- </el-select>
|
|
|
- <el-select v-model="seeForm2.set_id" placeholder="几号" style="width: 100%;" >
|
|
|
- <el-option v-for="item in setList32" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
- </el-select>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="5">
|
|
|
- <el-time-picker v-model="seeForm2.feed_time" format='HH:mm:ss' type="time" placeholder="选择时间" style="width: 80%;" :clearable="false" />
|
|
|
- </el-col>
|
|
|
-
|
|
|
-
|
|
|
- </el-row>
|
|
|
|
|
|
<el-row :gutter="20" >
|
|
|
<h3 style="text-align:left;">
|
|
|
@@ -550,38 +556,36 @@
|
|
|
<span style="color:#ff0303;font-size:14px;">注：同一组的关系为“且”；组与组之间关系为“或”</span>
|
|
|
</h3>
|
|
|
|
|
|
- <el-button type="primary" v-if="isButtonEdit" @click="condition_add1">添加条件</el-button>
|
|
|
+
|
|
|
|
|
|
<el-table :data="tableAddList2" style="width: 100%;margin-bottom: 20px;" row-key="id" border >
|
|
|
<el-table-column label="组" min-width="150px" align="center" fixed="left">
|
|
|
<template slot-scope="scope">
|
|
|
- <span class="groupSpanClass spanc1" v-show="scope.row.group == 1" >{{ 1 }}</span>
|
|
|
- <span class="groupSpanClass spanc2" v-show="scope.row.group == 2" >{{ 2 }}</span>
|
|
|
- <span class="groupSpanClass spanc3" v-show="scope.row.group == 3" >{{ 3 }}</span>
|
|
|
- <span class="groupSpanClass spanc4" v-show="scope.row.group == 4" >{{ 4 }}</span>
|
|
|
- <span class="groupSpanClass spanc5" v-show="scope.row.group == 5" >{{ 5 }}</span>
|
|
|
- <span class="groupSpanClass spanc6" v-show="scope.row.group == 6" >{{ 6 }}</span>
|
|
|
- <span class="groupSpanClass spanc7" v-show="scope.row.group == 7" >{{ 7 }}</span>
|
|
|
- <span class="groupSpanClass spanc8" v-show="scope.row.group == 8" >{{ 8 }}</span>
|
|
|
- <span class="groupSpanClass spanc9" v-show="scope.row.group == 9" >{{ 9 }}</span>
|
|
|
- <span class="groupSpanClass spanc10" v-show="scope.row.group == 10" >{{ 10 }}</span>
|
|
|
- <span class="groupSpanClass spanc11" v-show="scope.row.group == 11" >{{ 11 }}</span>
|
|
|
+ <span class="groupSpanClass spanc1" v-show="scope.row.group_id == 1" >{{ 1 }}</span>
|
|
|
+ <span class="groupSpanClass spanc2" v-show="scope.row.group_id == 2" >{{ 2 }}</span>
|
|
|
+ <span class="groupSpanClass spanc3" v-show="scope.row.group_id == 3" >{{ 3 }}</span>
|
|
|
+ <span class="groupSpanClass spanc4" v-show="scope.row.group_id == 4" >{{ 4 }}</span>
|
|
|
+ <span class="groupSpanClass spanc5" v-show="scope.row.group_id == 5" >{{ 5 }}</span>
|
|
|
+ <span class="groupSpanClass spanc6" v-show="scope.row.group_id == 6" >{{ 6 }}</span>
|
|
|
+ <span class="groupSpanClass spanc7" v-show="scope.row.group_id == 7" >{{ 7 }}</span>
|
|
|
+ <span class="groupSpanClass spanc8" v-show="scope.row.group_id == 8" >{{ 8 }}</span>
|
|
|
+ <span class="groupSpanClass spanc9" v-show="scope.row.group_id == 9" >{{ 9 }}</span>
|
|
|
+ <span class="groupSpanClass spanc10" v-show="scope.row.group_id == 10" >{{ 10 }}</span>
|
|
|
+ <span class="groupSpanClass spanc11" v-show="scope.row.group_id == 11" >{{ 11 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="条件" min-width="250px" align="center" >
|
|
|
<template slot-scope="scope">
|
|
|
- <span class="ifClass" >{{ scope.row.field }}</span>
|
|
|
+ <!-- <span class="ifClass" >{{ scope.row.sql_name }}</span> -->
|
|
|
|
|
|
<span class="ifClass" >{{ scope.row.field_name }}</span>
|
|
|
|
|
|
- <span class="ifClass" >{{ scope.row.condition_key }}</span>
|
|
|
+ <!-- <span class="ifClass" >{{ scope.row.condition_key }}</span> -->
|
|
|
|
|
|
<span class="ifClass" >{{ scope.row.condition_value }}</span>
|
|
|
-
|
|
|
- <span >{{ scope.row.value }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- 操作
|
|
|
+
|
|
|
|
|
|
|
|
|
|
|
|
@@ -592,24 +596,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
- <el-row :gutter="20">
|
|
|
-
|
|
|
- <div v-for="item in tableSeeList2">
|
|
|
- <h3>{{item.date}}</h3>
|
|
|
-
|
|
|
- <el-table :data="item.tableArr" style="width: 100%;margin-bottom: 20px;" row-key="id" border :span-method="ObjectSpanMethod" >
|
|
|
- <el-table-column prop="cowshedGroup" label="栏舍组" min-width="200px" > </el-table-column>
|
|
|
-
|
|
|
- <el-table-column prop="cowshed" label="栏舍" min-width="200px" > </el-table-column>
|
|
|
- <el-table-column prop="num" label="数量" min-width="200px" > </el-table-column>
|
|
|
-
|
|
|
- </el-table>
|
|
|
-
|
|
|
- </div>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- </el-row>
|
|
|
+
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
@@ -675,6 +662,8 @@
|
|
|
<el-select v-model="searchResult2.status" filterable placeholder="状态" class="g-mr20" style="width: 180px;" clearable>
|
|
|
<el-option v-for="item in statusList2" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
+
|
|
|
+ <el-input v-model="searchResult2.user_name" placeholder="子工单号" style="width: 180px;" class="g-mr20" clearable />
|
|
|
|
|
|
|
|
|
|
|
|
@@ -686,14 +675,28 @@
|
|
|
|
|
|
|
|
|
|
|
|
- <el-table :data="tableResultList2" style="width: 100%;margin-bottom: 20px;" row-key="id" border >
|
|
|
+ <el-table :data="tableResultList2" style="width: 100%;margin-bottom: 20px;" row-key="id" border >
|
|
|
<el-table-column prop="cowshedGroup" label="序号" min-width="100px" > </el-table-column>
|
|
|
-
|
|
|
+ <el-table-column prop="cowshed" label="工单号" min-width="200px" > </el-table-column>
|
|
|
<el-table-column prop="cowshed" label="派单时间" min-width="200px" > </el-table-column>
|
|
|
- <el-table-column prop="num" label="状态" min-width="200px" > </el-table-column>
|
|
|
+ <el-table-column label="状态" min-width="150px" align="center" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if = "scope.row.status == 1">未派发</span>
|
|
|
+ <span v-if = "scope.row.status == 2">未完成</span>
|
|
|
+ <span v-if = "scope.row.status == 3">已关闭</span>
|
|
|
+ <span v-if = "scope.row.status == 4">已完成</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="num" label="执行人" min-width="200px" > </el-table-column>
|
|
|
<el-table-column prop="num" label="执行时间" min-width="200px" > </el-table-column>
|
|
|
<el-table-column prop="num" label="用时" min-width="200px" > </el-table-column>
|
|
|
+ <el-table-column label="工单对象" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
|
|
|
+ <template slot-scope="scope">
|
|
|
+
|
|
|
+ <el-button type="primary" size="mini" icon="el-icon-edit" @click="form_result_detail_see2(scope.row)">查看</el-button>
|
|
|
+
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
|
|
|
</el-table>
|
|
|
|
|
|
@@ -716,6 +719,36 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
+ <!-- 弹窗 执行结果 周期工单 执行结果详情-->
|
|
|
+ <el-dialog title="工单信息" :visible.sync="resultFormDetailShow2" @close="result_detail_dialog_close2" width="80%">
|
|
|
+ <div class="">
|
|
|
+ <el-form ref="resultFormDetailRef1" :model="resultFormDetail2" label-position="right" label-width="140px" style="width:90%;margin:0 auto 50px">
|
|
|
+
|
|
|
+
|
|
|
+ <el-row :gutter="20">
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <!-- <el-table :data="tableResultDetailList1" style="width: 100%;margin-bottom: 20px;" row-key="id" border :span-method="ObjectSpanMethod" > -->
|
|
|
+ <el-table :data="tableResultDetailList2" style="width: 100%;margin-bottom: 20px;" row-key="id" border >
|
|
|
+ <el-table-column prop="cowshedGroup" label="栏舍组" min-width="200px" > </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column prop="cowshed" label="栏舍" min-width="200px" > </el-table-column>
|
|
|
+ <el-table-column prop="num" label="数量" min-width="200px" > </el-table-column>
|
|
|
+
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ </el-row>
|
|
|
+
|
|
|
+ </el-form>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="result_detail_dialog_close2()">确认</el-button>
|
|
|
+
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
+
|
|
|
|
|
|
<!-- 弹窗 发送设置 一次性 -->
|
|
|
<el-dialog title="发送设置" :visible.sync="setFormShow1" @close="set_dialog_close1" width="50%">
|
|
|
@@ -1037,8 +1070,9 @@
|
|
|
],
|
|
|
|
|
|
statusList2:[
|
|
|
- {id: 3, name: '已完成'},
|
|
|
- {id: 4, name: '未完成'},
|
|
|
+ {id: 2, name: '未完成'},
|
|
|
+ {id: 3, name: '已关闭'},
|
|
|
+ {id: 4, name: '已完成'},
|
|
|
|
|
|
],
|
|
|
|
|
|
@@ -1228,7 +1262,14 @@
|
|
|
resultFormStatus1: '',
|
|
|
resultFormTxt1: { edit: '修改', create: '新增' },
|
|
|
resultForm1:{
|
|
|
- remark:'',user_phone:'', work_order_category_id:undefined,user_id:undefined,id:undefined,
|
|
|
+
|
|
|
+ // "work_order_id": 0,
|
|
|
+ // "start_created_time": "string",
|
|
|
+ // "end_created_time": "string",
|
|
|
+ // "user_name": "string",
|
|
|
+ // "status": 0,
|
|
|
+ // "sub_work_order_number": "string"
|
|
|
+ work_order_id:undefined, remark:'',user_phone:'', work_order_category_id:undefined,user_id:undefined,id:undefined,
|
|
|
},
|
|
|
tableResultList1:[
|
|
|
{ id: 1, cowshedGroup: 'A组(总数：100)', groupnum: '100', num: '33', cowshed: '001舍' },
|
|
|
@@ -1238,7 +1279,22 @@
|
|
|
{ id: 31, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '003舍' },
|
|
|
{ id: 32, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '006舍' },
|
|
|
],
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ resultFormDetailShow1:false,
|
|
|
+ resultFormDetail1:{},
|
|
|
+ tableResultDetailList1:[
|
|
|
+ { id: 1, cowshedGroup: 'A组(总数：100)', groupnum: '100', num: '33', cowshed: '001舍' },
|
|
|
+ { id: 31, cowshedGroup: 'A组(总数：100)', groupnum: '100', num: '33', cowshed: '002舍' },
|
|
|
+ { id: 32, cowshedGroup: 'A组(总数：100)', groupnum: '100',num: '33', cowshed: '003舍' },
|
|
|
+ { id: 1, cowshedGroup: 'B组(总数：100)', groupnum: '200',num: '33', cowshed: '003舍' },
|
|
|
+ { id: 31, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '003舍' },
|
|
|
+ { id: 32, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '006舍' },
|
|
|
+ ],
|
|
|
|
|
|
+
|
|
|
+
|
|
|
|
|
|
resultFormShow2:false,
|
|
|
resultFormStatus2: '',
|
|
|
@@ -1266,6 +1322,19 @@
|
|
|
{ id: 31, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '003舍' },
|
|
|
{ id: 32, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '006舍' },
|
|
|
],
|
|
|
+
|
|
|
+
|
|
|
+ resultFormDetailShow2:false,
|
|
|
+ resultFormDetail2:{},
|
|
|
+ tableResultDetailList2:[
|
|
|
+ { id: 1, cowshedGroup: 'A组(总数：100)', groupnum: '100', num: '33', cowshed: '001舍' },
|
|
|
+ { id: 31, cowshedGroup: 'A组(总数：100)', groupnum: '100', num: '33', cowshed: '002舍' },
|
|
|
+ { id: 32, cowshedGroup: 'A组(总数：100)', groupnum: '100',num: '33', cowshed: '003舍' },
|
|
|
+ { id: 1, cowshedGroup: 'B组(总数：100)', groupnum: '200',num: '33', cowshed: '003舍' },
|
|
|
+ { id: 31, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '003舍' },
|
|
|
+ { id: 32, cowshedGroup: 'B组(总数：100)', groupnum: '200', num: '33', cowshed: '006舍' },
|
|
|
+ ],
|
|
|
+
|
|
|
|
|
|
|
|
|
userClickList1:[
|
|
|
@@ -1563,7 +1632,21 @@
|
|
|
}
|
|
|
|
|
|
})
|
|
|
+
|
|
|
+
|
|
|
+ ajaxDataPost('/api/v1/ops/message_template/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
|
|
|
+ console.log("所有栏舍：",e)
|
|
|
|
|
|
+ //打印请求成功结果
|
|
|
+ if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0 ){
|
|
|
+ me.cowShedlist = []
|
|
|
+ } else {
|
|
|
+
|
|
|
+ me.cowShedlist = e.data.list
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
|
|
|
|
|
|
// ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=1000', {name:""}).then(e => {
|
|
|
@@ -1825,6 +1908,34 @@
|
|
|
console.log('行内容row=========', row)
|
|
|
//编辑行内容赋值
|
|
|
this.seeForm1 = Object.assign({}, row)
|
|
|
+
|
|
|
+
|
|
|
+ ajaxDataPost('/api/v1/ops/work_order/close_view?page=1&page_size=1000', {work_order_id:row.id}).then(e => {
|
|
|
+ console.log("详情里的表格：",e)
|
|
|
+
|
|
|
+ //打印请求成功结果
|
|
|
+ // if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0 ){
|
|
|
+ // me.rightlist = []
|
|
|
+ // } else {
|
|
|
+ // var rightlist = e.data.list
|
|
|
+ // //由于后端数据ID重复，这里需要ID前增加虚拟数据。一级组，二级舍
|
|
|
+ // rightlist.forEach(function(item){
|
|
|
+ // item.idTxt = "组"+item.id
|
|
|
+ // console.log(item)
|
|
|
+ // if(item.barn_list.length !== 0){
|
|
|
+ // item.barn_list.forEach(function(items){
|
|
|
+ // items.idTxt = ""+ items.id
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+
|
|
|
+ // })
|
|
|
+ // me.rightlist = rightlist
|
|
|
+ // }
|
|
|
+
|
|
|
+ // console.log("多选框 me.rightlist ：", me.rightlist )
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
this.seeFormStatus1 = 'see'
|
|
|
this.seeFormShow1 = true
|
|
|
this.$nextTick(() => {
|
|
|
@@ -1930,6 +2041,32 @@
|
|
|
this.resultForm2 = Object.assign({}, row)
|
|
|
this.resultFormShow2 = true
|
|
|
},
|
|
|
+
|
|
|
+
|
|
|
+ form_result_detail_see1(row) {
|
|
|
+ console.log('行内容row=========', row)
|
|
|
+ //编辑行内容赋值
|
|
|
+ this.resultFormDetail1 = Object.assign({}, row)
|
|
|
+ this.resultFormDetailShow1 = true
|
|
|
+ },
|
|
|
+
|
|
|
+ form_result_detail_see2(row) {
|
|
|
+ console.log('行内容row=========', row)
|
|
|
+ //编辑行内容赋值
|
|
|
+ this.resultFormDetail2 = Object.assign({}, row)
|
|
|
+ this.resultFormDetailShow2 = true
|
|
|
+ },
|
|
|
+
|
|
|
+
|
|
|
+ result_detail_dialog_close1(){
|
|
|
+ //内容重置
|
|
|
+ this.resultFormDetailShow1 = false
|
|
|
+ },
|
|
|
+
|
|
|
+ result_detail_dialog_close2(){
|
|
|
+ //内容重置
|
|
|
+ this.resultFormDetailShow2 = false
|
|
|
+ },
|
|
|
|
|
|
result_dialog_close1(){
|
|
|
//内容重置
|
|
|
@@ -2513,13 +2650,13 @@
|
|
|
if(value.length == 2){
|
|
|
var nodesInfo = this.$refs['treeCas1'].getCheckedNodes()
|
|
|
console.log(nodesInfo)
|
|
|
- var click_node = {"label":nodesInfo[0].data.label,"value":nodesInfo[0].data.value}
|
|
|
+ var click_node = {"name":nodesInfo[0].data.name,"id":nodesInfo[0].data.id}
|
|
|
|
|
|
- var click_value = nodesInfo[0].data.value
|
|
|
+ var click_value = nodesInfo[0].data.id
|
|
|
|
|
|
-
|
|
|
+
|
|
|
var isExist = me.userClickList1.filter(function(item){
|
|
|
- return item.value == click_value
|
|
|
+ return item.id == click_value
|
|
|
})
|
|
|
console.log('isExist',isExist)
|
|
|
|
