Merge remote-tracking branch 'origin/master'

src/views/dashboard/index.vue

@@ -56,6 +56,15 @@
           </div>
         </div>
       </el-card>
+      <el-card class="card">
+        <div class="card-text" @click="toMyReceive">
+          <div class="card-left"><i class="el-icon-s-order"></i></div>
+          <div class="card-right">
+            <div class="card-text-title">待确认领用</div>
+            <div class="card-text-val">{{ toBeConfirmReceiveNum }}</div>
+          </div>
+        </div>
+      </el-card>
     </div>
 
     <el-dialog title="新任务" :visible.sync="newTaskOpen" append-to-body :close-on-click-modal="false">
@@ -89,10 +98,9 @@
 <script>
 
 import {mapGetters} from 'vuex'
-import Pagination from '@/components/Page/Pagination'
 import {toDoTaskList} from "@/api/task/task";
-// import {completeTask, getPersonalTaskList} from '@/api/meeting/enforce'
-// import {confirmMeetings, getTodoMeetings} from '@/api/meeting/meeting'
+import {personReceive} from "@/api/material/transfer";
+
 
 export default {
   name: 'Dashboard',
@@ -114,11 +122,12 @@ export default {
       auditTasks: [],
       newTaskOpen: false,
       auditTaskOpen: false,
-
+      toBeConfirmReceiveNum: 0,
     }
   },
   mounted() {
     this.getTodoTask();
+    this.getAssetReceive();
   },
   methods: {
     getTodoTask() {
@@ -147,6 +156,17 @@ export default {
       this.meetingForm = row
 
     },
+    /** 获取待确认领取物品 */
+    getAssetReceive() {
+      personReceive().then(res => {
+        let filter = res.data.filter(item => item.receiveConfirm != '1');
+        this.toBeConfirmReceiveNum = filter.length
+      })
+    },
+    toMyReceive() {
+      this.$router.push(`/material/myReceive`)
+    }
+
   }
 }
 </script>

src/views/material/myReceive.vue

@@ -21,8 +21,8 @@
               @row-click="rowClick"
               size="mini"
               row-key="id"
+              :row-class-name="rowClassName"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-
       <el-table-column label="资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="物品名称" prop="assetName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column label="部门编号" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
@@ -38,7 +38,7 @@
       <el-table-column label="生产厂家" prop="factoryName" :show-overflow-tooltip="true"/>
       <el-table-column label="领用日期" prop="receiveDate">
         <template slot-scope="scope">
-          <span>{{parseTime(scope.row.receiveDate)}}</span>
+          <span>{{ parseTime(scope.row.receiveDate) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="120">
@@ -56,8 +56,12 @@
     </el-table>
 
     <!-- 资产详情对话框 -->
-    <el-dialog title="资产详情" :visible.sync="detailOpen" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog title="资产详情" :visible.sync="detailOpen" width="800px" append-to-body @close="cancel">
       <asset-detail :form="form"></asset-detail>
+      <div v-if="confirmDialog" slot="footer" class="dialog-footer">
+        <el-button type="primary" size="mini" @click="submitConfirm">确 定</el-button>
+        <el-button size="mini" @click="cancel">取 消</el-button>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -75,6 +79,8 @@ export default {
       queryParams: {},
       assetList: [],
       detailOpen: false,
+      confirmDialog: false,
+      toConfirmTransferId: undefined,
       form: {}
     }
   },
@@ -99,11 +105,26 @@ export default {
       this.handleQuery();
     },
     handleConfirm(row) {
-      confirmReceive(row.transferId).then(res => {
+      this.toConfirmTransferId = row.transferId
+      getAsset(row.id).then(res => {
+        this.form = res.data
+        this.confirmDialog = true
+        this.detailOpen = true;
+      })
+    },
+    submitConfirm() {
+      confirmReceive(this.toConfirmTransferId).then(res => {
         this.$message.success("确认成功")
+        this.cancel();
         this.getList();
       })
     },
+    cancel() {
+      this.form = {}
+      this.confirmDialog = false
+      this.detailOpen = false;
+      this.toConfirmTransferId = undefined
+    },
     rowClick(row, column, event) {
       if (column.label === '操作') {
         return
@@ -113,10 +134,18 @@ export default {
         this.detailOpen = true;
       })
     },
+    rowClassName({row, rowIndex}) {
+      if (row.receiveConfirm === '0') {
+        return 'warning-row';
+      }
+      return '';
+    }
   }
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.el-table::v-deep .warning-row {
+  background: #fef0f0;
+}
 </style>