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

更新

Browse Source
This commit is contained in:
gengby
2022-11-30 12:51:53 +08:00
parent 3bfe8438d1
commit 22ff161288
109 changed files with 4922 additions and 2374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
mes/qd/src/views/wms/mps/produce/index.vue
View File

@@ -127,7 +127,7 @@
<el-button
slot="right"
class="filter-item"
type="success"
type="info"
icon="el-icon-position"
size="mini"
:disabled="crud.selections.length !== 1"
@@ -135,7 +135,7 @@
>
复制新增
</el-button>
<el-button
<!-- <el-button
slot="right"
class="filter-item"
type="success"
@@ -144,6 +144,16 @@
@click="add"
>
批量新增
</el-button>-->
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-upload2"
size="mini"
@click="uploadShow = true"
>
导入
</el-button>
<el-button
slot="right"
@@ -303,6 +313,22 @@
<el-form-item label="工单数量" prop="orderNum">
<el-input v-model="form.orderNum" type="number" :min="1" oninput="value = value.replace(/[^\d]/g, '')" style="width: 200px;" />
</el-form-item>
<el-form-item label="操作人员" prop="jockey_id">
<el-select
v-model="form.jockey_id"
clearable
size="mini"
class="filter-item"
style="width: 200px;"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.nickName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -350,7 +376,7 @@
<el-table-column prop="material_spec" label="物料规格" width="100" show-overflow-tooltip />
<el-table-column prop="sale_id" label="销售单标识" width="100" show-overflow-tooltip />
<el-table-column prop="class_name" label="产品系列" width="100" show-overflow-tooltip />
<el-table-column prop="material_weight" label="物料单重" :formatter="rounding" />
<el-table-column prop="material_weight" label="物料单重" />
<el-table-column prop="planproducestart_date" label="计划生产开始时间" width="150" />
<el-table-column prop="planproduceend_date" label="计划生产结束时间" width="150" />
<el-table-column prop="realproducestart_date" label="实际生产开始时间" width="150" />
@@ -375,6 +401,9 @@
:data="scope.row"
:permission="permission"
/>
<el-button slot="right" :disabled="scope.row.order_status === '04' || scope.row.order_status === '02'" size="mini" type="text" icon="el-icon-warning" @click="replaceDevice(scope.row.workprocedure_id, scope.row.produceorder_code)">
更换设备
</el-button>
</template>
</el-table-column>
</el-table>
@@ -388,7 +417,9 @@
@setMaterValue="setMaterValue"
/>
<ViewDialog ref="child3" />
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
<AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
<ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
</div>
</template>
@@ -406,6 +437,8 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import ViewDialog from '@/views/wms/mps/produce/ViewDialog'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import AddDialog from '@/views/wms/mps/produce/AddDialog'
import UploadDialog from '@/views/wms/mps/produce/UploadDialog'
import ReplaceDeviceDialog from '@/views/wms/mps/produce/ReplaceDeviceDialog'
const defaultForm = {
produceorder_id: null,
@@ -441,11 +474,12 @@ const defaultForm = {
is_canupdate_update: '1',
material_spec: null,
sale_id: null,
orderNum: 1
orderNum: 1,
jockey_id: ''
}
export default {
name: 'Produceshiftorder',
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog },
components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, UploadDialog, ReplaceDeviceDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
cruds() {
@@ -470,13 +504,19 @@ export default {
materType: '01',
materialShow: false,
addShow: false,
replaceShow: false,
uploadShow: false,
workprocedureList: [],
userList: [],
order_status: ['-1'],
permission: {},
rules: {
produceorder_code: [
{ required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }
],
jockey_id: [
{ required: true, message: '操作人员不能为空', trigger: 'blur' }
],
producedeviceorder_code: [
{ required: true, message: '机台工单号不能为空', trigger: 'blur' }
],
@@ -516,8 +556,17 @@ export default {
created() {
this.getworkprocedure()
this.initClass3()
this.getUser()
},
methods: {
tableChanged3() {
this.crud.toQuery()
},
getUser() {
crudProduceshiftorder.getUser().then(res => {
this.userList = res
})
},
initDataPlan() {
const date = this.dateFormatter(new Date())
const formatter1 = this.dateFormatter1(new Date())
@@ -652,13 +701,13 @@ export default {
if (length > 1) {
var flag = false
for (let i = 0; i < rows.length; i++) {
if (rows[i].order_status !== '00') {
if (rows[i].order_status !== '00' || rows[i].device_id === '') {
flag = true
break
}
}
return flag
} else if (length === 1 && rows[0].order_status === '00') {
} else if (length === 1 && rows[0].order_status === '00' && rows[0].device_id !== '') {
return false
} else {
return true
@@ -713,6 +762,9 @@ export default {
add() {
this.addShow = true
},
replaceDevice(workProcedure_id, order_code) {
this.$refs.child4.setForm(workProcedure_id, order_code)
},
copyAdd(data) {
this.crud.toCopy(data)
},