更新5-10

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -1112,10 +1112,10 @@ export default {
           this.history.list = response.data.list
           this.history.pageNum = response.data.pageNum
           this.history.pageSize = response.data.pageSize
-          this.history.total = response.data.total
         } else {
           this.history.list = []
         }
+        this.history.total = response.data.total
         setTimeout(() => {
           this.history.listLoading = false
         }, 100)

src/views/inventoryManagement/feedContract/index.vue

@@ -333,10 +333,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/inventoryList/index.vue

@@ -350,10 +350,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/inventoryList/index改.vue

@@ -350,10 +350,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/laborConsumption/index.vue

@@ -358,10 +358,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/laborConsumption/index改.vue

@@ -360,10 +360,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/statistics/index.vue

@@ -317,10 +317,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/systemConsumption/index.vue

@@ -230,10 +230,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/systemConsumption/index改.vue

@@ -236,10 +236,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)

src/views/inventoryManagement/warehousing/index.vue

@@ -10,7 +10,7 @@
       <el-select v-model="table.getdataListParm.parammaps.providerid" placeholder="供应商" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="入库状态" class="filter-item" style="width: 150px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="是否入库" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
@@ -102,8 +102,7 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-            <el-button v-if="row.islaid == '已入库'" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
-            <el-button v-if="row.islaid == '未入库'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button v-if="row.islaid == '否'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -339,7 +338,7 @@ export default {
       feedNameAddList: [], // 饲料名称新增
       supplierList: [], // 供应商
       contractNoList: [], // 合同编号
-      islaidList: [{ id: 0, name: '已入库' }, { id: 1, name: '未入库' }, { id: 2, name: '已撤销' }], // 是否入库
+      islaidList: [{ id: 0, name: '是' }, { id: 1, name: '否' }], // 是否入库
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getProviderListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
@@ -378,7 +377,8 @@ export default {
           laiddate: '', feedid: '', feedname: '', operateweight: '', providerid: '', providername: '', startweight: '', priceold: '', contractcode: '', pricenew: '', sumprice: '', grossweight: '', tareweight: '', licence: '', pcpde: '', createemp: '', createdate: '', remark: '', 'wagonnumber': ''
         },
         rules: {
-          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          operateweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           feedname: [{ type: 'string', required: true, message: '必填', trigger: 'change' }],
           pricenew: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
         },
@@ -529,10 +529,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)
@@ -1019,9 +1019,6 @@ export default {
         }
       })
     },
