代码更新

mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue

@@ -89,7 +89,7 @@
         >
           开始维修
         </el-button>
-        <el-button
+   <!--     <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -99,6 +99,17 @@
           @click="executeRepair"
         >
           维修执行
+        </el-button>-->
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="open_flag"
+          @click="openReceive"
+        >
+          维修领用
         </el-button>
         <el-button
           slot="right"
@@ -111,17 +122,6 @@
         >
           结束维修
         </el-button>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          :disabled="open_flag"
-          @click="openReceive"
-        >
-          维修领用
-        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -131,7 +131,7 @@
           :disabled="confirm_flag"
           @click="confirmRepair"
         >
-          维修确认
+          班组验收
         </el-button>
         <el-button
           slot="right"
@@ -179,6 +179,7 @@
     <ExecuteDialog :dialog-show.sync="executeDialog" :open-param="openParam" />
     <resuftDialog :dialog-show.sync="resuftDialog" :open-param="openParam" />
     <ReceiveDialog :dialog-show.sync="receiveDialog" :open-param="openParam" />
+    <StartDialog :dialog-show.sync="startDialog" :open-param="openParam" />
   </div>
 </template>
 
@@ -197,11 +198,12 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import ExecuteDialog from '@/views/wms/sb/repair/devicerepairpa/ExecuteDialog'
 import resuftDialog from '@/views/wms/sb/repair/devicerepairpa/resuftDialog'
 import ReceiveDialog from '@/views/wms/sb/repair/devicerepairpa/ReceiveDialog'
+import StartDialog from '@/views/wms/sb/repair/devicerepairpa/StartDialog'
 
 export default {
   name: 'Devicerepairpa',
   dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_DEVICE_WX_INVSTATUS', 'EM_FAULT_LEVEL'],
-  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, ExecuteDialog, resuftDialog, ReceiveDialog },
+  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, ExecuteDialog, resuftDialog, ReceiveDialog, StartDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
@@ -234,6 +236,7 @@ export default {
       executeDialog: false,
       resuftDialog: false,
       receiveDialog: false,
+      startDialog: false,
       permission: {
       }
     }
@@ -300,18 +303,19 @@ export default {
       if (data.invstatus !== '02') {
         return this.crud.notify('只能对提交状态的单据维修', CRUD.NOTIFICATION_TYPE.INFO)
       }
-      crudDevicerepairmst.startRepair(data).then(res => {
-        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.crud.toQuery()
-      })
+      this.openParam = data
+      this.startDialog = true
     },
     endRepair() {
       const _selectData = this.$refs.table.selection
       const data = _selectData[0]
       if (data.invstatus === '03' || data.invstatus === '05') {
-        crudDevicerepairmst.endRepair(data).then(res => {
-          this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-          this.crud.toQuery()
+        crudDevicerepairmst.getDtl(data).then(res => {
+          this.openParam = {
+            'form': data,
+            'tableData': res
+          }
+          this.executeDialog = true
         })
       } else {
         return this.crud.notify('只能对开始或者委外验收的单据结束维修', CRUD.NOTIFICATION_TYPE.INFO)