更新

mes/qd/src/views/wms/mps/produce/bigScreen.vue

@@ -62,35 +62,6 @@
       <!--分页组件-->
 
     </div>
-    <el-dialog
-      title="请绑定设备"
-      :visible.sync="devicedialogVisible"
-      width="350px"
-      :before-close="handleClose">
-        <el-form :model="deviceForm" status-icon label-width="90px" ref="deviceForm" class="demo-ruleForm">
-          <el-form-item label="选择设备" prop="device_id">
-          <el-select
-              v-model="deviceForm.device_id"
-              clearable
-              filterable
-              size="mini"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in deviceList"
-                :key="item.device_id"
-                :label="item.device_name"
-                :value="item.device_id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-form>
-         <div slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="saveDevice">保存</el-button>
-            <el-button @click="devicedialogVisible = false">取消</el-button>
-         </div>
-    </el-dialog>
-
     <el-dialog
       title="报工数量"
       :visible.sync="reportdialogVisibler"
@@ -132,14 +103,11 @@ export default {
   dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE'],
   data() {
     return {
-      devicedialogVisible: false,
       reportdialogVisibler: false,
-      deviceForm: { device_id: null },
       reportForm: { report_qty: null, produce_qty: null, init_qty: null, finish_qty: null, finishproduct_qty: null },
       currentDate: new Date(),
       getTime: '',
       getDate: '',
-      deviceList: [],
       choice: '',
       is_openStart: true,
       is_reportWork: true,
@@ -246,7 +214,6 @@ export default {
       this.notify('刷新成功', 'success')
     },
     handleClose() {
-      this.devicedialogVisible = false
       this.reportdialogVisibler = false
     },
     getTable() {
@@ -254,13 +221,6 @@ export default {
         this.tableData = res
       })
     },
-    openStart() {
-      crudProduceshiftorder.getDevice({ workprocedure_id: this.choice.workprocedure_id }).then(res => {
-        this.deviceList = res
-      })
-      this.devicedialogVisible = true
-      this.deviceForm.device_id = this.choice.device_id
-    },
     reportWork() {
       this.reportdialogVisibler = true
       this.getReportWork(this.choice.produceorder_id)
@@ -286,15 +246,10 @@ export default {
         this.isDisabled()
       })
     },
-    saveDevice() {
-      if (this.deviceForm.device_id === '' || this.deviceForm.device_id === null || this.deviceForm.device_id === undefined) {
-        this.notify('请选择要绑定的设备', 'info')
-        return
-      }
-      crudProduceshiftorder.openStart({ device_id: this.deviceForm.device_id, row: this.choice }).then(res => {
+    openStart() {
+      crudProduceshiftorder.openStart({ row: this.choice }).then(res => {
         this.notify('操作成功', 'success')
         this.getTable()
-        this.devicedialogVisible = false
         this.isDisabled()
       })
     },