Просмотр исходного кода

作业票新增sop模板的时候隔离点顺序问题

pm 11 месяцев назад
Родитель
Сommit
044df0e9e0

+ 11 - 9
src/views/mes/job/jobm/NewOperations.vue

@@ -771,15 +771,6 @@ export default {
         this.form.ticketName = 'sop_'
         selectIsSopById(value).then((response) => {
           console.log(response, 'sop-父组件')
-          const value = response.data.ticketUserDTOList //找到上锁人  这里一定要先筛选locker再去给表格筛选 否则表格筛选之后直接不会有上锁人数据了
-            .filter(item => item.userRole == 'jtlocker')
-            .map(item => item.userName)
-          this.form.locker = value[0],//map返回的是数字 所以这样写
-            // console.log(value,response.data.ticketUserDTOList,'form.locker')
-            this.form.ticketUserDTOList = response.data.ticketUserDTOList.filter((item) => {
-              return item.userRole !== 'jtlocker'
-            })//过滤上锁人
-          this.tableData = response.data.pointDetailVOList
           this.orderTableData = response.data.pointDetailVOList.map((point) => {
             return {
               pointName: point.pointName, // 显示的名称
@@ -789,6 +780,17 @@ export default {
               prePointId: point.prePointId
             }
           })
+          // console.log(this.orderTableData,'选中sop之后赋值的orderTableData')
+          const value = response.data.ticketUserDTOList //找到上锁人  这里一定要先筛选locker再去给表格筛选 否则表格筛选之后直接不会有上锁人数据了
+            .filter(item => item.userRole == 'jtlocker')
+            .map(item => item.userName)
+          this.form.locker = value[0],//map返回的是数字 所以这样写
+            // console.log(value,response.data.ticketUserDTOList,'form.locker')
+            this.form.ticketUserDTOList = response.data.ticketUserDTOList.filter((item) => {
+              return item.userRole !== 'jtlocker'
+            })//过滤上锁人
+          this.tableData = response.data.pointDetailVOList
+
           this.form.workareaId = response.data.workareaId
           this.newticketUserDTOList = response.data.ticketUserDTOList.filter((item) => {
             return item.userRole == 'jtlocker'

+ 0 - 1
src/views/mes/material/materialinformation/index.vue

@@ -140,7 +140,6 @@
         <template slot-scope="scope">
           {{formatDateserviceLife(scope.row.serviceLife)}}
         </template>
-
       </el-table-column>
       <el-table-column label="物资状态" align="center" prop="loanState">
         <template slot-scope="scope">