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

rev:基础数据用额面维护

Browse Source
This commit is contained in:
zhangzhiqiang
2023-06-28 09:17:26 +08:00
parent 3fb718b739
commit 2d2d3d3c74
71 changed files with 2064 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/qd/src/layout/components/Sidebar/Logo.vue
View File

@@ -34,7 +34,7 @@ export default {
},
data() {
return {
title: '诺力mes平台',
title: '海量mes系统',
logo: Logo,
title_param: 'platform'
}

2
mes/qd/src/views/login.vue
View File

@@ -2,7 +2,7 @@
<div class="login" :style="'background-image:url('+ Background +');'">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left" label-width="0px" class="login-form">
<h3 class="title">
诺力mes系统
海量mes系统
</h3>
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">

31
mes/qd/src/views/wms/masterdata_manage/master/measure/index.vue
View File

@@ -31,8 +31,11 @@
<el-input-number v-model="form.qty_precision" :min="1" :max="6" label="描述文字" style="width: 150px;" @change="handleChange" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-radio v-model="form.is_used" label="0">否</el-radio>
<el-radio v-model="form.is_used" label="1">是</el-radio>
<el-switch
v-model="form.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -53,8 +56,6 @@
v-model="scope.row.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value="1"
inactive-value="0"
@change="changeEnabled(scope.row, scope.row.is_used)"
/>
</template>
@@ -81,7 +82,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
const defaultForm = { measure_unit_id: null, unit_code: null, unit_name: null, qty_precision: null, is_used: '1', create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, ext_id: null }
const defaultForm = { measure_unit_id: null, unit_code: null, unit_name: null, qty_precision: null, is_used: true, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, ext_id: null }
export default {
dicts: ['is_used'],
name: 'MdPbMeasureunit',
@@ -140,29 +141,29 @@ export default {
},
// 改变状态
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.unit_name + ', 是否继续？', '提示', {
this.$confirm('此操作将改变'+ data.unit_name + '状态, 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudMdPbMeasureunit.edit(data).then(res => {
this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
if (data.is_used === '0') {
data.is_used = '1'
if (data.is_used === false) {
data.is_used = true
return
}
if (data.is_used === '1') {
data.is_used = '0'
if (data.is_used === true) {
data.is_used = false
}
})
}).catch(() => {
if (data.is_used === '0') {
data.is_used = '1'
if (data.is_used === false) {
data.is_used = true
return
}
if (data.is_used === '1') {
data.is_used = '0'
if (data.is_used === true) {
data.is_used = false
}
})
},

8
mes/qd/src/views/wms/masterdata_manage/master/storagevehicleinfo/index.vue
View File

@@ -156,7 +156,11 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
<el-table-column prop="storagevehicle_type_name" label="载具类型" />
<el-table-column prop="storagevehicle_type" label="载具类型">
<template slot-scope="scope">
{{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="storagevehicle_code" label="载具编码" >
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.row.storagevehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
@@ -166,7 +170,7 @@
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
:value="format_is_used(scope.row.is_used)"
v-model="scope.row.is_used"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.is_used)"

6
mes/qd/src/views/wms/masterdata_manage/pdm/workProcedure/index.vue
View File

@@ -103,8 +103,6 @@
<el-form-item label="是否关键工序" prop="is_keyworkprocedure">
<el-switch
v-model="form.is_keyworkprocedure"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
@@ -112,8 +110,6 @@
<el-form-item label="是否首道工序" prop="is_first">
<el-switch
v-model="form.is_first"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>
@@ -121,8 +117,6 @@
<el-form-item label="是否启用" prop="is_used">
<el-switch
v-model="form.is_used"
active-value="1"
inactive-value="0"
active-color="#13ce66"
inactive-color="#ff4949"
/>

34
mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue
View File

@@ -70,6 +70,32 @@
<div class="crud-opts2" style="margin-top: 30px;margin-bottom: 12px">
<span class="role-span">产品工艺路线明细</span>
</div>
<span v-if="crud.status.cu > 0 || crud.status.view > 0" class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
:disabled="crud.status.view > 0"
@click="insertLine"
>
新增一行
</el-button>
<el-button
slot="left"
class="filter-item"
type="danger"
icon="el-icon-close"
size="mini"
:disabled="crud.status.view > 0"
@click="delLine"
>
删除一行
</el-button>
</span>
<el-table
ref="table"
@@ -183,7 +209,13 @@ export default {
console.log(row)
this.form.material_code = row.material_code
this.form.material_id = row.material_id
}
},
insertLine() {
this.form.tableData.push({ workprocedure_no: '', is_check: '1' })
},
delLine() {
this.form.tableData.splice(-1)
},
}
}
</script>