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

代码更新

Browse Source
This commit is contained in:
ludj
2022-11-25 15:29:18 +08:00
parent 00d2e352fb
commit 9619019c0f
17 changed files with 136 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wms/qd/src/views/wms/pdm/produceTask/bigScreen.vue
View File

@@ -1,20 +1,20 @@
<template>
<div style="border: 1px solid #938d8d;margin-left: 10px;margin-right: 10px;">
<el-row>
<el-col :span="14">
<el-col :span="18">
<div class="grid-content bg-purple"><h2 style="margin-left: 30px;padding-top: 10px;">车间加工看板</h2></div>
<div class="grid-content bg-purple">
&ensp;&ensp;
<!-- <el-button type="primary" icon="el-icon-search" @click="queryTask(query.device_code)">搜索</el-button>-->
<el-button type="primary" icon="el-icon-thumb" @click="fresh">界面刷新</el-button>
<el-button type="warning" icon="el-icon-position" @click="callMaterial">生产叫料</el-button>
<el-button type="success" icon="el-icon-finished" @click="finish">生产完成</el-button>
<el-button type="danger" icon="el-icon-top-left" @click="materialBack">余料回库</el-button>
<el-button type="info" icon="el-icon-top-left" @click="emptyVehicleBack">空托回库</el-button>
<el-button style="margin-left: 30px;" type="warning" icon="el-icon-position" @click="callMaterial">生产叫料</el-button>
<el-button style="margin-left: 30px;" type="success" icon="el-icon-finished" @click="finish">生产完成</el-button>
<el-button style="margin-left: 30px;" type="danger" icon="el-icon-top-left" @click="materialBack">余料回库</el-button>
<el-button style="margin-left: 30px;" type="info" icon="el-icon-top-left" @click="emptyVehicleBack">空托回库</el-button>
</div>
</el-col>
<el-col :span="10">
<el-col :span="6">
<div class="grid-content bg-purple-light">
<h2 style="text-align:right;margin-right: 140px;">{{ getTime }}</h2>
</div>

86
wms/qd/src/views/wms/st/quality/index.vue
View File

@@ -37,7 +37,7 @@
/>
</el-select>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -62,28 +62,28 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="bill_code" label="单据编码" width="115" />
<el-table-column prop="bill_date" label="业务日期" width="85" />
<el-table-column prop="bill_status" label="单据状态" :formatter="formatBillStatusName" width="100" />
<el-table-column prop="struct_code" label="仓位编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="struct_name" label="仓位名称" width="120" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column v-if="false" prop="outtask_uuid" label="出库任务标识" />
<el-table-column v-if="false" prop="intask_uuid" label="入库任务标识" />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column prop="update_by" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column type="selection" width="55"/>
<el-table-column prop="bill_code" label="单据编码" width="115"/>
<el-table-column prop="bill_date" label="业务日期" width="85"/>
<el-table-column prop="bill_status" label="单据状态" :formatter="formatBillStatusName" width="100"/>
<el-table-column prop="struct_code" label="仓位编码" min-width="100" show-overflow-tooltip/>
<el-table-column prop="struct_name" label="仓位名称" width="120"/>
<el-table-column prop="vehicle_code" label="载具号"/>
<el-table-column prop="material_code" label="物料编码"/>
<el-table-column prop="material_name" label="物料名称"/>
<el-table-column v-if="false" prop="outtask_uuid" label="出库任务标识"/>
<el-table-column v-if="false" prop="intask_uuid" label="入库任务标识"/>
<el-table-column prop="remark" label="备注" show-overflow-tooltip/>
<el-table-column prop="update_by" label="修改者"/>
<el-table-column prop="update_time" label="修改时间" width="135"/>
<el-table-column
v-permission="['admin','instruction:edit','instruction:del']"
fixed="right"
fixed="left"
label="操作"
width="340px"
width="70px"
align="center"
>
<template slot-scope="scope" >
<!--<template slot-scope="scope" >
<el-button
type="text"
icon="el-icon-delete-solid"
@@ -114,29 +114,29 @@
icon="el-icon-s-home"
@click="handleCommand(scope.row, 'f')"
>出库</el-button>
</template>-->
<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-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">搬出</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">通过</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">不通过</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">完成</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'f')">出库</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
<!-- <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-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">搬出</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">通过</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">不通过</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">完成</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'f')">出库</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- </template>-->
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<AddDialog :dialog-show.sync="addShow" />
<AddDialog :dialog-show.sync="addShow"/>
</div>
</template>
@@ -233,25 +233,25 @@ export default {
'command': command
}
},
handleCommand(row, command) {
switch (command) {
handleCommand(data, command) {
switch (data.command) {
case 'a':// 删除
this.opt_delete(row)
this.opt_delete(data.row)
break
case 'b':// 搬出
this.moveOut(row)
this.moveOut(data.row)
break
case 'c':// 通过
this.isPass(row, 1)
this.isPass(data.row, 1)
break
case 'd':// 不通过
this.isPass(row, 0)
this.isPass(data.row, 0)
break
case 'e':// 确认
this.confirm(row)
this.confirm(data.row)
break
case 'f':// 出库
this.outStock(row)
this.outStock(data.row)
break
}
},