Pārlūkot izejas kodu

新增sop不传递用户的时候问题修复

pm 11 mēneši atpakaļ
vecāks
revīzija
8232249958

+ 0 - 1
src/views/mes/hw/Lock/index.vue

@@ -186,7 +186,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-form-item label="锁具名称" prop="locksetName">
           <el-input v-model="form.locksetName" placeholder="请输入锁具名称" />
         </el-form-item>

+ 29 - 21
src/views/mes/sop/sopm/NewSop.vue

@@ -615,7 +615,8 @@ export default {
       if (sopId !== null) {
         selectIsSopById(sopId).then((response) => {
           console.log(response, '详细内容')
-
+          this.sopProps = [response.data]
+          this.title = '修改隔离点信息'
           if (response.data.ticketUserDTOList) {
             this.openStaffing = true;
           }
@@ -625,33 +626,40 @@ export default {
             sopId: response.data.sopId,
             spoint: response.data.pointDetailVOList,
             ticketUserDTOList: response.data.ticketUserDTOList
-              .filter((item) => item.userRole !== "jtlocker")
+              ? response.data.ticketUserDTOList
+                .filter((item) => item.userRole !== "jtlocker")
+                .map((item) => ({
+                  userName: item.userName,
+                  userType: item.userType,
+                  userRole: item.userRole,
+                  userId: item.userId,
+                }))
+              : [],
+            locker: response.data.ticketUserDTOList
+              ? response.data.ticketUserDTOList
+                .filter((item) => item.userRole === "jtlocker")
+                .map((item) => item.userName)[0]
+              : null,
+            coLocker: response.data.ticketUserDTOList
+              ? response.data.ticketUserDTOList.map((item) => {
+                return item.userRole !== "jtlocker" ? item.userName : null;
+              })
+              : [],
+          };
+
+          this.newticketUserDTOList = response.data.ticketUserDTOList
+            ? response.data.ticketUserDTOList
+              .filter((item) => item.userRole === "jtlocker")
               .map((item) => ({
                 userName: item.userName,
                 userType: item.userType,
                 userRole: item.userRole,
                 userId: item.userId,
-              })),
+              }))
+            : [];
 
-            locker: response.data.ticketUserDTOList
-              .filter((item) => item.userRole == "jtlocker")
-              .map((item) => item.userName)[0],
-            coLocker: response.data.ticketUserDTOList.map((item) => {
-              return item.userRole !== "jtlocker" ? item.userName : null;
-            }),
-
-          };
-          this.newticketUserDTOList=response.data.ticketUserDTOList
-            .filter((item) => item.userRole == "jtlocker")
-            .map((item) => ({
-              userName: item.userName,
-              userType: item.userType,
-              userRole: item.userRole,
-              userId: item.userId,
-            })),
-            this.sopProps = [response.data]
           console.log(this.form,this.newticketUserDTOList,'编辑sop回显的数据',)
-          this.title = '修改隔离点信息'
+
         })
       } else {
         this.title = '新增隔离点信息'

+ 12 - 25
src/views/mes/sop/sopm/sopmLook.vue

@@ -738,44 +738,31 @@ export default {
       if (sopId !== null) {
         selectIsSopById(sopId).then((response) => {
           console.log(response, "详细内容");
+          this.sopProps = [response.data];
+
+          this.title = "修改隔离点信息";
           this.form = response.data;
           this.workareaName = response.data.workareaId;
 
-          console.log(
-            response.data,
-            response.data.ticketUserDTOList,
-            "response.data.ticketUserDTOList"
-          );
+
           if (response.data.ticketUserDTOList.length > 0) {
             this.openStaffing = true;
           }
 
-          const value = response.data.ticketUserDTOList //找到上锁人  这里一定要先筛选locker再去给表格筛选 否则表格筛选之后直接不会有上锁人数据了
+          const value =response.data.ticketUserDTOList? response.data.ticketUserDTOList //找到上锁人  这里一定要先筛选locker再去给表格筛选 否则表格筛选之后直接不会有上锁人数据了
             .filter((item) => item.userRole == "jtlocker")
-            .map((item) => item.userName);
-          console.log(value, "上锁人");
-          (this.form.locker = value[0]), //map返回的是数字 所以这样写
-            console.log(value, response.data.ticketUserDTOList, "form.locker");
-          this.form.ticketUserDTOList = response.data.ticketUserDTOList.filter(
+            .map((item) => item.userName):[];
+          if(value){
+            this.form.locker = value[0] //map返回的是数字 所以这样写
+          }
+          this.form.ticketUserDTOList =response.data.ticketUserDTOList? response.data.ticketUserDTOList.filter(
             (item) => {
               return item.userRole !== "jtlocker";
             }
-          ); //过滤上锁人
-
-          // this.tableData = response.data.pointDetailVOList.map((item)=>{
-          //   return {
-          //     pointName: item.pointName, // 显示的名称
-          //     pointId: item.pointId, // 对应的值
-          //     pointType: item.pointTypeName,
-          //     powerType: item.powerTypeName,
-          //     prePointId: item.prePointId
-          //   }
-          // })
-          // console.log(this.tableData, '编辑拿到的隔离点数据')
+          ):[]; //过滤上锁人
+
 
-          this.sopProps = [response.data];
 
-          this.title = "修改隔离点信息";
         });
       } else {
         this.title = "新增隔离点信息";