部分增加新参数

src/views/Login.vue

@@ -76,8 +76,8 @@ export default {
   data() {
     return {
       loginForm:{
-        user_name:"", //admin
-        password:""  //123456
+        user_name:"admin", //admin
+        password:"123456"  //123456
  
       },
       //表单验证规则

src/views/basicSettings/FeedCarManagement.vue

@@ -74,7 +74,7 @@
       <div class="">
         <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:50%;margin:0 auto 50px">
             <el-form-item label="饲喂车编号：" prop="number">
-                <el-input   v-model="addForm.number"  ></el-input>
+                <el-input   v-model="addForm.number" :disabled="addFormStatus=='edit'"  ></el-input>
             </el-form-item>
             <el-form-item label="饲喂车名称：" prop="name">
                 <el-input   v-model="addForm.name"  ></el-input>

src/views/cowManagement/CowInfo.vue

@@ -49,6 +49,11 @@
             <span>{{ scope.row.calf_code }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="耳号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ear_number }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="栏舍" min-width="150px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.barn_name }}</span>
@@ -108,11 +113,11 @@
         </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>
-            <span v-if="scope.row.status == 5">淘汰</span>
+            <span v-if="scope.row.status == 1" style="color:#67c23a;font-weight:bold">健康</span>
+            <span v-if="scope.row.status == 2" style="color:#ff9100;font-weight:bold">疾病</span>
+            <span v-if="scope.row.status == 3" style="color:#dec40d;font-weight:bold">出栏</span>
+            <span v-if="scope.row.status == 4" style="color:#ff0000;font-weight:bold">死亡</span>
+            <span v-if="scope.row.status == 5" style="color:#fa00ff;font-weight:bold">淘汰</span>
           </template>
         </el-table-column>
 
@@ -141,8 +146,14 @@
               </el-select>
             </el-form-item> 
             <el-form-item label="犊牛编号：" prop="calf_code">
-                <el-input   v-model="addForm.calf_code"  placeholder=""  ></el-input>  
+                <el-input   v-model="addForm.calf_code"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
+            </el-form-item>
+            <el-form-item label="耳号：" prop="ear_number">
+                <el-input   v-model="addForm.ear_number"  placeholder=""   :disabled="addFormStatus=='edit'"></el-input>  
             </el-form-item>
+
+            
+
             <el-form-item label="犊牛类型：" prop="calf_category_id">
               <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择"   style="width: 100%;" >
                 <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
@@ -293,15 +304,16 @@ export default {
       addFormStatus: '',
       addFormTxt: {  edit: '修改',  create: '新增' },
       addForm:{
-        barn_id:undefined,calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
+        barn_id:undefined,ear_number:'',calf_code:'',calf_category_id:undefined, id:undefined, birth_date_format: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),genders:undefined, birth_weight:undefined, current_weight:undefined, mother_code:'',remark:'',
       },
 
       addFormRules:{
-        barn_id: [ { required: true, message: '栏舍必选', trigger: 'blur' },  ],
+        barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
         calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
-        calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'blur' },  ],
+        ear_number: [ { required: true, message: '耳号必填', trigger: 'blur' },  ],
+        calf_category_id: [ { required: true, message: '犊牛类型必选', trigger: 'change' },  ],
         birth_date_format: [ { required: true, message: '出生日期必填', trigger: 'blur' },  ],
-        genders: [ { required: true, message: '性别必选', trigger: 'blur' },  ],
+        genders: [ { required: true, message: '性别必选', trigger: 'change' },  ],
         birth_weight: [ { required: true, message: '出生体重必填', trigger: 'blur' },  ],
         current_weight: [ { required: true, message: '当前体重必填', trigger: 'blur' },  ],
         mother_code: [ { required: true, message: '母号必填', trigger: 'blur' },  ],
@@ -481,6 +493,7 @@ export default {
     //清空弹窗表单信息
     reset_form(){
       this.addForm.calf_code = ''
+      this.addForm.ear_number = ''
       this.addForm.name = ''
       this.addForm.barn_id = undefined
       this.addForm.calf_category_id = undefined
@@ -542,6 +555,8 @@ export default {
           var send_data = {
               "barn_id": me.addForm.barn_id,
               "calf_code": me.addForm.calf_code,
+              "ear_number": me.addForm.ear_number,
+              
               "calf_category_id": me.addForm.calf_category_id,
               "birth_weight": parseFloat(me.addForm.birth_weight) ,
               "genders": me.addForm.genders,
@@ -590,6 +605,7 @@ export default {
               "id": me.addForm.id,
               "barn_id": me.addForm.barn_id,
               "calf_code": me.addForm.calf_code,
+              "ear_number": me.addForm.ear_number,
               "calf_category_id": me.addForm.calf_category_id,
               "birth_weight": parseFloat(me.addForm.birth_weight) ,
               "genders": me.addForm.genders,

src/views/cowShedManagement/CowCowShed.vue

@@ -45,12 +45,20 @@
         </el-table-column>
         <el-table-column label="栏舍状态" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.status }}</span>
+            <span v-if ="scope.row.status == 1">正常</span>
+            <span v-if ="scope.row.status == 2">空栏</span>
+            <span v-if ="scope.row.status == 3">损坏</span>
+ 
           </template>
         </el-table-column>
+   
         <el-table-column label="犊牛状态" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.number }}</span>
+            <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>
+            <span v-if="scope.row.status == 5">淘汰</span>
           </template>
         </el-table-column>
  
@@ -77,7 +85,7 @@
             <el-form-item label="身份卡ID：" prop="number">
                 <el-input   v-model="addForm.number"  placeholder="用于加奶枪识别牛只信息及饲喂量"  ></el-input>  
             </el-form-item>
-            <el-form-item label="类型名称：" prop="name">
+            <el-form-item label="栏舍名称：" prop="name">
                 <el-input   v-model="addForm.name"    ></el-input>  
             </el-form-item>       
             <el-form-item label="栏舍组：" prop="barn_group_id">

src/views/cowShedManagement/CowShedGroup.vue

@@ -208,9 +208,9 @@ export default {
     get_select_list1(){
         var me = this
 
-        var send_url = me.url_get_select1 + '?page=1&page_size=1000'
+ 
 
-        ajaxDataPost(send_url, {name:"",barn_group_name:"",status:undefined}).then(e => {
+        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
           console.log("穿梭框1：",e)
 
           //打印请求成功结果

src/views/dataStatistics/FeedProcess.vue

@@ -120,6 +120,11 @@
                     <span>{{ scope.row.process_time  }}</span>
                   </template>
                 </el-table-column>
+                <el-table-column label="上报时间" min-width="120px" align="center" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.created_at_format  }}</span>
+                  </template>
+                </el-table-column>
 
       </el-table>
 

src/views/formulaPlan/FeedPlan.vue

@@ -160,8 +160,8 @@
                   </el-table-column>
                   <el-table-column label="犊牛数量" min-width="150px" align="center">
                     <template slot-scope="scope">
-                      <span v-if ="scope.row.status == 4">0</span>
-                      <span v-else>1</span>
+                      <span >{{scope.row.number}}</span>
+          
                     </template>
                   </el-table-column>
                 </el-table>
@@ -176,8 +176,12 @@
                     </template>
                   </el-table-column>
                   <el-table-column label="犊牛数量" min-width="150px" align="center">
+                    
                     <template slot-scope="scope">
-                      <span>{{ 1 }}</span>
+
+                      <span v-if ="scope.row.status == 4">0</span>
+                      <span v-else>1</span>
+                      <!-- <span>{{ 1 }}</span> -->
                     </template>
                   </el-table-column>
                 </el-table>
@@ -591,6 +595,7 @@ export default {
 
       this.addFormStatus = 'create'
       this.addFormShow = true
+
       this.$nextTick(() => {
         this.$refs['addFormRef'].clearValidate()
         this.$refs.multipleTable1.clearSelection()
@@ -625,11 +630,7 @@ export default {
 
  
      
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-        this.$refs.multipleTable1.clearSelection()
-         this.$refs.multipleTable2.clearSelection()
-      })
+      
 
 
     
@@ -648,50 +649,86 @@ export default {
 
       me.barnGroupIdsArr = barnGroupIdsArr
       me.barnIdsArr = barnIdsArr
-
+      me.addFormStatus = 'edit'
+      me.addFormShow = true
       
 
+
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+        // this.$refs.multipleTable1.clearSelection()
+        //  this.$refs.multipleTable2.clearSelection()
+      })
+      console.log('  me.barnGroupTableList==========',me.barnGroupTableList)
+      console.log('  barnGroupIdsArr==========',barnGroupIdsArr)    
        // 查询栏舍组下的所有栏舍数据
        if(barnGroupIdsArr.length > 0) {
-          this.$nextTick(() => {
+          me.$nextTick(() => {
 
-            for(let i = 0; i<me.barnGroupTableList.length;i++){
-              for(let j = 0; i<barnGroupIdsArr.length;i++){
-                if(me.barnGroupTableList[i].id == barnGroupIdsArr[i]){
-                  me.$refs['multipleTable1'].toggleRowSelection(me.barnGroupTableList[i])
+                for(let i = 0; i<me.barnGroupTableList.length;i++){
+                  for(let j = 0; i<barnGroupIdsArr.length;i++){
+                    if(me.barnGroupTableList[i].id == barnGroupIdsArr[i]){
+                      me.$refs['multipleTable1'].toggleRowSelection(me.barnGroupTableList[i])
+                    }
+                  }
                 }
-              }
-            }
+
+                ajaxDataPost('/api/v1/ops/barn/list/ids',{ids:barnGroupIdsArr}).then(e => {
+                    if(e.code === 200) {
+                      // me.barnTableList = e.data.list
+                      console.log('  me.barnTableList==========',me.barnTableList)
+
+                      setTimeout(() => {
+                        me.barnTableList = e.data.list
+
+                          for(let i = 0; i<me.barnTableList.length;i++){
+                              for(let j = 0; i< barnIdsArr.length;i++){
+                                if(me.barnTableList[i].id ==  barnIdsArr[i]){
+                                    me.$refs['multipleTable2'].toggleRowSelection(me.barnTableList[i])
+                                  
+                                    
+                                }
+                              }
+                          }
+
+                      }, 800)
+                      
+                       
+                       
+
+                        
+          
+                    }
+                })
+
+
         
           })
           
 
-          ajaxDataPost('/api/v1/ops/barn/list/ids',{ids:barnGroupIdsArr}).then(e => {
-            if(e.code === 200) {
-              me.barnTableList = e.data.list
-                for(let i = 0; i<me.barnTableList.length;i++){
-                    for(let j = 0; i< barnIdsArr.length;i++){
-                      if(me.barnTableList[i].id ==  barnIdsArr[i]){
-                        me.$refs['multipleTable2'].toggleRowSelection(me.barnTableList[i])
-                      }
-                    }
-                  }
-  
-            }
-          })
+          
+
+         
       }
 
      
-          
-      this.addFormStatus = 'edit'
-      this.addFormShow = true
+     
+      
      
     },
 
     //新增关闭
     add_dialog_close(){
        //内容重置
-       this.$refs['addFormRef'].resetFields()
+ 
+
+      var me = this
+      me.$nextTick(() => {
+        me.$refs['addFormRef'].clearValidate()
+        me.$refs.multipleTable1.clearSelection()
+        me.$refs.multipleTable2.clearSelection()
+      })
+
     },
 
     //新增 保存

src/views/workManagement/WorkTaskAssign2.vue

@@ -0,0 +1,595 @@
+<template>
+ 
+  <div>
+
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+          <el-input v-model="searchData.number" placeholder="工单编号"  style="width: 180px;" class="g-mr20 g-mb20" clearable />
+          <el-input v-model="searchData.user_name" placeholder="负责人"  style="width: 180px;" class="g-mr20" clearable />
+          <el-input v-model="searchData.user_phone" placeholder="负责人手机号"  style="width: 180px;" class="g-mr20" clearable />
+          <el-input v-model="searchData.operation_user" placeholder="派单人"  style="width: 180px;" class="g-mr20" clearable />
+          <el-input v-model="searchData.operation_phone" placeholder="派单人手机号"  style="width: 180px;" class="g-mr20" clearable />
+          <el-select v-model="searchData.work_order_category_id" filterable placeholder="类型" class="g-mr20" style="width: 180px;" clearable>
+            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+          <el-select v-model="searchData.status" filterable placeholder="状态" class="g-mr20" style="width: 180px;" clearable>
+            <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+
+          <el-date-picker v-model="searchData.inputDatetime1" class="g-mr20" type="daterange" range-separator="至" start-placeholder="完成时间" end-placeholder="完成时间" style="width: 250px;" />
+
+          <el-date-picker v-model="searchData.inputDatetime2" class="g-mr20" type="daterange" range-separator="至" start-placeholder="派单时间" end-placeholder="派单时间" style="width: 250px;" />
+        
+          
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <el-button type="primary"   @click="form_clear">重置</el-button>
+          <el-button type="primary"   v-if="isButtonEdit" @click="form_add">添加</el-button>
+           <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
+      </div>
+
+ 
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="工单编号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="状态" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="对象" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="任务" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="负责人" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="负责人手机号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派单人" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派单人手机号" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="派单时间" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="完成时间" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</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">
+             <!-- 修改按钮 -->
+             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+             <!-- 删除按钮 -->
+             <el-button type="danger" v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="form_delete(scope.row)">关闭工单</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+    </el-card>
+
+
+    <!-- 弹窗 新增or修改 -->
+    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+      <div class="">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="140px"  style="width:90%;margin:0 auto 50px">
+
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="工单类型：" prop="name">
+                <el-select  v-model="addForm.formula_id" filterable 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" filterable 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-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="工单任务：" prop="name">
+                <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>
+            </el-col>
+          </el-row>
+
+
+          <el-row :gutter="20">
+              <el-transfer  :titles="['栏舍名称(犊牛数量)', '栏舍名称(犊牛数量)']" v-model="transDataChooseRight" :data="transDataList" :props="{  key: 'id',   label: 'name'  }" @change="change_transData"></el-transfer>
+          </el-row>
+           
+            
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+          <el-button @click="addFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+ 
+    return {
+ 
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/work_order/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/work_order/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/work_order/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/work_order/close', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        number: "",
+        user_name: "",
+        user_phone: "",
+        operation_user: "",
+        operation_phone: "",
+        work_order_category_id: undefined,
+        status: 0,
+        start_finished_time: "",
+        end_finished_time: "",
+        start_created_time: "",
+        end_created_time: "",
+        inputDatetime1:"",
+        inputDatetime2:"",
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+          { username:"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' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      
+      typeList:[
+        
+      ],
+
+      statusList:[
+        {id: 0, name: '未知'},
+        {id: 1, name: '未完成'},
+        {id: 2, name: '已关闭'},
+        {id: 3, name: '已完成'},
+      ],
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+       //穿梭框右边的值
+       transDataChooseRight:[],
+      //穿梭框所有列表
+      transDataList:[
+        // {key:1,label:'组1',disabled:false},
+        // {key:2,label:'组2',disabled:false},
+        // {key:3,label:'组3',disabled:false},
+        // {key:4,label:'组4',disabled:false},
+        // {key:5,label:'组5',disabled:false},
+        // {key:6,label:'组6',disabled:false},
+        // {key:7,label:'组7',disabled:false},
+      ],
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+     //获取下拉框
+     this.get_select_list1()
+
+      //表格 - 初始化 
+     // this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost('/api/v1/ops/base_setting/category_table/list?page=1&page_size=1000', {}).then(e => {
+          console.log("工单下拉框1：",e)
+
+          //打印请求成功结果
+          
+          if(e.code == 200 ){
+           
+            me.typeList = e.data.list
+          } else {
+            me.typeList = []
+          }
+
+         
+  
+        })
+
+
+        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
+          console.log("穿梭框1：",e)
+
+          //打印请求成功结果
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.transDataList = []
+          } else {
+            me.transDataList = e.data.list
+          }
+
+        })
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果：",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败！' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      if (me.searchData.inputDatetime1 !== '' && me.searchData.inputDatetime1 !== null) {
+          me.searchData.min_operation_time = parseTime(me.searchData.inputDatetime1[0], '{y}-{m}-{d}')
+          me.searchData.max_operation_time = parseTime(me.searchData.inputDatetime1[1], '{y}-{m}-{d}')
+        } else {
+          me.searchData.inputDatetime1 = ''
+          me.searchData.min_operation_time = ''
+          me.searchData.max_operation_time = ''
+        }
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_table, send_data).then(e => {
+                console.log("新增结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '新增成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '新增失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          console.log("弹窗参数：", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功！'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败！' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数：", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果：",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败！' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+
+    //监听 - 穿梭框选到右边的值
+    change_transData(value){
+      console.log("穿梭框选到右边的值",value)
+    },
+ 
+    form_export() {
+    //获取请求表格数据的参数
+    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+    //请求表格
+    // GetDataByName(this.download.getdataListParm).then(response => {
+    //     if (response.data.list !== null) {
+    //       this.download.list = response.data.list
+    //     } else {
+    //       this.download.list = []
+    //     }
+    //     var excelDatas = [
+    //       {
+    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+    //         tableDatas: this.download.list,
+    //         sheetName: 'Sheet1'
+    //       }
+    //     ]
+    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    // })
+
+    var excelDatas = [
+        {
+            tHeader: ['表头1', '表头2', '表头3', '表头4',],
+            filterVal: ['title1', 'title2', 'title3', 'title4'],
+            tableDatas: [ 
+                {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+            ],
+            sheetName: 'Sheet1'
+        }
+    ]
+    json2excel(excelDatas, '表格大标题', true, 'xlsx')
+}
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped，则是仅在此组件里生效 -->
+<style scoped>
+.el-transfer /deep/.el-transfer-panel {  width:300px;  text-align: left;}
+</style>