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

src/views/rangeManagement/feedClassification/index.vue

@@ -48,6 +48,11 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.number" type="textarea"
               :autosize="{ minRows: 1.3, maxRows: 4}" style="width:95%;padding:10px 0;" maxlength="32" />
           </template>
+        </el-table-column>
+        <el-table-column label="来源" min-width="200px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.data_source }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="是否启用" min-width="110px" align="center">
           <template slot-scope="scope">

src/views/rangeManagement/feedTable/index.vue

@@ -20,7 +20,7 @@
           <li><a>跳转重量域</a><el-input v-model="table.parammaps.jump_weight" type="text" style="width: 245px;" /></li>
           <li>
             <a>跳转延时</a>
-            <el-select v-model="table.parammaps.jump_delay_id" filterable placeholder="跳转延时" class="filter-item" style="width: 245px;" clearable>
+            <el-select v-model="table.parammaps.jump_delay" filterable placeholder="跳转延时" class="filter-item" style="width: 245px;" clearable>
               <el-option v-for="item in jumpDelayList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </li>
@@ -81,9 +81,10 @@
         <u-table-column label="序号" align="center" width="50" fixed="left" prop="id" />
         <u-table-column label="饲料名称" min-width="80px" align="center" prop="name" fixed="left"/>
         <u-table-column label="饲料分类" min-width="80px" align="center" prop="category_name" fixed="left"/>
-        <u-table-column label="物料类型" min-width="90px" align="center" prop="material_type" />
+        <u-table-column label="物料类型" min-width="90px" align="center" prop="material_type_name" />
         <u-table-column label="唯一编码" min-width="80px" align="center" prop="unique_encode" />
         <u-table-column label="饲料来源" min-width="80px" align="center" prop="forage_source_name" />
+        <u-table-column label="来源归属" min-width="80px" align="center" prop="data_source" />
         <u-table-column label="计划类型" min-width="80px" align="center" prop="plan_type_name" />
         <u-table-column v-if="isInforvalue" label="小料秤" min-width="90px" align="center" prop="small_material_scale" />
         <u-table-column label="允许误差数(kg)" min-width="80px" align="center" prop="allow_error" />
