更新5-7

src/views/basicData/supplier/index.vue

@@ -161,10 +161,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

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
@@ -10,9 +11,6 @@
       <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否预混料" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in isPremixList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
       <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否审核" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in isAuditList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
@@ -36,8 +34,7 @@
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
-        @selection-change="handleSelectionChange"
-        :max-height="myHeight"
+        @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -60,10 +57,9 @@
             <span>{{ scope.row.feedname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="是否预混料" min-width="60px" align="center">
+        <el-table-column label="是否预混料" min-width="100px" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.premix == 0">否</span>
-            <span v-else>是</span>
+            <span>{{ scope.row.feedname }}</span>
           </template>
         </el-table-column>
         <el-table-column label="库存重量(kg)" min-width="100px" align="center">
@@ -87,13 +83,13 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.operateweight" placeholder="最多保留两位小数" type="number" :step="0.01" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="70px" align="center">
+        <el-table-column label="备注" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.remark" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="是否审核" min-width="70px" align="center">
+        <el-table-column label="是否审核" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.ischarge == 1">是</span>
             <span v-else>否</span>
@@ -104,7 +100,6 @@
             <el-button v-if="row.isUpdate && row.ischarge !== 1 && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <el-button v-if="row.isUpdateSave" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
-            <el-button v-if="row.ischarge == 1 && isRoleEdit" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -125,7 +120,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      isPremixList:[{ id: '1', name: '是' }, { id: '0', name: '否' }],//是否预混料
+
       livestockTypeList: [], // 牲畜类别
       feedNameList: [{ id: 0, name: '羊草' }, { id: 1, name: '小苏打' }], // 饲料名称
       isAuditList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否审核
@@ -181,8 +176,7 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      myHeight:document.documentElement.clientHeight - 85- 150 - 45
+      cellStyle: { padding: 0 + 'px' }
     }
   },
 
@@ -315,13 +309,6 @@ export default {
       row.isUpdateSave = false
       this.getList()
     },
-    handleRevoke(row){
-      MessageBox.confirm('请确认是否要撤销审核结果?', '提示', {
-        confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
-      }).then(() => {
-        console.log('点击了撤销')
-      })
-    },
     handleSelectionChange(val) {
       console.log('勾选数据', val)
       this.selectList = val
@@ -408,3 +395,8 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+  // .operation{margin-top:10px;}
+  .search{margin-top:10px;}
+  
+ </style>

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

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
@@ -11,6 +10,9 @@
       <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
       </el-select>
+      <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否预混料" class="filter-item" style="width: 150px;" clearable>
+        <el-option v-for="item in isPremixList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
       <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否审核" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in isAuditList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
@@ -35,6 +37,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -57,9 +60,10 @@
             <span>{{ scope.row.feedname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="是否预混料" min-width="100px" align="center">
+        <el-table-column label="是否预混料" min-width="60px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.feedname }}</span>
+            <span v-if="scope.row.premix == 0">否</span>
+            <span v-else>是</span>
           </template>
         </el-table-column>
         <el-table-column label="库存重量(kg)" min-width="100px" align="center">
@@ -83,13 +87,13 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.operateweight" placeholder="最多保留两位小数" type="number" :step="0.01" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="100px" align="center">
+        <el-table-column label="备注" min-width="70px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.remark" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="是否审核" min-width="100px" align="center">
+        <el-table-column label="是否审核" min-width="70px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.ischarge == 1">是</span>
             <span v-else>否</span>
@@ -100,6 +104,7 @@
             <el-button v-if="row.isUpdate && row.ischarge !== 1 && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <el-button v-if="row.isUpdateSave" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+            <el-button v-if="row.ischarge == 1 && isRoleEdit" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -120,7 +125,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-
+      isPremixList:[{ id: '1', name: '是' }, { id: '0', name: '否' }],//是否预混料
       livestockTypeList: [], // 牲畜类别
       feedNameList: [{ id: 0, name: '羊草' }, { id: 1, name: '小苏打' }], // 饲料名称
       isAuditList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否审核
@@ -176,7 +181,8 @@ export default {
       isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
 
@@ -309,6 +315,13 @@ export default {
       row.isUpdateSave = false
       this.getList()
     },
+    handleRevoke(row){
+      MessageBox.confirm('请确认是否要撤销审核结果?', '提示', {
+        confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
+      }).then(() => {
+        console.log('点击了撤销')
+      })
+    },
     handleSelectionChange(val) {
       console.log('勾选数据', val)
       this.selectList = val
@@ -395,8 +408,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  // .operation{margin-top:10px;}
-  .search{margin-top:10px;}
-  
- </style>