代码更新

mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue

@@ -89,7 +89,7 @@
         >
           开始保养
         </el-button>
-        <el-button
+ <!--       <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -99,7 +99,7 @@
           @click="executeMaintain"
         >
           保养执行
-        </el-button>
+        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"
@@ -120,7 +120,7 @@
           :disabled="confirm_flag"
           @click="confirmMaintain"
         >
-          保养确认
+          保养验收
         </el-button>
       </crudOperation>
       <!--表格渲染-->
@@ -150,6 +150,7 @@
       <pagination />
     </div>
     <ExecuteDialog :dialog-show.sync="executeDialog" :open-param="openParam" />
+    <StartDialog :dialog-show.sync="startDialog" :open-param="openParam" />
   </div>
 </template>
 
@@ -166,11 +167,12 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import DateRangePicker from '@/components/DateRangePicker'
 import ExecuteDialog from '@/views/wms/sb/upkeep/devicemaintenancepa/ExecuteDialog'
+import StartDialog from '@/views/wms/sb/upkeep/devicemaintenancepa/StartDialog'
 
 export default {
   name: 'Devicemaintenancepa',
   dicts: ['EM_DEVICE_BY_INVSTATUS', 'EM_DEVICE_BY_INVTYPE'],
-  components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker },
+  components: { ExecuteDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect, DateRangePicker, StartDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
@@ -199,6 +201,7 @@ export default {
       materOpt_code: '23',
       openParam: null,
       executeDialog: false,
+      startDialog: false,
       permission: {
       }
     }
@@ -262,10 +265,8 @@ export default {
       if (data.invstatus !== '02') {
         return this.crud.notify('只能对提交状态的单据开始', CRUD.NOTIFICATION_TYPE.INFO)
       }
-      crudDevicemaintenancemst.startMaintain(data).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
+      this.openParam = data
+      this.startDialog = true
     },
     endMaintain() {
       const _selectData = this.$refs.table.selection
@@ -273,10 +274,17 @@ export default {
       if (data.invstatus !== '03') {
         return this.crud.notify('只能对开始状态的单据结束', CRUD.NOTIFICATION_TYPE.INFO)
       }
-      crudDevicemaintenancemst.endMaintain(data).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
+      crudDevicemaintenancemst.getDtl(data).then(res => {
+        this.openParam = {
+          'form': data,
+          'tableData': res
+        }
+        this.executeDialog = true
       })
+      // crudDevicemaintenancemst.endMaintain(data).then(res => {
+      //   this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      //   this.crud.toQuery()
+      // })
     },
     executeMaintain() {
       const _selectData = this.$refs.table.selection