@@ -201,8 +202,8 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="物料类型：" prop="material_type">
-                <el-select v-model="create.temp.material_type" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
+              <el-form-item label="物料类型：" prop="material_type_key">
+                <el-select v-model="create.temp.material_type_key" filterable placeholder="物料类型" class="filter-item" style="width: 100%;" @change="changeMaterialType">
                   <el-option v-for="item in materialtypeList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -877,7 +878,7 @@ export default {
         temp: {
           name: '',
           category_id: '',category_name: '',
-          material_type:'',
+          material_type_key:'',
           unique_encode: '',
           forage_source_id: 2,forage_source_name:'用户自定义',
           plan_type_id: 0,plan_type_name:'无',
@@ -895,12 +896,12 @@ export default {
           backup1: '',
           backup2: '',
           backup3: '',
-          material_type:''
+          material_type_name:''
         },
         rules: {
           name :[{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           category_id: [{ required: true, message: '必填', trigger: 'blur' }],
-          material_type: [{ required: true, message: '必填', trigger: 'blur' }],
+          material_type_key: [{ required: true, message: '必填', trigger: 'blur' }],
           unique_encode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           forage_source_id: [{ required: true, message: '必填', trigger: 'blur' }],
           plan_type_id: [{ required: true, message: '必填', trigger: 'blur' }],
@@ -1128,7 +1129,7 @@ export default {
         name: '',
         category_name:'',
         category_id: '',
-        material_type:'',
+        material_type_key:'',
         unique_encode:'',
         forage_source_id:2,forage_source_name:'用户自定义',
         plan_type_id: 0,plan_type_name:'无',
@@ -1159,6 +1160,9 @@ export default {
     // 饲料类型
     changeFeedList(item) {
       this.create.temp.category_name = this.feedTypeList.find(obj => obj.value === item).label
+    },
+    changeMaterialType(item) {
+      this.create.temp.material_type_name = this.materialtypeList.find(obj => obj.value === item).label
     },
     createData() {
       this.isokDisable = true
@@ -1208,13 +1212,13 @@ export default {
             "name": this.create.temp.name,
             "category_id": this.create.temp.category_id,
             "category_name": this.create.temp.category_name,
-            "material_type": this.create.temp.material_type,
+            "material_type_key": this.create.temp.material_type_key,
+            "material_type_name": this.create.temp.material_type_name,
             "unique_encode": this.create.temp.unique_encode,
             "forage_source_id": this.create.temp.forage_source_id,
             "forage_source_name": this.create.temp.forage_source_name,
             "plan_type_id": this.create.temp.plan_type_id,
             "plan_type_name": this.create.temp.plan_type_name,
-            "price": parseFloat(this.create.temp.price),
             "jump_delay": this.create.temp.jump_delay,
             "confirm_start": this.create.temp.confirm_start,
             "jmp": this.create.temp.jmp,
@@ -1307,13 +1311,13 @@ export default {
             "name": this.create.temp.name,
             "category_id": this.create.temp.category_id,
             "category_name": this.create.temp.category_name,
-            "material_type": this.create.temp.material_type,
+            "material_type_key": this.create.temp.material_type_key,
+            "material_type_name": this.create.temp.material_type_name,
             "unique_encode": this.create.temp.unique_encode,
             "forage_source_id": this.create.temp.forage_source_id,
             "forage_source_name": this.create.temp.forage_source_name,
             "plan_type_id": this.create.temp.plan_type_id,
             "plan_type_name": this.create.temp.plan_type_name,
-            "price": parseFloat(this.create.temp.price),
             "jump_delay": this.create.temp.jump_delay,
             "confirm_start": this.create.temp.confirm_start,
             "jmp": this.create.temp.jmp,

src/views/rangeManagement/livestockCategory/index.vue

@@ -45,6 +45,11 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.number" placeholder="1-32个字符" type="textarea"
               :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:0 10px;" />
           </template>
+        </el-table-column>
+        <el-table-column label="来源" min-width="200px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.data_source }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="是否启用" min-width="110px" align="center">
           <template slot-scope="scope">

src/views/rangeManagement/pastureList/index.vue

@@ -240,8 +240,8 @@ export default {
         data.is_show = this.table.parammaps.is_show
       }
       if(this.table.parammaps.inputDatetime !== null && this.table.parammaps.inputDatetime.length > 0){
-        data.created_start_time = this.table.parammaps.inputDatetime[0].getTime() / 1000
-        data.created_end_time = this.table.parammaps.inputDatetime[1].getTime()  / 1000 + 86400
+        data.start_time = this.table.parammaps.inputDatetime[0].getTime() / 1000
+        data.end_time = this.table.parammaps.inputDatetime[1].getTime()  / 1000 + 86400
       }
       postJson(url, data).then(response => {
         if (response.code == 200) {
@@ -268,8 +268,8 @@ export default {
       this.table.parammaps.manager_phone = ''
       this.table.parammaps.is_show = ''
       this.table.parammaps.inputDatetime = []
-      this.table.parammaps.created_start_time = ''
-      this.table.parammaps.created_end_time = ''
+      this.table.parammaps.start_time = ''
+      this.table.parammaps.end_time = ''
       this.table.page = 1
       this.getList()
     },

src/views/recipe/recipeList/index.vue

@@ -1483,7 +1483,7 @@ export default {
       }
       postJson(url, data).then(response => {
         if(response.code == 200){
-          this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()
         }
       })
@@ -1576,7 +1576,7 @@ export default {
       }
       postJson(url, data).then(response => {
         if(response.code == 200){
-          this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()
         }
       })
@@ -1602,7 +1602,7 @@ export default {
           if (response.code == 200) {
             this.$notify({
               title: '',
-              message: '成功',
+              message: '删除成功',
               type: 'success',
               duration: 2000
             })