资产管理修改

src/views/material/asset.vue

@@ -285,7 +285,7 @@
               </el-tooltip>
             </el-form-item>
             <el-form-item label="选择配件" prop="accessoriesId">
-              <el-select v-model="transferForm.accessoriesId" multiple>
+              <el-select v-model="transferForm.accessoriesId" multiple style="width: 200px">
                 <el-option v-for="(item,index) in accessoryList" :label="item.accessoryName" :key="index"
                            :value="item.id">
                   <span style="float: left">{{ item.accessoryName }}</span>
@@ -294,15 +294,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label="接收人" prop="receiveUserId">
-              <el-cascader
-                v-model="transferForm.receiveUserId"
-                :options="userList"
-                @change="(val)=>selectExecutor(val,'form')"
-                :props="{ expandTrigger: 'hover',value:'id',label:'name' }"
-                :show-all-levels="false"></el-cascader>
+              <dept-user-tree ref="dut" :userList="userList" style="width: 200px"
+                              @selected="(val)=>transferForm.receiveUserId = val"></dept-user-tree>
             </el-form-item>
             <el-form-item label="流转类型" prop="transferType">
-              <el-select v-model="transferForm.transferType">
+              <el-select v-model="transferForm.transferType" style="width: 200px">
                 <el-option
                   v-for="dict in dict.type.transfer_type"
                   :key="dict.value"
@@ -310,7 +306,7 @@
                   :value="dict.value"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="流转备注" prop="remark">
+            <el-form-item label="流转备注" prop="transferRemark">
               <el-input v-model="transferForm.transferRemark" type="textarea"></el-input>
             </el-form-item>
           </el-form>
@@ -408,6 +404,9 @@ export default {
         assetType: [
           {required: true, message: "资产类型不能为空", trigger: "change"}
         ],
+        source: [
+          {required: true, message: "入库来源不能为空", trigger: "change"}
+        ],
         location: [
           {required: true, message: "定位位置不能为空", trigger: "blur"}
         ]
@@ -419,10 +418,13 @@ export default {
       userList: [],
       transferRules: {
         receiveUserId: [
-          {required: true, message: "接收人不能为空", trigger: "change"}
+          {required: true, message: "接收人不能为空", trigger: "blur"}
         ],
         transferType: [
           {required: true, message: "流转类型不能为空", trigger: "change"}
+        ],
+        transferRemark: [
+          {required: true, message: "流转备注不能为空", trigger: "blur"}
         ]
       },
       detailOpen: false
@@ -603,6 +605,7 @@ export default {
       })
       return typeLabel
     },
+
     submitTransferForm() {
       this.$refs["transferForm"].validate(valid => {
         if (valid) {
@@ -610,7 +613,6 @@ export default {
           if (this.transferForm.accessoriesId) {
             this.transferForm.accessoriesId = this.transferForm.accessoriesId.join()
           }
-          this.transferForm.receiveUserId = this.transferForm.receiveUserId[this.transferForm.receiveUserId.length - 1]
           addTransfer(this.transferForm).then(res => {
             this.$message.success("流转成功");
             this.transferOpen = false;

src/views/material/myReceive.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
-      <el-form-item label="是否配件" prop="accessoryFlag">
-        <el-switch v-model="queryParams.accessoryFlag"
-                   active-value="1"
-                   inactive-value="0">
-        </el-switch>
-      </el-form-item>
       <el-form-item label="资产类型" prop="assetType">
         <el-select
           v-model="queryParams.assetType"
@@ -25,7 +19,10 @@
 
     <el-table :data="assetList"
               @row-click="rowClick"
-              size="mini">
+              size="mini"
+              row-key="id"
+              :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"/>
@@ -46,7 +43,7 @@
             plain
             icon="el-icon-coordinate"
             size="mini"
-            v-if="scope.row.receiveConfirm!='1'"
+            v-if="scope.row.receiveConfirm==='0'"
             @click="handleConfirm(scope.row)"
           >领用确认
           </el-button>