-    handleRevoke(row){
-      console.log('点击了撤销')
-    },
     handleSee(row) {
       console.log('点击了查看')
       this.$nextTick(() => {

src/views/inventoryManagement/warehousing/index备.vue → src/views/inventoryManagement/warehousing/index改.vue

@@ -10,7 +10,7 @@
       <el-select v-model="table.getdataListParm.parammaps.providerid" placeholder="供应商" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="是否入库" class="filter-item" style="width: 150px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="入库状态" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
@@ -102,7 +102,8 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-            <el-button v-if="row.islaid == '否'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button v-if="row.islaid == '已入库'" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
+            <el-button v-if="row.islaid == '未入库'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -124,134 +125,138 @@
         </div>
       </template>
       <div class="app-add">
-        <el-form ref="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 100%;margin:0 auto">
+        <h3>基础信息</h3>
+        <el-form ref="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="130px" style="width: 100%;margin:0 auto">
           <el-row>
-            <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">基础信息</h3>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="入库日期:" prop="laiddate">
-                <el-date-picker v-model="create.createTemp.laiddate" :disabled="create.dialogStatus=='see'" class="filter-item" type="date" placeholder="入库日期" :clearable="false" :picker-options="create.pickerOptions1" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="送货单编号:" prop="wagonnumber">
-                <el-input ref="wagonnumber" v-model="create.createTemp.wagonnumber" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="送货单编号" type="text" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="饲料名称:" prop="feedname">
-                <el-autocomplete
-                  v-model="create.createTemp.feedname"
-                  value-key="fname"
-                  class="inline-input"
-                  :fetch-suggestions="feedNameSearch"
-                  placeholder="请选择饲料名称"
-                  style="width:98%"
-                  :disabled="create.dialogStatus=='see' || create.dialogStatus=='update'"
-                  @select="handleSelectFeedName"
-                  @blur="blurFeedName"
-                >
-                  <template slot-scope="{ item }">
-                    <span>{{ item.fname }}</span>
-                  </template>
-                </el-autocomplete>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="入库重量(kg):" prop="operateweight">
-                <el-input ref="operateweight" v-model.trim="create.createTemp.operateweight" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="最多两位小数" type="number" :step="0.01" @blur="blurOperateweight" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="供应商:" prop="providerid">
-                <el-input v-if="create.dialogStatus=='see'" ref="providername" v-model.trim="create.createTemp.providername" disabled class="filter-item" placeholder="请选择供应商" />
-                <el-select v-else v-model="create.createTemp.providerid" clearable placeholder="请选择供应商" :disabled="create.dialogStatus=='see'" class="filter-item" style="width: 100%" @change="changeSupplier">
-                  <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="合同编号:" prop="contractcode">
-                <el-select v-model="create.createTemp.contractcode" clearable placeholder="请选择合同编号" :disabled="create.dialogStatus=='see'" class="filter-item" style="width: 100%" @change="changeContractNo">
-                  <el-option v-for="item in contractNoList" :key="item.id" :label="item.contractcodeCat" :value="item.contractcode" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">价格信息</h3>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="单价(元):" prop="pricenew">
-                <el-input ref="pricenew" v-model="create.createTemp.pricenew" :disabled="create.createTemp.contractcode !=='' || create.dialogStatus=='see'" class="filter-item" placeholder="最多两位小数" type="number" :step="0.01" @blur="blurPricenew" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="总价(元):" prop="sumprice">
-                <el-input ref="sumprice" v-model="create.createTemp.sumprice" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="最多两位小数" type="number" :step="0.01" @blur="blurSumprice" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">饲料信息</h3>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="毛重(kg):" prop="grossweight">
-                <el-input ref="grossweight" v-model.trim="create.createTemp.grossweight" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="最多两位小数" type="number" :step="0.01" @blur="blurGrossweight" />
+                <el-date-picker v-model="create.createTemp.laiddate" :disabled="create.dialogStatus=='see'" class="filter-item" type="date" placeholder="入库日期" :clearable="false"  style="width: 100%" :picker-options="create.pickerOptions1" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="皮重(kg):" prop="tareweight">
-                <el-input ref="tareweight" v-model.trim="create.createTemp.tareweight" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="最多两位小数" type="number" :step="0.01" @blur="blurTareweight" />
+            <el-col :span="6">
+              <el-form-item label="送货单号:" prop="wagonnumber">
+                <el-button class="successBorder">选择货单</el-button>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="许可证号:" prop="licence">
-                <el-input ref="licence" v-model="create.createTemp.licence" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="许可证号" type="text" />
+            <el-col :span="6">
+              <el-form-item label="创建人:" prop="feedname">
+                <span>{{create.createTemp.laiddate}}</span>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="批号:" prop="pcpde">
-                <el-input ref="pcpde" v-model="create.createTemp.pcpde" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="批号" type="text" />
+            <el-col :span="6">
+              <el-form-item label="创建日期:" prop="feedname">
+                <span>{{create.createTemp.laiddate}}</span>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">操作信息</h3>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="创建人:" prop="createemp">
-                <el-input ref="createemp" v-model="create.createTemp.createemp" class="filter-item" placeholder="创建人" type="text" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="创建日期:" prop="createdate">
-                <el-date-picker v-model="create.createTemp.createdate" class="filter-item" type="date" placeholder="创建日期" disabled />
-              </el-form-item>
+            <el-col :span="6">
+              <el-form-item label="规格:" prop="specifications">
+                <el-select v-model="create.createTemp.specifications" clearable placeholder="规格" :disabled="create.dialogStatus=='see'" class="filter-item" style="width: 100%" @change="changeSupplier">
+                  <el-option v-for="item in specificationsList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="备注:" prop="remark">
-                <el-input ref="remark" v-model="create.createTemp.remark" :disabled="create.dialogStatus=='see'" class="filter-item" placeholder="1-255字符" type="text" />
+            <el-col :span="6">
+              <el-form-item label="备注:" prop="providerid">
+                <el-input ref="providername" v-model="create.createTemp.providername" :disabled="create.dialogStatus=='see'"  type="textarea" class="filter-item" placeholder="备注" />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
+        <div class="feedTable" style="margint: 0 100px;border-top: 1px solid #000;">
+          <div class="feedBtn" style="height: 50px;">
+            <h3 style="float: left;">饲料信息</h3>
+            <el-button class="successBorder" icon="el-icon-plus" style="float: right;margin-top: 5px;" @click="handleIncreaseFeed">增加饲料</el-button>
+          </div>
+          <div class="feedTable">
+            <el-table
+              :key="create.table.tableKey"
+              v-loading="create.table.listLoading"
+              element-loading-text="给我一点时间"
+              :data="create.table.list"
+              border
+              fit
+              highlight-current-row
+              style="width: 100%;"
+              :row-style="rowStyle"
+              :cell-style="cellStyle"
+              class="elTable table-fixed"
+            >
+              <el-table-column label="饲料名称" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="毛重(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="皮重(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="入库重量(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="总价(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="单价(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="供应商(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="合同编号(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="许可证号(kg)" min-width="130px" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.NoEdit">{{ scope.row.drivercode }}</span>
+                  <el-input v-if="scope.row.Edit" v-model="scope.row.drivercode" style="width:95%;padding:10px 0;" />
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
+                <template slot-scope="{row}">
+                  <!-- 新增 -->
+                  <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createFeedData(row)" />
+                  <span v-if="row.isCreate" class="centerSpan">|</span>
+                  <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createFeedCancel(row)" />
+                  <!-- 编辑 -->
+                  <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleFeedUpdate(row)" />
+                  <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                  <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowFeedDelete(row)" />
+                  <!-- 编辑保存 -->
+                  <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateFeedData(row)" />
+                  <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+                  <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateFeedCancel(row)" />
+                </template>
+              </el-table-column>
+            </el-table>
+            <pagination v-show="create.table.total>=0" :total="create.table.total" :page.sync="create.table.getdataListParm.offset" :limit.sync="create.table.getdataListParm.pagecount" @pagination="getFeedList" />
+          </div>
+        </div>
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus == 'see' " class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList(); ">关闭</el-button>
           <el-button v-if="create.dialogStatus !== 'see' " class="cancelClose" @click="create.dialogFormVisible = false;getList(); ">关闭</el-button>
@@ -338,7 +343,7 @@ export default {
       feedNameAddList: [], // 饲料名称新增
       supplierList: [], // 供应商
       contractNoList: [], // 合同编号
-      islaidList: [{ id: 0, name: '是' }, { id: 1, name: '否' }], // 是否入库
+      islaidList: [{ id: 0, name: '已入库' }, { id: 1, name: '未入库' }, { id: 2, name: '已撤销' }], // 是否入库
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getProviderListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
@@ -365,6 +370,7 @@ export default {
         total: 0,
         listLoading: true
       },
+      specificationsList:[{name:'整车重量',id:'0'},{name:'分袋重量',id:'1'}],
       create: {
         dialogFormVisible: false,
         dialogStatus: '',
@@ -378,7 +384,6 @@ export default {
         },
         rules: {
           laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          operateweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
           feedname: [{ type: 'string', required: true, message: '必填', trigger: 'change' }],
           pricenew: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
         },
@@ -393,7 +398,20 @@ export default {
           offset: 0,
           pagecount: '',
           parammaps: { pastureid: Cookies.get('pastureid') }
-        }
+        },
+        table: {
+          getdataListParm: {
+            name: 'getFeedlaidList', page: 1, offset: 1, pagecount: parseInt(Cookies.get('pageCount')),
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          },
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: false
+        },
       },
       initial: {
         dialogFormVisible: false,
@@ -529,10 +547,10 @@ export default {
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)
@@ -754,6 +772,56 @@ export default {
         this.$refs.createTemp.resetFields()
       })
     },
+    // 增加饲料
+    handleIncreaseFeed(){
+      console.log('点击了增加饲料')
+      for (let i = 0; i < this.create.table.list.length; i++) {
+        if (this.create.table.list[i].Edit === true) {
+          this.$message({ type: 'error', message: '当前内容未保存，请点击取消或保存继续进行操作', duration: 2000 })
+          return false
+        }
+      }
+      this.create.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'drivercode': '', 'drivername': '' })
+    },
+    getFeedList(){},
+    createFeedData(row){},
+    createFeedCancel(row){
+      for (let i = 0; i < this.create.table.list.length; i++) {
+        if (row.myId === this.create.table.list[i].myId) {
+          var listIndex = this.create.table.list.indexOf(this.create.table.list[i])
+        }
+        if (listIndex > -1) {
+          this.create.table.list.splice(listIndex, 1)
+          return
+        }
+      }
+    },
+    handleFeedUpdate(row){
+      for (let i = 0; i < this.create.table.list.length; i++) {
+        if (this.create.table.list[i].Edit == true) {
+          this.$message({ type: 'error', message: '当前内容未保存，请点击取消或保存继续进行操作', duration: 2000 })
+          return false
+        }
+      }
+      // 编辑true,不可编辑false
+      row.Edit = true
+      row.NoEdit = false
+      // 新增false,编辑false,编辑保存true
+      row.isCreate = false
+      row.isUpdate = false
+      row.isUpdateSave = true
+    },
+    handleRowFeedDelete(){},
+    updateFeedData(){},
+    updateFeedCancel(row){
+      row.Edit = false
+      row.NoEdit = true
+      // 新增false,编辑true,编辑保存false
+      row.isCreate = false
+      row.isUpdate = true
+      row.isUpdateSave = false
+      this.getFeedList()
+    },
     createData() {
       this.$refs['createTemp'].validate(valid => {
         if (valid) {
@@ -1019,6 +1087,9 @@ export default {
         }
       })
     },
+    handleRevoke(row){
+      console.log('点击了撤销')
+    },
     handleSee(row) {
       console.log('点击了查看')
       this.$nextTick(() => {

src/views/inventoryManagement/warning/index.vue

@@ -370,10 +370,10 @@ export default {
           this.table.list = response.data.list
           // this.table.pageNum = response.data.pageNum
           // this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)