From 939f3c3dd25fd0e23b57c0a87b5f2d2191c5d396 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Wed, 4 Dec 2024 10:42:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/material/ma/type/index.vue          | 20 +++++++++----------
 .../goodsArrived/component/addTools.vue       |  1 -
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index cfd3872d..ef055773 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -545,7 +545,7 @@
           <el-col :span="12">
             <el-form-item label="库管员">
               <el-select
-                v-model="form.keeperUserId"
+                v-model="form.keeperId"
                 filterable
                 placeholder="请选择库管员"
                 style="width: 100%"
@@ -562,7 +562,7 @@
           <el-col :span="12">
             <el-form-item label="维修班组">
               <el-select
-                v-model="form.keeperUserId"
+                v-model="form.repairerId"
                 filterable
                 placeholder="请选择维修班组"
                 style="width: 100%"
@@ -969,14 +969,13 @@ export default {
       const typeId = row.typeId;
       getMaType(typeId).then((response) => {
         this.form = response.data;
+        this.form.repairerId = Number(response.data.repairerId)
+        this.form.keeperId = Number(response.data.keeperId)
         this.form.isCharging = this.form.isCharging + "";
-        this.form.houseName = row.houseName;
+        // this.form.houseName = row.houseName;
         this.form.itemType = row.itemType;
         this.form.materialType = row.materialType;
-        this.form.materialName = row.materialName;
-        // if (response.data.keeperNickName) {
-        //   this.form.keeperUserId = response.data.keeperUserId;
-        // }
+        this.form.materialName = row.materialName; 
         this.isLevel1Disabled = true;
         this.isLevel2Disabled = true;
         this.isLevel3Disabled = true;
@@ -991,14 +990,13 @@ export default {
       const typeId = row.typeId;
       getMaType(typeId).then((response) => {
         this.form = response.data;
+        this.form.repairerId = Number(response.data.repairerId)
+        this.form.keeperId = Number(response.data.keeperId)
         this.form.isCharging = this.form.isCharging + "";
-        this.form.houseName = row.houseName;
+        // this.form.houseName = row.houseName;
         this.form.itemType = row.itemType;
         this.form.materialType = row.materialType;
         this.form.materialName = row.materialName;
-        // if (response.data.keeperNickName) {
-        //   this.form.keeperUserId = response.data.keeperUserId;
-        // }
         this.isLevel1Disabled = true;
         this.isLevel2Disabled = true;
         this.isLevel3Disabled = true;
diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue
index 111e9a9c..6051b3e5 100644
--- a/src/views/material/purchase/goodsArrived/component/addTools.vue
+++ b/src/views/material/purchase/goodsArrived/component/addTools.vue
@@ -14,7 +14,6 @@
                     v-model="maForm.arrivalTime"
                     style="width: 240px"
                     value-format="yyyy-MM-dd hh:mm:ss"
-                    :picker-options="pickerOptions"
                     type="date"
                     placeholder="请选择到货日期"
                 ></el-date-picker>