Explorar el Código

资产管理优化

ysc hace 1 año
padre
commit
dfe486fd29
Se han modificado 2 ficheros con 11 adiciones y 2 borrados
  1. 4 1
      src/views/material/asset.vue
  2. 7 1
      src/views/material/receive.vue

+ 4 - 1
src/views/material/asset.vue

@@ -91,6 +91,7 @@
           <!--          <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>-->
           <el-table-column label="生产厂家" prop="factoryName" :show-overflow-tooltip="true"/>
           <el-table-column label="购入日期" prop="buyDate"/>
+          <el-table-column label="库存数量" prop="num"/>
           <el-table-column label="状态" width="90">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.status==='1'" type="success">在库</el-tag>
@@ -284,7 +285,9 @@
             <el-form-item label="物品说明" prop="remark">
               <div>{{ transferForm.remark }}</div>
             </el-form-item>
-
+            <el-form-item v-if="transferForm.assetType==='1'" label="库存数">
+              <div>{{ transferForm.num }}</div>
+            </el-form-item>
             <el-form-item label="流转数量" prop="receiveNum" v-if="transferForm.assetType==='1'">
               <el-input-number v-model="transferForm.receiveNum"></el-input-number>
               <el-tooltip class="item" effect="dark" content="不填表示领取剩余全部库存" placement="right">

+ 7 - 1
src/views/material/receive.vue

@@ -395,9 +395,15 @@ import {
 } from "@/api/material/material";
 import {listProject} from "@/api/task/project";
 import DateUtil from "@/utils/date"
+import {mapGetters} from "vuex";
 
 export default {
   name: "Receive",
+  computed: {
+    ...mapGetters([
+      'userId'
+    ])
+  },
   data() {
     return {
       // 总条数
@@ -493,7 +499,7 @@ export default {
       })
     },
     selectableHandler(row, index) {
-      return row.num > row.receivedNum
+      return row.num > row.receivedNum && row.receiveUserId == this.userId
     },
     // 取消按钮
     cancel() {