Merge branch 'feature/ci-drone' of duanxiaoduan/tmr-group-admin into develop

.env.development

@@ -3,22 +3,16 @@ ENV = 'development'
 
 # base api
 # 测试线
-# VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
-
-
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
 
-
-
-# VUE_APP_BASE_API = 'http://tmrwatch.cn:8081/'
-
-
-
-# VUE_APP_BASE_API = 'http://lhpc81.kptyun.com/'
+VUE_APP_BASE_API1 = 'http://210.16.189.72:8081/'
+VUE_APP_BASE_API2 = 'http://210.16.189.72:8081/'
+VUE_APP_BASE_API3 = 'http://192.168.1.104:8081/'
+VUE_APP_BASE_API4 = 'http://192.168.1.70:8081/'
 
 
 #许义平本地
-VUE_APP_BASE_API = 'http://192.168.1.96:8000/'
+# VUE_APP_BASE_API = 'http://192.168.1.96:8000/'
 
 #=====
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

.env.production

@@ -4,10 +4,10 @@ ENV = 'production'
 # base api
 # 正式线
 # VUE_APP_BASE_API = ':8081/'
-VUE_APP_BASE_API = '/'
-# 测试线
-# VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
-#洋洋本地
-# VUE_APP_BASE_API = 'http://192.168.1.104:8081/'
-#本地
-# VUE_APP_BASE_API = 'http://192.168.1.55:8084/'
+# VUE_APP_BASE_API = '/'
+VUE_APP_BASE_API = 'http://192.168.1.70:8081/'
+VUE_APP_BASE_API1 = 'http://210.16.189.72:8081/'
+VUE_APP_BASE_API2 = 'http://210.16.189.72:8081/'
+VUE_APP_BASE_API3 = 'http://192.168.1.104:8081/'
+VUE_APP_BASE_API4 = 'http://210.16.189.72:8081/'
+

babel.config.js

@@ -1,6 +1,6 @@
 const prodPlugins=[]
 if(process.env.NODE_ENV === 'production'){
-  prodPlugins.push("transform-remove-console")
+  // prodPlugins.push("transform-remove-console")
 }
 module.exports = {
   presets: [

src/api/common.js

@@ -64,15 +64,6 @@ export function requestbyname(data, requestname) {
   })
 }
 
