Merge branch 'master' of http://121.40.234.130:8899/root/liaoNingShengHua

acs/qd/src/api/acs/produceshiftorder/produceshiftorder.js

@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function finish(order_id) {
+  return request({
+    url: 'api/produceshiftorder/finish/' + order_id,
+    method: 'post',
+    data: order_id
+  })
+}
+
+export default { add, edit, del, finish }

acs/qd/src/views/acs/device/driver/lnsh/lnsh_rgv.vue

@@ -55,6 +55,53 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="取货点" prop="device_code">
+              <el-select
+                v-model="form.get_device_code"
+                multiple
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in deviceList"
+                  :label="item.device_name"
+                  :value="item.device_code"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-form-item label="装货点" prop="device_code">
+            <el-select
+              v-model="form.load_device_code"
+              filterable
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="放货点" prop="device_code">
+            <el-select
+              v-model="form.put_device_code"
+              filterable
+              multiple
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-row>
       </el-form>
     </el-card>
 
@@ -282,6 +329,9 @@ export default {
       opc_id: '',
       opc_code: '',
       configLoading: false,
+      get_device_code: '',
+      load_device_code: '',
+      put_device_code: '',
       dataOpcservers: [],
       dataOpcPlcs: [],
       deviceList: [],

acs/qd/src/views/acs/produceshiftorder/index.vue

@@ -59,6 +59,18 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
+        <el-table-column v-permission="['admin','produceshiftorder:edit','produceshiftorder:del']" fixed="left" label="操作" width="150px" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" @command="handleCommand">
+              <span class="el-dropdown-link">
+                <i class="el-icon-menu" />
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
         <el-table-column prop="order_code" label="工单编码" />
         <el-table-column prop="device_code" label="设备编码" />
         <el-table-column prop="order_status_name" label="工单状态" />
@@ -134,6 +146,29 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     }
+  },
+  beforeHandleCommand(index, row, command) {
+    return {
+      'index': index,
+      'row': row,
+      'command': command
+    }
+  },
+  finish(index, row) {
+    debugger
+    crudProduceshiftorder.finish(row.order_id).then(res => {
+      this.crud.toQuery()
+      this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+    }).catch(err => {
+      console.log(err.response.data.message)
+    })
+  },
+  handleCommand(command) {
+    switch (command.command) {
+      case 'a':// 完成
+        this.finish(command.index, command.row)
+        break
+    }
   }
 }
 </script>