Merge branch 'feature/routepage' of Epans/calf-feed-pc into develop

src/views/Login.vue

@@ -76,7 +76,7 @@ export default {
   data() {
     return {
       loginForm:{
-        user_name:"", //admin
+        user_name:"", //admin cyj
         password:""  //123456
  
       },

src/views/basicSettings/WorkOrderType2.vue

@@ -106,6 +106,7 @@ export default {
       //获取 - 表格数据 - 参数
       searchData:{
         name: "",
+        category_type:1,
         page: 1,  //页码
         page_size: 10,   //每页数量
         total:0,  //总页数

src/views/cowManagement/CowInfo.vue

@@ -310,7 +310,7 @@ export default {
       addFormRules:{
         barn_id: [ { required: true, message: '栏舍必选', trigger: 'change' },  ],
         calf_code: [ { required: true, message: '犊牛编号必填', trigger: 'blur' },  ],
-        ear_number: [ { 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: 'change' },  ],

src/views/workManagement/WorkTaskAssign3.vue

@@ -50,7 +50,7 @@
         </el-table-column>
         <el-table-column label="状态" min-width="150px" align="center">
           <template slot-scope="scope">
-            <span v-if = "scope.row.status == 0">未知</span>
+            <!-- <span v-if = "scope.row.status == 0">未知</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>
@@ -125,7 +125,7 @@
             <el-col :span="12">
               <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-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -246,7 +246,7 @@ export default {
         ],
 
       statusList:[
-        {id: 0, name: '未知'},
+        // {id: 0, name: '未知'},
         {id: 1, name: '未完成'},
         {id: 2, name: '已关闭'},
         {id: 3, name: '已完成'},
@@ -329,7 +329,8 @@ export default {
     //获取 下拉框
     get_select_list1(){
         var me = this
-        ajaxDataPost('/api/v1/ops/base_setting/category_table/list?page=1&page_size=1000', {}).then(e => {
+        
+        ajaxDataPost('/api/v1/ops/base_setting/category_table/list?page=1&page_size=1000', {category_type:1}).then(e => {
           console.log("工单下拉框1：",e)
           if(e.code == 200 ){
             me.typeList = e.data.list
@@ -543,8 +544,15 @@ export default {
         if (valid) {
           //发起请求
           var send_data = {
-              "name": me.addForm.name,
+              "work_order_category_id": me.addForm.work_order_category_id,
+              "user_id": me.addForm.user_id,
+              "user_phone": me.addForm.user_phone,
+              "remark": me.addForm.remark,
+              "barns": me.transDataChooseRight2,
+           
           }
+
+        
           console.log("弹窗参数：", send_data)
 
           //关闭弹窗
@@ -645,7 +653,7 @@ export default {
       console.log("更改人员Id",value)
       var item  = me.personList.find(obj => obj.id == value)
       console.log("更改人员当前的内容",item)
-      addForm.user_phone = item.phone
+      me.addForm.user_phone = item.phone
           
     },