-export function GetDataByNameXlsx(data) {
-  return request({
-    url: '/authdata/GetDataByName',
-    method: 'post',
-    data,
-    responseType: 'blob'
-  })
-}
-
 export function GetDataByNames(data) {
   return request({
     url: '/authdata/GetDataByNames',
@@ -88,40 +79,16 @@ export function PostDataByName(data) {
     data
   })
 }
-export function GetUpkeepPlan(data) {
-  return request({
-    url: '/authdata/GetUpkeepPlan',
-    method: 'post',
-    data
-  })
-}
-export function GetAccount(data) {
-  return request({
-    url: '/authdata/GetAccount',
-    method: 'post',
-    timeout: 600000,
-    data
-  })
-}
-
 
 export function postJson(url,data) {
-  return request({
-    url: process.env.VUE_APP_BASE_API + url,
-    method: 'post',
-    timeout: 600000,
-    data
-  })
-}
-
-export function postJson2(url,data) {
   return request({
     url: url,
     method: 'post',
     timeout: 600000,
     data
   })
-}
+}
+
 export function postJson3(url,data) {
   return request({
     url: url,
@@ -161,14 +128,14 @@ export function importFile(url,data,configHeaders) {
   })
 }
 
-export function getData(url,data) {
-  return request({
-    url: url,
-    method: 'post',
-    timeout: 600000,
-    data
-  })
-}
+// export function getData(url,data) {
+//   return request({
+//     url: url,
+//     method: 'post',
+//     timeout: 600000,
+//     data
+//   })
+// }
 
 export function PostDataByNames(data) {
   return request({

src/api/user.js

@@ -18,7 +18,7 @@ export function getInfo() { // token
 
 export function logout() {
   return request({
-    url: '/authdata/logout',
+    url: '/api/v1/system/user/logout',
     method: 'post'
   })
 }

src/utils/request.js

@@ -6,8 +6,12 @@ import { getToken } from '@/utils/auth'
 //获取当前url
 
 var aa = process.env.VUE_APP_BASE_API
+console.log(process.env.VUE_APP_BASE_API)
+console.log(process.env.VUE_APP_BASE_API1)
+console.log(process.env.VUE_APP_BASE_API2)
+console.log(process.env.VUE_APP_BASE_API3)
+console.log(process.env.VUE_APP_BASE_API4)
 //获取当前url
-
 if(aa.indexOf('/')==0 && aa.length==1){
   aa= window.location.protocol + "//"+window.location.host+aa
 }
@@ -31,7 +35,6 @@ service.interceptors.request.use(
         config.headers['X-Token'] = getToken()
       } else {
         config.headers['Authorization'] = 'Bearer ' + getToken()
-
       }
     }
     return config
@@ -64,7 +67,7 @@ service.interceptors.response.use(
       console.log(response.errors,'res')
       // return
       // Message({ message: '操作失败1', type: 'error', duration: 5 * 1000 })
-      if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
+      if (res.code === 10000 || res.code === 50012 || res.code === 50014) {
         MessageBox.confirm('你已经注销登陆,你可以取消或重新登陆', '确认注销', {
           confirmButtonText: '重新登陆',
           cancelButtonText: '取消',

src/views/console/menu/index.vue

@@ -392,11 +392,6 @@ export default {
             this.getList()
           }
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
       })
     }
   }

src/views/dashboard/index.vue

@@ -121,7 +121,7 @@
             <div class="abnormal_t_l">
               <h4>
                 <span class="title"></span>
-                异常撒料时间统计
+                撒料时间统计分析
                 <el-tooltip class="item" effect="dark" placement="top-start">
                   <div slot="content">
                      按时间段统计各牧场配方的每个班次之间<br/>
@@ -210,15 +210,18 @@
     data() {
       return {
         accuracy: {
-          value1: '',
-          value2: '',
-          inputDatetime: [],
+          value1: 1,
+          value2: 1,
+          inputDatetime: [new Date(), new Date()],
           cattleTpyeList: [{
             value: 1,
             label: '泌乳牛'
           }],
           formulaList: [{
             value: 1,
+            label: '所有配方'
+          },{
+            value: 2,
             label: '配方1'
           }],
           activeName: 'first',
@@ -272,15 +275,18 @@
           },
         },
         time: {
-          value1: '',
-          value2: '',
-          inputDatetime: [],
+          value1: 1,
+          value2: 1,
+          inputDatetime: [new Date(), new Date()],
           cattleTpyeList: [{
             value: 1,
             label: '泌乳牛'
           }],
           formulaList: [{
             value: 1,
+            label: '所有配方'
+          },{
+            value: 2,
             label: '配方1'
           }],
           chart1: {
@@ -347,7 +353,7 @@
       }
     },
     created() {
-
+      // accuracy.inputDatetime
     },
     mounted() {
       if(this.accuracy.chart1.isChart){

src/views/rangeManagement/feedClassification/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-select v-model="table.parammaps.bigfeedclassname" filterable placeholder="饲料大类" class="filter-item"
+      <el-select v-model="table.parammaps.parent_name" filterable placeholder="饲料大类" class="filter-item"
         style="width: 120px;" clearable>
         <el-option v-for="item in feedCategoryList" :key="item.value" :label="item.label" :value="item.label" />
       </el-select>
-      <el-input v-model="table.parammaps.fcname" placeholder="饲料分类名称" style="width: 180px;" class="filter-item"
+      <el-input v-model="table.parammaps.name" placeholder="饲料分类名称" style="width: 180px;" class="filter-item"
         clearable />
-      <el-input v-model="table.parammaps.fccode" placeholder="饲料分类编号" style="width: 180px;" class="filter-item"
+      <el-input v-model="table.parammaps.number" placeholder="饲料分类编号" style="width: 180px;" class="filter-item"
         clearable />
-      <el-select v-model="table.parammaps.enable" filterable placeholder="是否启用" class="filter-item"
+      <el-select v-model="table.parammaps.is_show" filterable placeholder="是否启用" class="filter-item"
         style="width: 120px;" clearable>
-        <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.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
@@ -101,13 +101,9 @@
           total: 0,
           listLoading: true,
           parammaps: {
+            parent_name: '',
             name: '',
-            manager_user: '',
-            manager_phone: '',
-            is_show: '',
-            inputDatetime: [],
-            end_time: '',
-            start_time: ''
+            number: ''
           },
           temp: {}
         },
@@ -149,9 +145,9 @@
         let page_size = this.table.page_size
         let url = 'api/v1/ops/forage/category/list' + '?page=' + page + '&page_size=' + page_size
         let data = {
-          "name": this.table.parammaps.name,
           "parent_name": this.table.parammaps.parent_name,
-          "number": this.table.parammaps.number,
+          "name": this.table.parammaps.name,
+          "number": this.table.parammaps.number
         }
         if (this.table.parammaps.is_show !== '') {
           data.is_show = this.table.parammaps.is_show
@@ -481,11 +477,6 @@
               this.getList()
             }
           })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
         })
       },
       handleSelectionChange(val) {

src/views/rangeManagement/feedTable/index.vue

@@ -37,14 +37,14 @@
     </div>
     <div class="operation" ref="operation">
       <el-button v-if="isAdd" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button class="success" icon="el-icon-plus" @click="handleGetSapCode">获取SAP编码</el-button>
+      <!-- <el-button class="success" icon="el-icon-plus" @click="handleGetSapCode">获取SAP编码</el-button> -->
       <el-button v-if="isDelete" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
-      <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">饲料库</el-button>
-      <el-button v-if="isOrder" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
+      <!-- <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">饲料库</el-button> -->
+     <!-- <el-button v-if="isOrder" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
        <div v-else style="display: inline-block;">
         <el-button icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
         <el-button icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
-      </div>
+      </div> -->
       <el-upload style="float: right;" action="#" :http-request="httpRequest" :show-file-list="false" :on-change="handleChange" :before-upload="beforeAvatarUpload" multiple accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
         <el-button v-if="isImport" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -109,10 +109,10 @@
         </u-table-column>
         <u-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleNutritive (row)">营养价值</a>
+            <!-- <a class="correcting" @click="handleNutritive (row)">营养价值</a>
             <span class="centerSpan">|</span>
             <a class="correcting" @click="handleRelation(row)">关联</a>
-            <span class="centerSpan">|</span>
+            <span class="centerSpan">|</span> -->
             <el-button v-if="isEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
             <span v-if="isDelete" class="centerSpan">|</span>
             <el-button v-if="isDelete" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(row)" />
@@ -830,7 +830,7 @@ export default {
         total: 0,
         listLoading: true,
         parammaps: {
-          name: '',employee_name:'',is_show:'',inputDatetime:[]
+         name:'',category_id:'',forage_source_id:'',is_show:'',allow_error:'',jump_weight:'',jump_delay_id:''
         }
       },
       // 多项搜索显示隐藏
@@ -954,12 +954,23 @@ export default {
       let page_size = this.table.page_size
       let url = 'api/v1/ops/forage/list' + '?page=' + page + '&page_size=' + page_size
       let data = {
-        "name":this.table.parammaps.name,
-        "employee_name":this.table.parammaps.employee_name
+        "name":this.table.parammaps.name
       }
       if(this.table.parammaps.is_show !== ''){
         data.is_show = this.table.parammaps.is_show
       }
+      if(this.table.parammaps.category_id !== ''){
+        data.category_id = this.table.parammaps.category_id
+      }
+      if(this.table.parammaps.forage_source_id !== ''){
+        data.forage_source_id = this.table.parammaps.forage_source_id
+      }
+      if(this.table.parammaps.jump_delay_id !== ''){
+        data.jump_delay_id = this.table.parammaps.jump_delay_id
+      }
+      if(this.table.parammaps.allow_error !== ''){
+        data.allow_error = this.table.parammaps.allow_error
+      }
       postJson(url, data).then(response => {
         if (response.code == 200) {
           this.table.list = response.data.list
@@ -1198,6 +1209,9 @@ export default {
       this.dialogFull = false
       this.create.dialogFormVisible = true
       this.create.temp = Object.assign({}, row)
+      if(this.create.temp.package_weight == 0){
+        this.create.temp.package_weight = ''
+      }
       this.create.temp.plan_type_name = this.planTypeList.find(obj => obj.value === row.plan_type_id).label
       this.create.temp.forage_source_name = this.feedSourcesList.find(obj => obj.value === row.forage_source_id).label
       this.create.temp.category_name = this.feedTypeList.find(obj => obj.value === row.category_id).label
@@ -1306,8 +1320,6 @@ export default {
               this.getList()
             }
           })
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
       })
     },
     handleSelectionChange(val) {
@@ -1337,8 +1349,6 @@ export default {
               this.getList()
             }
           })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消删除' })
         })
       }
     },

