Merge branch 'master' of http://kpt.kptyun.cn:3000/duanxiaoduan/tmr-admin

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -37,18 +37,21 @@
         <el-table-column :key="1" label="序号" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left" />
         <el-table-column label="栏舍名称" min-width="100px" align="center" class-name="small-padding fixed-width" fixed="left">
           <template slot-scope="scope">
-            <span>{{ scope.row.barname }}</span>
+        
+            <span v-if="scope.row.NoEdit">{{ scope.row.barname }}</span>
+            <el-input v-if="scope.row.Edit" v-model="scope.row.barname" style="width:95%;padding:10px 0;"   />
           </template>
         </el-table-column>
         <el-table-column :key="2" label="推料车名称" min-width="70px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.softccount }}</span>
+            <span v-if="scope.row.NoEdit">{{ scope.row.barname }}</span>
+            <el-input v-if="scope.row.Edit" v-model="scope.row.barname" style="width:95%;padding:10px 0;"   />
           </template>
         </el-table-column>
         <el-table-column :key="3" label="推料车编号" min-width="90px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccount }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.ccount" step="0.01" type="number" style="width:95%;padding:10px 0;"   />
+            <el-input v-if="scope.row.Edit" v-model="scope.row.ccount" style="width:95%;padding:10px 0;"   />
           </template>
         </el-table-column>
         <el-table-column :key="4" label="推料时间(每天)" min-width="85px" align="center">
@@ -70,6 +73,9 @@
             <el-button v-if="row.isUpdateSave && isRoleEdit" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
             <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+
+            <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+
           </template>
         </el-table-column>
       </el-table>
@@ -790,7 +796,29 @@ export default {
   
    
     
- 
+    // 删除
+    handleRowDelete(row) {
+      console.log('点击了行内删除')
+      MessageBox.confirm('是否确认删除此信息?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+        this.selectList = []
+        this.requestParam.name = 'deleteDungsieve'
+        this.requestParam.parammaps = {}
+        this.requestParam.parammaps.pastureid = row.pastureid
+        this.requestParam.parammaps.id = row.id
+        PostDataByName(this.requestParam).then(response => {
+          if (response.msg === 'fail') {
+            this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+          } else {
+            this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+            this.getList()
+          }
+        })
+      }).catch(() => {
+        this.$message({ type: 'info', message: '已取消删除' })
+      })
+    },
   
   
     // 应用

src/views/shedProduction/dungScores/index.vue

@@ -814,6 +814,7 @@ export default {
                     {
                       "name":"copyDungscore","type":"e",
                       "parammaps":{
+                        "id": "@insertSpotList.id",
                         "pastureid":"@insertSpotList.pastureid"
                       }
                     }

src/views/shedProduction/fecalScreen/index.vue

@@ -773,6 +773,7 @@ export default {
                     {
                       "name":"copyDungsieve","type":"e",
                       "parammaps":{
+                        "id": "@insertSpotList.id",
                         "pastureid":"@insertSpotList.pastureid"
                       }
                     }

src/views/shedProduction/formulaDryMatter/index.vue

@@ -774,6 +774,7 @@ export default {
                     {
                       "name":"copyFtdry","type":"e",
                       "parammaps":{
+                        "id": "@insertSpotList.id",
                         "pastureid":"@insertSpotList.pastureid"
                       }
                     }

src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -817,6 +817,7 @@ export default {
                     {
                       "name":"copyPennsieve","type":"e",
                       "parammaps":{
+                        "id": "@insertSpotList.id",
                         "pastureid":"@insertSpotList.pastureid"
                       }
                     }

src/views/shedProduction/physicalConditionScore/index.vue

@@ -842,6 +842,7 @@ export default {
                     {
                       "name":"copyBodyscore","type":"e",
                       "parammaps":{
+                        "id": "@insertSpotList.id",
                         "pastureid":"@insertSpotList.pastureid"
                       }
                     }