修改物资管理物资类型夫类型显示unknow问题；

物资领取列表展示内容补充

src/views/mes/material/collectionmanagement/index.vue

@@ -67,14 +67,19 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button v-no-more-click
+        <el-button
+          v-no-more-click
           type="primary"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button v-no-more-click icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button
+          v-no-more-click
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
@@ -108,7 +113,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="物资编码" align="center" prop="materialsCode">
         <template slot-scope="scope">
-          <el-button v-no-more-click
+          <el-button
+            v-no-more-click
             type="text"
             @click="handleView(scope.row)"
             v-hasPermi="['mes:mat:coll:query']"
@@ -117,8 +123,8 @@
         </template>
       </el-table-column>
       <el-table-column label="物资名称" align="center" prop="materialsName" />
-      <el-table-column label="领取柜" align="center" prop="loanFromName">
-      </el-table-column>
+      <el-table-column label="领取柜" align="center" prop="loanFromName" />
+
       <el-table-column
         label="是否需要归还"
         align="center"
@@ -131,10 +137,25 @@
           <el-tag type="danger" v-else>否</el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="归还柜" align="center" prop="restitutionToName" />
       <el-table-column label="领取人" align="center" prop="loanUserName">
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime">
+      <el-table-column label="归还人" align="center" prop="restitutionUserName">
       </el-table-column>
+      <!-- <el-table-column label="创建时间" align="center" prop="createTime">
+      </el-table-column> -->
+      <el-table-column label="领取时间" align="center" prop="loanTime" />
+      <el-table-column
+        label="理应归还时间"
+        align="center"
+        prop="restitutionTime"
+      />
+      <el-table-column
+        label="实际归还时间"
+        align="center"
+        prop="actualRestitutionTime"
+      />
+
       <!-- <el-table-column
         label="操作"
         align="center"
@@ -318,7 +339,7 @@ export default {
       this.queryParams.restitutionRequired = null; //是否需要归还
       this.queryParams.restitutionUserName = null;
       this.queryParams.restitutionToName = null; //归还柜
-      this.queryParams.restitutionToId = null;//归还柜id
+      this.queryParams.restitutionToId = null; //归还柜id
       this.queryParams.loanFormName = null; //领取柜
       this.queryParams.loanFromId = null; //领取柜id
       this.resetForm("queryForm");

src/views/mes/material/typeofmaterial/index.vue

@@ -36,19 +36,29 @@
         </el-select>
       </el-form-item>
       <el-form-item style="margin-left: 50px">
-        <el-button v-no-more-click
+        <el-button
+          v-no-more-click
           type="primary"
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
           >搜索</el-button
         >
-        <el-button v-no-more-click icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button
+          v-no-more-click
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
           >重置</el-button
         >
       </el-form-item>
     </el-form>
-    <el-button v-no-more-click size="mini" type="primary" icon="el-icon-plus" @click="handleAdd"
+    <el-button
+      v-no-more-click
+      size="mini"
+      type="primary"
+      icon="el-icon-plus"
+      @click="handleAdd"
       >新增</el-button
     >
     <el-table
@@ -108,7 +118,8 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button v-no-more-click
+          <el-button
+            v-no-more-click
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -116,14 +127,16 @@
             v-hasPermi="['mes:mat:type:edit']"
             >编辑</el-button
           >
-          <el-button v-no-more-click
+          <el-button
+            v-no-more-click
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             >新增</el-button
           >
-          <el-button v-no-more-click
+          <el-button
+            v-no-more-click
             v-if="scope.row.parentId != 0"
             size="mini"
             type="text"
@@ -268,7 +281,9 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-no-more-click type="primary" @click="submitForm">确 定</el-button>
+        <el-button v-no-more-click type="primary" @click="submitForm"
+          >确 定</el-button
+        >
         <el-button v-no-more-click @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -472,7 +487,7 @@ export default {
         this.form.parentId = row.materialsTypeId;
         this.form.ancestors = row.ancestors + "," + row.materialsTypeId;
       } else {
-        this.form.parentId = 0;
+        this.form.parentId = null;
         this.form.ancestors = 0;
       }
       this.form.restitutionRequired = 1;
@@ -488,8 +503,12 @@ export default {
       if (row != null) {
         this.form.parentId = row.materialsTypeId;
       }
+
       selectMaterialsTypeById(row.materialsTypeId).then((response) => {
         this.form = response.data;
+        if (this.form.parentId == 0) {
+          this.form.parentId = null;
+        }
         console.log(response.data.reminderTime, "修改");
 
         const convertTime = (time) => ({
@@ -545,6 +564,9 @@ export default {
               this.getList();
             });
           } else {
+            if (this.form.parentId == null) {
+              this.form.parentId = 0;
+            }
             addMaterialsType(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;