src/views/rangeManagement/livestockCategory/index.vue

@@ -8,7 +8,7 @@
       <el-input v-model="table.parammaps.name" placeholder="牲畜类别" style="width: 180px;" class="filter-item" clearable />
       <el-select v-model="table.parammaps.is_show" placeholder="是否启用" class="filter-item" style="width: 120px;"
         clearable>
-        <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.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
@@ -420,11 +420,6 @@
               this.getList()
             }
           })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
         })
       },
       handleSelectionChange(val) {

src/views/rangeManagement/pastureList/index.vue

@@ -6,7 +6,7 @@
       <el-input v-model="table.parammaps.manager_phone" placeholder="请输入手机号" style="width: 180px;" class="filter-item" clearable />
       <el-date-picker v-model="table.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
       <el-select v-model="table.parammaps.is_show" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
-        <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.value" :label="item.label" :value="item.value" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
@@ -212,7 +212,9 @@ export default {
       let page_size = this.table.page_size
       let url = 'api/v1/ops/pasture/list' + '?page=' + page + '&page_size=' + page_size
       let data = {
-        "name":this.table.parammaps.name
+        "name":this.table.parammaps.name,
+        "manager_user":this.table.parammaps.manager_user,
+        "manager_phone":this.table.parammaps.manager_phone
       }
       if(this.table.parammaps.is_show !== ''){
         data.is_show = this.table.parammaps.is_show
@@ -252,7 +254,7 @@ export default {
       this.getList()
     },
     handleEnableChange(index, row) {
-      let url = 'api/v1/system/pasture/is_show'
+      let url = 'api/v1/ops/pasture/is_show'
       let data = {
         "user_id":row.id,
         "is_show":row.is_show
@@ -366,8 +368,6 @@ export default {
             this.getList()
           }
         })
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
       })
     },
     handleResetPassword(row) {

src/views/systemManagement/boardEchartManagement2/index.vue

@@ -823,8 +823,6 @@ export default {
             this.getList()
           }
         })
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
       })
     },
     handleRowDelete2(row) {
@@ -857,8 +855,6 @@ export default {
                 this.getList2()
               }
             })
