wilson
/
xz-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-06-17 系统部署

master
fengyuan_yang 2 years ago
parent
469911f444
commit
647c215be4
13 changed files with 2692 additions and 251 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/index.js
  2. 1
      index.html
  3. 12
      src/api/qc/qc.js
  4. 2
      src/views/common/login.vue
  5. 6
      src/views/main-navbar.vue
  6. 4
      src/views/modules/common/Chooselist_eam.vue
  7. 2547
      src/views/modules/qc/FQASResultEntry.vue
  8. 123
      src/views/modules/qc/IQCResultEntry.vue
  9. 122
      src/views/modules/qc/qcItem.vue
  10. 84
      src/views/modules/qc/qcPartAttribute.vue
  11. 34
      src/views/modules/qc/qcTemplate.vue
  12. 2
      src/views/modules/sys/menu-add-or-update.vue

4
config/index.js
View File

@ -13,7 +13,7 @@ module.exports = {
// 代理列表, 是否开启代理通过[./dev.env.js]配置 // 代理列表, 是否开启代理通过[./dev.env.js]配置
proxyTable: devEnv.OPEN_PROXY === false ? {} : { proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': { '/proxyApi': {
target: 'http://127.0.0.1:9000',
target: 'http://127.0.0.1:9090',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
// 把 /proxyApi 替换成 / // 把 /proxyApi 替换成 /
@ -24,7 +24,7 @@ module.exports = {
// Various Dev Server settings // Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST host: 'localhost', // can be overwritten by process.env.HOST
port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
port: 8003, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true, autoOpenBrowser: true,
errorOverlay: true, errorOverlay: true,
notifyOnErrors: true, notifyOnErrors: true,

1
index.html
View File

@ -4,7 +4,6 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Checkpoint MES</title>
<title>旭捷 MES</title> <title>旭捷 MES</title>
<!-- <% if (process.env.NODE_ENV === 'production') { %>--> <!-- <% if (process.env.NODE_ENV === 'production') { %>-->
<!-- 生产环境 --> <!-- 生产环境 -->

12
src/api/qc/qc.js
View File

@ -168,5 +168,15 @@ export const actionIPQCInspection = data => createAPI(`/pms/qc/actionIPQCInspect
export const actionFQCInspection = data => createAPI(`/pms/qc/actionFQCInspection`,'post',data) export const actionFQCInspection = data => createAPI(`/pms/qc/actionFQCInspection`,'post',data)
export const dataAcquisition = data => createAPI(`/pms/qc/dataAcquisition`,'post',data) export const dataAcquisition = data => createAPI(`/pms/qc/dataAcquisition`,'post',data)
// ============================================= FQAS ==================================================
export const qcFQASInspectionSearch = data => createAPI(`/pms/qc/qcFQASInspectionSearch`,'post',data)
export const actionFQASInspection = data => createAPI(`/pms/qc/actionFQASInspection`,'post',data)
export const fqasDetailSearch = data => createAPI(`/pms/qc/fqasDetailSearch`,'post',data)
export const selectFQASSubDetailedRecord = data => createAPI(`/pms/qc/selectFQASSubDetailedRecord`,'post',data)
export const saveFQASSubDetailed = data => createAPI(`/pms/qc/saveFQASSubDetailed`,'post',data)
export const checkFQASIsSubmit = data => createAPI(`/pms/qc/checkFQASIsSubmit`,'post',data)
export const saveFQASDetailedRecord = data => createAPI(`/pms/qc/saveFQASDetailedRecord`,'post',data)
export const saveFQASSubmitResult = data => createAPI(`/pms/qc/saveFQASSubmitResult`,'post',data)
export const fqasRecordDelete = data => createAPI(`/pms/qc/fqasRecordDelete`,'post',data)
export const fqasRecordOverLoad = data => createAPI(`/pms/qc/fqasRecordOverLoad`,'post',data)

2
src/views/common/login.vue
View File

@ -6,7 +6,7 @@
<div style="width: 20%"> <div style="width: 20%">
<div style="height: 27vh;"> <div style="height: 27vh;">
<div style="text-align: right;padding: 0px 40px"> <div style="text-align: right;padding: 0px 40px">
<img width="50%" height="72" style="object-fit: contain" src="~@/assets/img/ckp.png">
<img width="50%" height="72" style="object-fit: contain" src="~@/assets/img/avatar.png">
</div> </div>
</div> </div>
<div style="padding: 10px 40px"> <div style="padding: 10px 40px">

6
src/views/main-navbar.vue
View File

@ -56,8 +56,7 @@
<el-menu-item class="site-navbar__avatar" index="4"> <el-menu-item class="site-navbar__avatar" index="4">
<el-dropdown :show-timeout="0" placement="bottom"> <el-dropdown :show-timeout="0" placement="bottom">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<img src="~@/assets/img/ckp.png" :alt="userName">{{ userName }}
<!-- <img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}-->
<img src="~@/assets/img/avatar.png" :alt="userName">{{ userName }}
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item> <el-dropdown-item @click.native="logoutHandle()">退出</el-dropdown-item>
@ -76,8 +75,7 @@
<el-dialog append-to-body top="26vh" :show-close="false" :close-on-click-modal="true" v-drag :visible.sync="revisionModalFlag" width="335px"> <el-dialog append-to-body top="26vh" :show-close="false" :close-on-click-modal="true" v-drag :visible.sync="revisionModalFlag" width="335px">
<div slot="title" style="text-align: center"> <div slot="title" style="text-align: center">
<img src="~@/assets/img/ckp.png" style="width: 115px;height: 45px;vertical-align: middle;object-fit: contain;">
<!-- <img src="~@/assets/img/avatar.png" style="width: 115px;height: 45px;vertical-align: middle;object-fit: contain;">-->
<img src="~@/assets/img/avatar.png" style="width: 115px;height: 45px;vertical-align: middle;object-fit: contain;">
</div> </div>
<div style="display: flex;justify-content: space-between;"> <div style="display: flex;justify-content: space-between;">
<div class="aaa"> <div class="aaa">

4
src/views/modules/common/Chooselist_eam.vue
View File

@ -207,12 +207,12 @@ export default {
if (this.param6 ) { if (this.param6 ) {
sql += " and active like '%" + this.param6 + "%'" sql += " and active like '%" + this.param6 + "%'"
} }
if (this.tagNo <= 500 && this.tagNo !== 93) {
if (this.tagNo <= 500 && this.tagNo !== 93) { // 判断site和bu
if (this.param7) { if (this.param7) {
sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + " and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '" + this.param7 + "')" sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " + " and (site + '-' + bu_no) in (select (a.site + '-' + a.bu_no) from AccessBu as a left join eam_access_site as b on a.site = b.site and a.username = b.username where a.username = '" + this.param7 + "')"
} }
} }
if (this.tagNo > 500 && this.tagNo < 1000) {
if (this.tagNo > 500 && this.tagNo < 1000) { // 只判断site
if (this.param7) { if (this.param7) {
sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') " sql += " and site in (select site from eam_access_site where username = '" + this.param7 + "') "
} }

2547
src/views/modules/qc/FQASResultEntry.vue
File diff suppressed because it is too large
View File

123
src/views/modules/qc/IQCResultEntry.vue
View File

@ -27,22 +27,16 @@
<el-input v-model="searchData.poOrderNo" clearable style="width: 150px"></el-input> <el-input v-model="searchData.poOrderNo" clearable style="width: 150px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'单据行号'"> <el-form-item :label="'单据行号'">
<el-input v-model="searchData.poItemNo" clearable style="width: 75px"></el-input>
<el-input v-model="searchData.poItemNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 200px"></el-input>
<el-input v-model="searchData.partDesc" clearable style="width: 210px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList"> <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList">
<el-form-item :label="'PN'">
<el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'供应商'"> <el-form-item :label="'供应商'">
<el-input v-model="searchData.supplierDesc" clearable style="width: 200px"></el-input> <el-input v-model="searchData.supplierDesc" clearable style="width: 200px"></el-input>
</el-form-item> </el-form-item>
@ -197,23 +191,33 @@
<el-input v-model="detailData.partDesc" disabled style="width: 220px"></el-input> <el-input v-model="detailData.partDesc" disabled style="width: 220px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'计量单位'"> <el-form-item :label="'计量单位'">
<el-input v-model="detailData.umId" disabled style="width: 120px"></el-input>
<el-input v-model="detailData.umId" disabled style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'到货数量'"> <el-form-item :label="'到货数量'">
<el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 120px"></el-input>
<el-input class="numInput" v-model="detailData.rollQty" type="number" disabled style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'送检数量'"> <el-form-item :label="'送检数量'">
<el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 120px"></el-input>
<el-input class="numInput" v-model="detailData.rollCount" type="number" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'抽样数量'"> <el-form-item :label="'抽样数量'">
<el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 120px"></el-input>
<el-input class="numInput" v-model="detailData.samplingQty" type="number" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'不合格项目数量'"> <el-form-item :label="'不合格项目数量'">
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input> <el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input> <el-input class="numInput" v-else @input="handleInput(detailData.unqualifiedQty,1)" v-model="detailData.unqualifiedQty" type="number" style="width: 80px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '" style="margin-left: 38px">
<el-button v-if="detailData.submitFlag !== 'Y'" type="primary" :loading="loadFlag" @click="dataAcquisition">数据采集</el-button>
<el-form-item :label="'合格数量'">
<el-input class="numInput" v-if="detailData.submitFlag === 'Y'" v-model="detailData.passQty" disabled type="number" style="width: 80px"></el-input>
<el-input class="numInput" v-else @input="handleInput(detailData.passQty,2)" v-model="detailData.passQty" type="number" style="width: 80px"></el-input>
</el-form-item>
<el-form-item :label="'不合格数量'">
<el-input class="numInput" v-model="detailData.notPassQty" type="number" disabled style="width: 80px"></el-input>
</el-form-item>
<!-- <el-form-item :label="' '" style="margin-left: 38px">-->
<!-- <el-button v-if="detailData.submitFlag !== 'Y'" type="primary" :loading="loadFlag" @click="dataAcquisition">数据采集</el-button>-->
<!-- </el-form-item>-->
<el-form-item :label="' '" style="margin-left: 25px">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top"> <el-form :inline="true" label-position="top">
@ -228,8 +232,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="'质检备注'"> <el-form-item :label="'质检备注'">
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 280px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 280px"></el-input>
<el-input v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectionRemark" disabled style="width: 310px"></el-input>
<el-input v-else v-model="detailData.inspectionRemark" style="width: 310px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="检验员"> <el-form-item label="检验员">
<el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px"> <el-select v-if="detailData.submitFlag === 'Y'" v-model="detailData.inspectorNo" disabled placeholder="请选择" style="width: 100px">
@ -259,8 +263,7 @@
<span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span> <span v-else style="cursor: pointer" slot="label" @click="getResponsiblePersonList"><a>责任人</a></span>
<el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input> <el-input v-model="detailData.responsiblePersonName" readonly style="width: 224px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
<el-form-item :label="' '" style="margin-left: 20px">
<el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button> <el-button type="primary" icon="el-icon-upload" @click="subDetailUpload">明细导入</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -599,6 +602,12 @@
subDetailUpload subDetailUpload
}, },
watch: { watch: {
detailData: {
deep: true,
handler: function (newV, oldV) {
this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
}
},
detailList: { detailList: {
deep: true, deep: true,
handler: function (newV, oldV) { handler: function (newV, oldV) {
@ -646,8 +655,6 @@
endDate2: '', endDate2: '',
partNo:'', partNo:'',
partDesc:'', partDesc:'',
cinvSourceCode:'',
sku:'',
state: '', state: '',
inspectionResult: '', inspectionResult: '',
supplierDesc: '', supplierDesc: '',
@ -677,7 +684,6 @@
workOrderQuantity: '', workOrderQuantity: '',
reelNumber: '', reelNumber: '',
partNo: '', partNo: '',
cinvSourceCode:'',
rollingQuantity: '', rollingQuantity: '',
sampleQuantity: '', sampleQuantity: '',
detailCodeNo:'', detailCodeNo:'',
@ -836,42 +842,6 @@
fixed: '', fixed: '',
columnWidth: 150, columnWidth: 150,
}, },
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1SKU',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table1CinvSourceCode',
tableId: "301006Table1",
tableName: "IQC检验记录表",
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "center",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301006, functionId: 301006,
@ -1234,6 +1204,24 @@
fixed: '', fixed: '',
columnWidth: 150, columnWidth: 150,
}, },
{
userId: this.$store.state.user.name,
functionId: 301006,
serialNumber: '301006Table2DefectLevelDescription',
tableId: "301006Table2",
tableName: "检验单明细表",
columnProp: 'defectLevelDescription',
headerAlign: "center",
align: "center",
columnLabel: '缺陷等级名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150,
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301006, functionId: 301006,
@ -1435,8 +1423,6 @@
inspectionNo: '', inspectionNo: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode:'',
sku:'',
rollQty: '', rollQty: '',
samplingQty: '', samplingQty: '',
unqualifiedQty: 0, unqualifiedQty: 0,
@ -1455,14 +1441,15 @@
operator: '', operator: '',
operatorName: '', operatorName: '',
responsiblePerson: '', responsiblePerson: '',
responsiblePersonName: ''
responsiblePersonName: '',
passQty: '',
notPassQty: ''
}, },
detailInformationFlag: false, detailInformationFlag: false,
detailList: [], detailList: [],
saveInformationData: { saveInformationData: {
site: '', site: '',
buNo: '', buNo: '',
cinvSourceCode:'',
inspectionNo:'', inspectionNo:'',
disposalMeasures: '', disposalMeasures: '',
disposalRemark: '', disposalRemark: '',
@ -1476,12 +1463,13 @@
poItemNo: '', poItemNo: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
sku: '',
operator: '', operator: '',
operatorName: '', operatorName: '',
responsiblePerson: '', responsiblePerson: '',
responsiblePersonName: '', responsiblePersonName: '',
subDetailList: []
subDetailList: [],
passQty: '',
notPassQty: ''
}, },
// 子明细数据对象 // 子明细数据对象
tableData: [], tableData: [],
@ -1849,6 +1837,8 @@
} }
if (type === 1) { if (type === 1) {
this.detailData.unqualifiedQty = val this.detailData.unqualifiedQty = val
} else if (type === 2) {
this.detailData.passQty = val
} }
}, },
@ -2115,10 +2105,11 @@
this.saveInformationData.poItemNo = this.detailData.poItemNo this.saveInformationData.poItemNo = this.detailData.poItemNo
this.saveInformationData.partNo = this.detailData.partNo this.saveInformationData.partNo = this.detailData.partNo
this.saveInformationData.partDesc = this.detailData.partDesc this.saveInformationData.partDesc = this.detailData.partDesc
this.saveInformationData.sku = this.detailData.sku
this.saveInformationData.operator = this.detailData.operator this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList)) this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.passQty = this.detailData.passQty
this.saveInformationData.notPassQty = this.detailData.notPassQty
// this.saveInformationData.subDetailList = this.acquisitionList // this.saveInformationData.subDetailList = this.acquisitionList
saveIQCDetailedRecord(this.saveInformationData).then(({data}) => { saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
@ -2177,8 +2168,6 @@
this.detailData.inspectionNo = row.inspectionNo this.detailData.inspectionNo = row.inspectionNo
this.detailData.partNo = row.partNo this.detailData.partNo = row.partNo
this.detailData.partDesc = row.partDesc this.detailData.partDesc = row.partDesc
this.detailData.cinvSourceCode = row.cinvSourceCode
this.detailData.sku = row.sku
this.detailData.rollQty = row.rollQty this.detailData.rollQty = row.rollQty
this.detailData.samplingQty = row.samplingQty this.detailData.samplingQty = row.samplingQty
this.detailData.unqualifiedQty = row.unqualifiedQty this.detailData.unqualifiedQty = row.unqualifiedQty
@ -2197,6 +2186,8 @@
this.detailData.operatorName = row.operatorName this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.passQty = row.passQty
this.detailData.notPassQty = row.notPassQty
this.getInspectionFormData() this.getInspectionFormData()
this.inspectorSearch() this.inspectorSearch()
// this.acquisitionList = [] // this.acquisitionList = []

122
src/views/modules/qc/qcItem.vue
View File

@ -146,10 +146,10 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="methodNo" :rules="rules.methodNoType"> <el-form-item prop="methodNo" :rules="rules.methodNoType">
<span slot="label" @click="queryMethodList"><a>方法编码</a></span>
<span slot="label" @click="queryMethodList"><a>检验方法编码</a></span>
<el-input v-model="modalData.methodNo" style="width: 143px"></el-input> <el-input v-model="modalData.methodNo" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="方法名称" prop="methodName" :rules="rules.methodNameType">
<el-form-item label="检验方法名称" prop="methodName" :rules="rules.methodNameType">
<el-input v-model="modalData.methodName" disabled style="width: 300px"></el-input> <el-input v-model="modalData.methodName" disabled style="width: 300px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -171,6 +171,15 @@
<el-input v-model="modalData.samplingLevelDesc" disabled style="width: 300px"></el-input> <el-input v-model="modalData.samplingLevelDesc" disabled style="width: 300px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item prop="defectLevelCode" :rules="rules.defectLevelCodeType">
<span slot="label" @click="getBaseList(211)"><a herf="#">缺陷等级编码</a></span>
<el-input v-model="modalData.defectLevelCode" style="width: 143px"></el-input>
</el-form-item>
<el-form-item label="缺陷等级名称" prop="defectLevelDescription" :rules="rules.defectLevelDescriptionType">
<el-input v-model="modalData.defectLevelDescription" disabled style="width: 300px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="参照值"> <el-form-item label="参照值">
<el-input v-model="modalData.defaultValue" style="width: 143px"></el-input> <el-input v-model="modalData.defaultValue" style="width: 143px"></el-input>
@ -191,35 +200,6 @@
<el-form-item label="抽样比例%"> <el-form-item label="抽样比例%">
<el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input> <el-input v-model="modalData.defaultSamplingProportion" type="number" style="width: 143px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" " style="margin-left: 34px;margin-top: -5px">
<el-checkbox v-model="modalData.collectionFlag" true-label="Y">采集标记</el-checkbox>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="采集数据来源">
<el-select multiple v-model="modalData.collectionSourceList" style="width: 160px">
<el-option label="值0" value="value0"></el-option>
<el-option label="值1" value="value1"></el-option>
<el-option label="值2" value="value2"></el-option>
<el-option label="值3" value="value3"></el-option>
<el-option label="值4" value="value4"></el-option>
<el-option label="值5" value="value5"></el-option>
<el-option label="值6" value="value6"></el-option>
<el-option label="值7" value="value7"></el-option>
<el-option label="值8" value="value8"></el-option>
<el-option label="值9" value="value9"></el-option>
</el-select>
</el-form-item>
<el-form-item label="采集数据方式">
<el-select multiple v-model="modalData.collectionMethodList" style="width: 160px">
<el-option label="PLC" value="plc"></el-option>
<el-option label="文件" value="file"></el-option>
<el-option label="图片" value="image"></el-option>
</el-select>
</el-form-item>
<el-form-item label="采集条件路径">
<el-input v-model="modalData.collectionCondition" style="width: 107px"></el-input>
</el-form-item>
</el-form> </el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center"> <el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="saveData()">保存</el-button> <el-button type="primary" @click="saveData()">保存</el-button>
@ -231,10 +211,10 @@
<el-dialog title="检验方法清单" :close-on-click-modal="false" v-drag :visible.sync="methodModelFlag" width="520px"> <el-dialog title="检验方法清单" :close-on-click-modal="false" v-drag :visible.sync="methodModelFlag" width="520px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="methodData"> <el-form :inline="true" label-position="top" :model="methodData">
<el-form-item :label="'方法编码'">
<el-form-item :label="'检验方法编码'">
<el-input v-model="methodData.methodNo" clearable style="width: 120px"></el-input> <el-input v-model="methodData.methodNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'方法名称'">
<el-form-item :label="'检验方法名称'">
<el-input v-model="methodData.methodName" clearable style="width: 120px"></el-input> <el-input v-model="methodData.methodName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item :label="'检验类型'">--> <!-- <el-form-item :label="'检验类型'">-->
@ -373,12 +353,8 @@
samplingLevelNo: '', samplingLevelNo: '',
samplingLevelDesc: '', samplingLevelDesc: '',
defaultSamplingProportion: '', defaultSamplingProportion: '',
collectionFlag: '',
collectionSource: '',
collectionSourceList: [],
collectionMethod: '',
collectionMethodList: [],
collectionCondition: ''
defectLevelCode: '',
defectLevelDescription: ''
}, },
// 检验项目展示标头 // 检验项目展示标头
columnList: [ columnList: [
@ -749,7 +725,21 @@
message: ' ', message: ' ',
trigger: ['blur','change'] trigger: ['blur','change']
} }
]
],
defectLevelCodeType:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
defectLevelDescriptionType:[
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
}, },
options: [], options: [],
methodData: { methodData: {
@ -871,6 +861,16 @@
this.$refs.baseList.init(val, strVal, conSql) this.$refs.baseList.init(val, strVal, conSql)
} }
} }
if (val === 211) {
strVal = this.modalData.defectLevelCode
if (this.modalData.bu === null || this.modalData.bu === '') {
this.$message.warning("请选择BU!")
return
} else {
conSql = " and bu_no = '" + this.modalData.bu.split('_')[1] + "'"
this.$refs.baseList.init(val, strVal, conSql)
}
}
if (val === 1036) { if (val === 1036) {
strVal = this.modalData.methodNo strVal = this.modalData.methodNo
this.$refs.baseList.init(val, strVal) this.$refs.baseList.init(val, strVal)
@ -917,6 +917,10 @@
this.modalData.samplingLevelNo = val.sampling_level_no this.modalData.samplingLevelNo = val.sampling_level_no
this.modalData.samplingLevelDesc = val.sampling_level_desc this.modalData.samplingLevelDesc = val.sampling_level_desc
} }
if (this.tagNo === 211) {
this.modalData.defectLevelCode = val.defect_level_code
this.modalData.defectLevelDescription = val.defect_level_description
}
}, },
// 获取数据列表 // 获取数据列表
@ -955,12 +959,8 @@
samplingLevelNo: '', samplingLevelNo: '',
samplingLevelDesc: '', samplingLevelDesc: '',
defaultSamplingProportion: '', defaultSamplingProportion: '',
collectionFlag: '',
collectionSource: '',
collectionSourceList: [],
collectionMethod: '',
collectionMethodList: [],
collectionCondition: ''
defectLevelCode: '',
defectLevelDescription: ''
} }
this.modalDisableFlag = false this.modalDisableFlag = false
this.modalFlag = true this.modalFlag = true
@ -990,12 +990,8 @@
samplingLevelNo: row.samplingLevelNo, samplingLevelNo: row.samplingLevelNo,
samplingLevelDesc: row.samplingLevelDesc, samplingLevelDesc: row.samplingLevelDesc,
defaultSamplingProportion: row.defaultSamplingProportion, defaultSamplingProportion: row.defaultSamplingProportion,
collectionFlag: row.collectionFlag,
collectionSource: row.collectionSource,
collectionSourceList: row.collectionSource == null || row.collectionSource === '' ? [] : row.collectionSource.split(','),
collectionMethod: row.collectionMethod,
collectionMethodList: row.collectionMethod == null || row.collectionMethod === '' ? [] : row.collectionMethod.split(','),
collectionCondition: row.collectionCondition
defectLevelCode: row.defectLevelCode,
defectLevelDescription: row.defectLevelDescription
} }
this.modalDisableFlag = true this.modalDisableFlag = true
this.modalFlag = true this.modalFlag = true
@ -1048,32 +1044,14 @@
this.$message.warning('请选择检验方法！') this.$message.warning('请选择检验方法！')
return return
} }
// if ((this.modalData.samplingProgrammeNo === '' || this.modalData.samplingProgrammeNo == null) && (this.modalData.itemSamplingQuantity === '' || this.modalData.itemSamplingQuantity == null) && (this.modalData.defaultSamplingProportion === '' || this.modalData.defaultSamplingProportion == null)) {
// this.$message.warning('抽样方案、抽样数量、抽样比例至少选择一项！')
// return
// }
if ((this.modalData.samplingProgrammeNo !== '' && this.modalData.samplingProgrammeNo != null) && (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null)) { if ((this.modalData.samplingProgrammeNo !== '' && this.modalData.samplingProgrammeNo != null) && (this.modalData.samplingLevelNo === '' || this.modalData.samplingLevelNo == null)) {
this.$message.warning('请选择检验水平！') this.$message.warning('请选择检验水平！')
return return
} }
if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionSourceList == null || this.modalData.collectionSourceList.length === 0)) {
this.$message.warning('请选择采集数据来源！')
return
}
if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionMethodList == null || this.modalData.collectionMethodList.length === 0)) {
this.$message.warning('请选择采集数据方式！')
return
}
if (this.modalData.collectionFlag === 'Y' && this.modalData.collectionSourceList.length !== this.modalData.collectionMethodList.length) {
this.$message.warning('采集数据来源和方式不对应！')
return
}
if (this.modalData.collectionFlag === 'Y' && (this.modalData.collectionCondition == null || this.modalData.collectionCondition === '')) {
this.$message.warning('请填写采集条件路径！')
if (this.modalData.defectLevelCode === '' || this.modalData.defectLevelCode == null) {
this.$message.warning('请选择缺陷等级！')
return return
} }
this.modalData.collectionSource = this.modalData.collectionSourceList.join(',')
this.modalData.collectionMethod = this.modalData.collectionMethodList.join(',')
if (this.modalData.flag === '1') { if (this.modalData.flag === '1') {
qcItemSave(this.modalData).then(({data}) => { qcItemSave(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

84
src/views/modules/qc/qcPartAttribute.vue
View File

@ -23,15 +23,9 @@
<el-form-item :label="'物料编码'"> <el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'SKU'">
<el-input v-model="searchData.sku" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input> <el-input v-model="searchData.partDesc" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'PN'">
<el-input v-model="searchData.cinvSourceCode" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'类别名称'"> <el-form-item :label="'类别名称'">
<el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input> <el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -613,12 +607,6 @@
<el-form-item label="物料名称"> <el-form-item label="物料名称">
<el-input v-model="partDetailData.partDesc" clearable style="width: 137px"></el-input> <el-input v-model="partDetailData.partDesc" clearable style="width: 137px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="SKU">
<el-input v-model="partDetailData.sku" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item label="PN">
<el-input v-model="partDetailData.cinvSourceCode" clearable style="width: 100px"></el-input>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="searchPartInfo()" style="margin-top: 24px">查询</el-button> <el-button type="primary" @click="searchPartInfo()" style="margin-top: 24px">查询</el-button>
</el-form-item> </el-form-item>
@ -628,7 +616,6 @@
:data="partInfoList" :data="partInfoList"
@row-dblclick="getRowData1" @row-dblclick="getRowData1"
border border
v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
prop="partNo" prop="partNo"
@ -642,18 +629,6 @@
align="center" align="center"
label="物料名称"> label="物料名称">
</el-table-column> </el-table-column>
<el-table-column
prop="sku"
header-align="center"
align="center"
label="SKU">
</el-table-column>
<el-table-column
prop="cinvSourceCode"
header-align="center"
align="center"
label="PN">
</el-table-column>
</el-table> </el-table>
<el-footer style="height:40px;margin-top: 10px;text-align:center"> <el-footer style="height:40px;margin-top: 10px;text-align:center">
<el-button type="primary" @click="partDisableFlag = false">关闭</el-button> <el-button type="primary" @click="partDisableFlag = false">关闭</el-button>
@ -718,8 +693,6 @@
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
partNo: '', partNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
familyID: '', familyID: '',
familyName: '', familyName: '',
buDesc: '', buDesc: '',
@ -742,8 +715,6 @@
partDesc: '', partDesc: '',
familyID: '', familyID: '',
familyName: '', familyName: '',
cinvSourceCode: '',
sku: '',
umid: '', umid: '',
supplierNo: '', supplierNo: '',
supplierDesc: '', supplierDesc: '',
@ -759,8 +730,6 @@
partNo: '', partNo: '',
attributeNo: '', attributeNo: '',
partDesc: '', partDesc: '',
cinvSourceCode: '',
sku: '',
attributeType: 'A', attributeType: 'A',
inspectionTypeNo: '', inspectionTypeNo: '',
templateId: '', templateId: '',
@ -804,24 +773,6 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003Table1SKU',
tableId: "301003Table1",
tableName: "物料属性设置表",
columnWidth: 146,
columnProp: 'sku',
headerAlign: "center",
align: "center",
columnLabel: 'SKU',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301003, functionId: 301003,
@ -840,24 +791,6 @@
status: true, status: true,
fixed: '', fixed: '',
}, },
{
userId: this.$store.state.user.name,
functionId: 301003,
serialNumber: '301003Table1CinvSourceCode',
tableId: "301003Table1",
tableName: "物料属性设置表",
columnWidth: 144,
columnProp: 'cinvSourceCode',
headerAlign: "center",
align: "left",
columnLabel: 'PN',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301003, functionId: 301003,
@ -1006,7 +939,6 @@
detailModelFlag: false, detailModelFlag: false,
detailList: [], detailList: [],
dataList: [], dataList: [],
dataListLoading: false,
// 展示列集 // 展示列集
columnDetailList: [ columnDetailList: [
{ {
@ -1301,8 +1233,6 @@
partNo: '', partNo: '',
partDesc: '', partDesc: '',
seqNo: '', seqNo: '',
sku: '',
cinvSourceCode:'',
}, },
authSearch: false, authSearch: false,
authSave: false, authSave: false,
@ -1353,7 +1283,7 @@
searchPartInfo () { searchPartInfo () {
this.partDetailData.bu = this.modalData.bu this.partDetailData.bu = this.modalData.bu
if (!this.partDetailData.partNo && !this.partDetailData.partDesc && !this.partDetailData.sku && !this.partDetailData.cinvSourceCode) {
if (!this.partDetailData.partNo && !this.partDetailData.partDesc) {
this.partInfoList = [] this.partInfoList = []
this.partDisableFlag = true this.partDisableFlag = true
} }
@ -1452,8 +1382,6 @@
}, },
getRowData1 (row) { getRowData1 (row) {
this.modalData.sku = row.sku
this.modalData.cinvSourceCode = row.cinvSourceCode
this.modalData.partNo = row.partNo this.modalData.partNo = row.partNo
this.modalData.partDesc = row.partDesc this.modalData.partDesc = row.partDesc
this.partDisableFlag = false this.partDisableFlag = false
@ -1556,15 +1484,6 @@
this.$message.warning('请选择物料名称！') this.$message.warning('请选择物料名称！')
return return
} }
// let obj = document.getElementsByName('isExemptInspection')
// let s = ''
// for (let i = 0; i < obj.length; i++) {
// if (obj[i].checked) {
// s += obj[i].value + ','
// }
// }
// s = s.substring(0, s.length - 1)
// this.modalData.exemptInspection = s
if (this.modalData.flag === '1') { if (this.modalData.flag === '1') {
qcPartAttributeSave(this.modalData).then(({data}) => { qcPartAttributeSave(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
@ -2206,7 +2125,6 @@
partNo: '', partNo: '',
partDesc: '', partDesc: '',
seqNo: '', seqNo: '',
sku: '',
} }
this.partInfoList = [] this.partInfoList = []
}, },

34
src/views/modules/qc/qcTemplate.vue
View File

@ -567,7 +567,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableTemplateId',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 98, columnWidth: 98,
@ -585,7 +585,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableTemplateName',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -603,7 +603,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableSamplingProgrammeDesc',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -621,7 +621,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableSamplingLevelDesc',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -639,7 +639,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableInspectionCycle',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -657,7 +657,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableDefaultSamplingQuantity',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -675,7 +675,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableDefaultSamplingProportion',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -693,7 +693,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableAQL',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -711,7 +711,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableAC',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -729,7 +729,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableRE',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -747,7 +747,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableInspectionTypeName',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -765,7 +765,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableTemplateRemark',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -783,7 +783,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableTemplateVersion',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -801,7 +801,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableCreateTime',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -819,7 +819,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableCreateBy',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -837,7 +837,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableUpdateDate',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,
@ -855,7 +855,7 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 301008, functionId: 301008,
serialNumber: '301008TableItemNo',
serialNumber: '301008TableUpdateBy',
tableId: "301008Table", tableId: "301008Table",
tableName: "检验模板维护表", tableName: "检验模板维护表",
columnWidth: 84, columnWidth: 84,

2
src/views/modules/sys/menu-add-or-update.vue
View File

@ -241,7 +241,7 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/api/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`),
url: this.$http.adornUrl(`/sys/menu/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'menuId': this.dataForm.menuId, 'menuId': this.dataForm.menuId,

Write Preview
Loading…
Cancel
Save