root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端更新

Browse Source
This commit is contained in:
lyd
2022-08-17 13:43:16 +08:00
parent 7701d9f0ba
commit a177e3bc21
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
acs/qd/src/views/acs/device/index.vue
View File

@@ -139,23 +139,29 @@
<!-- <el-table-column prop="manufacturer" label="生产厂家" />-->
<!-- <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
<el-table-column prop="remark" label="备注" />
<el-table-column label="操作" width="150px" align="center">
<!-- <el-table-column label="操作" width="150px" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">-->
<!-- <router-link :to="'/devices/device/config/' + scope.row.device_code ">-->
<!-- 驱动配置-->
<!-- </router-link>-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column v-permission="['admin','device:edit','device:del']" label="操作" width="200px" align="center">
<template slot-scope="scope">
<el-button size="mini" style="margin-left: -1px;margin-right: 2px" type="text">
<udOperation
style="display: inline"
:data="scope.row"
:permission="permission"
/>
<el-button slot="right" size="mini" type="text">
<router-link :to="'/devices/device/config/' + scope.row.device_code ">
驱动配置
</router-link>
</el-button>
</template>
</el-table-column>
<el-table-column v-permission="['admin','device:edit','device:del']" label="操作" width="150px" align="center">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />

32
acs/qd/src/views/acs/produceshiftorder/index.vue
View File

@@ -59,18 +59,6 @@
<!--表格渲染-->
<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="80px" 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="工单编码" min-width="120" show-overflow-tooltip />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="order_status_name" label="工单状态" />
@@ -84,12 +72,16 @@
<el-table-column prop="weight" label="重量" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="['admin','produceshiftorder:edit','produceshiftorder:del']" label="操作" width="120px" align="center">
<el-table-column v-permission="['admin','produceshiftorder:edit','produceshiftorder:del']" label="操作" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
style="display: inline"
:data="scope.row"
:permission="permission"
/>
<el-button slot="right" size="mini" type="text" @click="finish(scope.$index, scope.row)">
完成
</el-button>
</template>
</el-table-column>
</el-table>
@@ -147,13 +139,6 @@ 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 => {
@@ -162,13 +147,6 @@ export default {
}).catch(err => {
console.log(err.response.data.message)
})
},
handleCommand(command) {
switch (command.command) {
case 'a':// 完成
this.finish(command.index, command.row)
break
}
}
}
}