-          }).catch(() => {
-            this.$message({ type: 'info', message: '已取消删除' })
           })
         } else {
           this.requestParam.name = 'deleteChart'

src/views/systemManagement/role/index.vue

@@ -33,19 +33,19 @@
     <el-dialog :title="textMap[edit.dialogStatus]" :visible.sync="edit.dialogFormVisible" :close-on-click-modal="false"
       width="50%">
       <div class="edit">
-        <el-form ref="editTemp" :rules="rules" :model="edit.temp" label-position="right" label-width="115px"
+        <el-form ref="editTemp" :rules="rules" :model="edit" label-position="right" label-width="115px"
           style="width: 100%;margin:0 auto 30px">
           <el-row>
             <el-col :span="12">
               <el-form-item label="角色名称:" prop="name">
-                <el-input ref="name" v-model="edit.temp.name" placeholder="请输入角色名称" />
+                <el-input ref="name" v-model="edit.name" placeholder="请输入角色名称" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="描述:" prop="remarks">
-                <el-input ref="remarks" v-model="edit.temp.remarks" placeholder="请输入描述" />
+                <el-input ref="remarks" v-model="edit.remarks" placeholder="请输入描述" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -117,9 +117,17 @@
   export default {
     name: 'Role',
     components: {
-      Pagination,TreeSelect
+      Pagination,TreeSelect
     },
-    data() {
+    data() {
+      var validatePass = (rule, value, callback) => {
+        let arr = this.$refs.backgroundTree.getCheckedKeys() // 在此获取选中的树形数据
+        if (arr.length == 0 || !arr) {
+          callback(new Error("请至少选择一个后台权限"));
+        } else {
+          callback();
+        }
+      };
       return {
         table: {
           page: 1,
@@ -135,10 +143,8 @@
         edit: {
           dialogStatus: '',
           dialogFormVisible: false,
-          temp: {
-            name:'',
-            remarks:''
-          },
+          name:'',
+          remarks:'',
           // 牧场
           pastureOptions: [],
           checkAllPasture: false,
@@ -171,12 +177,13 @@
             required: true,
             message: '必填',
             trigger: 'blur'
-          }],
-          remarks: [{
-            required: true,
-            message: '必填',
-            trigger: 'blur'
-          }]
+          }],
+          checkedPasture: [
+            { type: 'array', required: true, message: '请至少选择一个牧场', trigger: 'change' }
+          ],
+          backgroundData: [
+            { type: 'array',validator: validatePass, required: true, trigger: 'change' }
+          ],
         },
         textMap: {
           add: '新增',
@@ -195,7 +202,7 @@
     },
 
     created() {
-       this.getButton()
+      this.getButton()
       this.getList()
       this.getPastureList()
       this.getBackgroundList()
@@ -210,12 +217,15 @@
         const del = 'systemManagement:role:delete'
         this.isDelete = checkButtons(del)
       },
-      getList() {
+      getList() {
+        // console.log(process.env.VUE_APP_BASE_API)
         this.table.listLoading = true
         let page = this.table.page
         let page_size = this.table.page_size
-        let url = 'api/v1/system/role/list' + '?page=' + page + '&page_size=' + page_size
-        let data = {}
+        let url = 'api/v1/system/role/list' + '?page=' + page + '&page_size=' + page_size
+        let data = {
+          name: this.table.parammaps.name
+        }
         postJson(url, data).then(response => {
           if (response.code == 200) {
             this.table.list = response.data.list
@@ -248,13 +258,20 @@
         this.edit.dialogStatus = 'add'
         this.edit.dialogFormVisible = true
         this.edit.isIndeterminatePasture = false
-        this.edit.temp.name = ''
-        this.edit.temp.remarks = ''
-        this.edit.checkedPasture = []
+        this.edit.name = ''
+        this.edit.remarks = ''
+        this.edit.checkedPasture = []
+        var myId = ''
+        this.edit.mobileData.forEach(item => {
+          if(item.name == '我的'){
+            myId = item.id
+          }
+        })
         this.$nextTick(() => {
           this.$refs.backgroundTree.setCheckedKeys([]);
-          this.$refs.mobileTree.setCheckedKeys([]);
-        });
+          this.$refs.mobileTree.setCheckedKeys([myId]);
+        });
+        // this.edit.mobileCheckedkeys = [4]
         this.edit.backgroundLength = 0
         this.edit.mobileLength = 0
         this.edit.isIndeterminatePasture = false
@@ -366,14 +383,13 @@
             }, 1000)
             let url = 'api/v1/system/role/add'
             let data = {
-              'name': this.edit.temp.name,
-              "remarks": this.edit.temp.remarks,
+              'name': this.edit.name,
+              "remarks": this.edit.remarks,
               "pasture_id": this.edit.checkedPasture,
               "menu_id": this.$refs.backgroundTree.getCheckedKeys().concat(this.edit.backgroundParentId),
               "mobile_id": this.$refs.mobileTree.getCheckedKeys(),
               "create_user": Cookies.get('username')
             }
-            console.log(data)
             postJson(url, data).then(response => {
               if (response.code == 200) {
                 this.$notify({
@@ -392,7 +408,9 @@
 
       handleUpdate(row) {
         this.edit.dialogStatus = 'update'
-        this.edit.temp = Object.assign({}, row)
+        this.edit.id = row.id
+        this.edit.name = row.name
+        this.edit.remarks = row.remarks
         this.edit.checkedPasture = []
         this.edit.backgroundCheckedkeys = []
         this.edit.mobileCheckedkeys = []
@@ -402,7 +420,7 @@
       },
       getRolesList() {
         let url = 'api/v1/system/role/permissions/'
-        let data = this.edit.temp.id
+        let data = this.edit.id
         getJson(url, data).then(response => {
           if (response.code == 200) {
             var menu_list = response.data.menu_list; //后台权限
@@ -461,9 +479,9 @@
             }, 1000)
             let url = 'api/v1/system/role/edit'
             let data = {
-              "id": this.edit.temp.id,
-              'name': this.edit.temp.name,
-              "remarks": this.edit.temp.remarks,
+              "id": this.edit.id,
+              'name': this.edit.name,
+              "remarks": this.edit.remarks,
               "pasture_id": this.edit.checkedPasture,
               "menu_id": menu_id_list,
               "mobile_id": mobile_id_list,
@@ -505,11 +523,6 @@
               this.getList()
             }
           })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
         })
       }
     }

src/views/systemManagement/user/index.vue

@@ -58,32 +58,32 @@
       width="50%">
       <div class="edit">
         <div class="content">
-          <el-form ref="editTemp" :rules="rules" :model="edit.temp" label-position="right" label-width="115px"
+          <el-form ref="editTemp" :rules="rules" :model="edit" label-position="right" label-width="115px"
             style="width: 90%;margin:0 auto 30px">
             <el-row>
               <el-col :span="12">
                 <el-form-item label="用户名称:" prop="name">
-                  <el-input ref="name" v-model="edit.temp.name" placeholder="请输入用户名称" />
+                  <el-input ref="name" v-model="edit.name" placeholder="请输入用户名称" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
                 <el-form-item label="员工姓名:" prop="employee_name">
-                  <el-input ref="employee_name" v-model="edit.temp.employee_name" placeholder="请输入员工姓名" />
+                  <el-input ref="employee_name" v-model="edit.employee_name" placeholder="请输入员工姓名" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="12">
                 <el-form-item label="手机号:" prop="phone">
-                  <el-input ref="phone" v-model="edit.temp.phone" placeholder="请输入手机号" />
+                  <el-input ref="phone" v-model="edit.phone" placeholder="请输入手机号" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="选择角色:" prop="remarks">
+                <el-form-item label="选择角色:" prop="checkedRole">
                   <el-checkbox :indeterminate="edit.isIndeterminateRole" v-model="edit.checkAllRole"
                     @change="handleRoleCheckAllChange">全选</el-checkbox>
                   <el-checkbox-group v-model="edit.checkedRole" @change="handleCheckedRoleChange">
@@ -94,7 +94,7 @@
               </el-col>
             </el-row>
             <el-form-item label="是否启用" prop="is_show">
-              <el-switch ref="is_show" v-model="edit.temp.is_show" :disabled="edit.dialogStatus=='update'" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="2" />
+              <el-switch ref="is_show" v-model="edit.is_show" :disabled="edit.dialogStatus=='update'" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="2" />
             </el-form-item>
           </el-form>
         </div>
@@ -139,10 +139,11 @@ export default {
         dialogStatus: '',
         dialogFormVisible: false,
         temp: {
-          name:'',
-          employee_name:'',
-          phone:''
+
         },
+        name:'',
+        employee_name:'',
+        phone:'',
         // 牧场
         roleOptions: [],
         checkAllRole: false,
@@ -162,6 +163,9 @@ export default {
           trigger: 'blur'
         }],
         phone: [{ validator: validatePhone,required: true, trigger: 'blur' }],
+        checkedRole: [
+          { type: 'array', required: true, message: '请至少选择一个角色', trigger: 'change' }
+        ],
       },
       textMap: {
         add: '新增',
@@ -273,10 +277,10 @@ export default {
     },
 
     handleCreate() {
-      this.edit.temp.name = '',
-      this.edit.temp.employee_name = ''
-      this.edit.temp.phone = ''
-      this.edit.temp.is_show = 1
+      this.edit.name = '',
+      this.edit.employee_name = ''
+      this.edit.phone = ''
+      this.edit.is_show = 1
       this.edit.dialogStatus = 'add'
       this.edit.dialogFormVisible = true
       this.edit.isIndeterminateRole = false
@@ -312,10 +316,10 @@ export default {
           }
           let url = 'api/v1/system/user/add'
           let data = {
-            'name': this.edit.temp.name,
-            "employee_name": this.edit.temp.employee_name,
-            "phone": this.edit.temp.phone,
-            "is_show": this.edit.temp.is_show,
+            'name': this.edit.name,
+            "employee_name": this.edit.employee_name,
+            "phone": this.edit.phone,
+            "is_show": this.edit.is_show,
             "roles": roles,
             "create_user": Cookies.get('username')
           }
@@ -342,12 +346,12 @@ export default {
       let data = row.id
       getJson(url, data).then(response => {
         if (response.code == 200) {
-          this.edit.temp.name = response.data.name
-          this.edit.temp.employee_name = response.data.employee_name
-          this.edit.temp.phone = response.data.phone
-          this.edit.temp.is_show = response.data.is_show
+          this.edit.name = response.data.name
+          this.edit.employee_name = response.data.employee_name
+          this.edit.phone = response.data.phone
+          this.edit.is_show = response.data.is_show
           this.edit.checkedRole = response.data.role_ids
-          this.edit.temp.id = response.data.id
+          this.edit.id = response.data.id
         }
         if (this.edit.checkedRole.length == this.edit.roleList.length) {
           this.edit.isIndeterminateRole = false
@@ -380,11 +384,11 @@ export default {
           }
           let url = 'api/v1/system/user/edit'
           let data = {
-            "id":this.edit.temp.id,
-            'name': this.edit.temp.name,
-            "employee_name": this.edit.temp.employee_name,
-            "phone": this.edit.temp.phone,
-            "is_show": this.edit.temp.is_show,
+            "id":this.edit.id,
+            'name': this.edit.name,
+            "employee_name": this.edit.employee_name,
+            "phone": this.edit.phone,
+            "is_show": this.edit.is_show,
             "roles": roles,
             "create_user": Cookies.get('username')
           }
@@ -425,11 +429,6 @@ export default {
             this.getList()
           }
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
       })
     },