mt-fe-group/qms
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
‘937886381’
2023-07-11 08:47:44 +08:00
parent b5b6f94dbc
commit 9a6fb46e24
20 changed files with 456 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/modules/basic/components/control-add.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-07-06 15:25:10
* @LastEditTime: 2023-07-10 15:52:48
* @LastEditors: zhp
* @Description:
-->
@@ -13,8 +13,8 @@
<el-form-item prop="controlName" :label="$t('basic.name')">
<el-input v-model="dataForm.controlName" :placeholder="$t('basic.name')"></el-input>
</el-form-item>
<el-form-item prop="specification" :label="$t('basic.specification')">
<el-input v-model="dataForm.specification" :placeholder="$t('basic.specification')"></el-input>
<el-form-item prop="specifications" :label="$t('basic.specification')">
<el-input v-model="dataForm.specifications" :placeholder="$t('basic.specification')"></el-input>
</el-form-item>
<el-form-item prop="incomingInspection" :label="$t('basic.stock')">
<el-switch v-model="dataForm.incomingInspection" :active-value="1" :inactive-value="0">
@@ -38,6 +38,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="remark" :label="$t('basic.remark')">
<el-input v-model="dataForm.remark" :placeholder="$t('basic.remark')"></el-input>
</el-form-item>
</el-form>
</template>
@@ -71,7 +74,8 @@ export default {
incomingInspection: null,
outInspection: null,
processInspection: null,
specification:null
specifications: null,
remark:null
},
};
},

4
src/views/modules/basic/components/failureTypeSearch.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2023-01-04 10:29:40
* @LastEditors: zhp
* @LastEditTime: 2023-02-16 15:46:10
* @LastEditTime: 2023-07-10 15:41:53
* @Description:
-->
<template>
@@ -113,7 +113,7 @@ export default {
// })
// },
handleConditionSearch() {
this.$emit("successSubmit", this.dataForm.key);
this.$emit("successSubmit", this.dataForm)
},
// dataFormSubmitHandle: debounce(
// function () {

5
src/views/modules/basic/components/product-add.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-14 15:02:26
* @LastEditTime: 2023-06-30 08:57:14
* @LastEditTime: 2023-07-10 10:57:16
* @LastEditors: zhp
* @Description:
-->
@@ -59,7 +59,8 @@ export default {
productCode:null,
productName: null,
productTypeId:null,
productTypeStatus:null
productTypeStatus: null,
productSpecs:null
},
};
},

2
src/views/modules/basic/qmsCustomerType.vue
View File

@@ -241,7 +241,7 @@ export default {
this.getDataList();
break;
case "export":
this.exportHandle();
this.exportHandle()
break;
case "add":
this.addOrEditTitle = "新增";

5
src/views/modules/basic/qmsProduct.vue
View File

@@ -70,11 +70,6 @@ const tableProps = [
label: i18n.t('basic.InspectionStage'),
subcomponent: radio,
},
{
prop: "controlStatus",
label: i18n.t('basic.available'),
subcomponent: available,
},
{
prop: "remark",
label: i18n.t('schedule.remark'),

4
src/views/modules/basic/qmsProductType.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-21 14:30:17
* @LastEditTime: 2023-06-20 15:37:24
* @LastEditTime: 2023-07-10 15:38:11
* @LastEditors: zhp
* @Description:
-->
@@ -9,7 +9,7 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<SearchBar :formConfigs="formConfig" ref="ruleForm" @headBtnClick="buttonClick">
<el-badge :value="1" class="item">
<el-badge :value="3" class="item">
<el-button type="primary" size="small" @click="conditionSearch">条件搜索</el-button>
</el-badge>
</SearchBar>

72
src/views/modules/basic/qmsTeam.vue
View File

@@ -1,7 +1,7 @@
<!--
* @Author: zhp
* @Date: 2023-02-21 14:30:17
* @LastEditTime: 2023-06-26 15:32:36
* @LastEditTime: 2023-07-10 15:39:29
* @LastEditors: zhp
* @Description:
-->
@@ -60,7 +60,7 @@
<!-- <el-row slot="footer" type="flex" justify="end"> </el-row> -->
</base-dialog>
</div>
</el-col>""
</el-col>
</el-row>
</el-card>
</template>
@@ -163,8 +163,8 @@ export default {
},
{
type: "button",
btnName: "导出",
name: i18n.t('export'),
btnName: i18n.t('export'),
name: 'export',
color: "primary",
// plain: true,
},
@@ -256,37 +256,36 @@ export default {
// console.log(11111);
// this.conditionSearchSubmit();
},
exportHandle() {
this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }, {
...this.dataForm
}).then((res) => {
console.log(res)
// if (res !== 0) {
// return this.$message.error(res.msg)
// }
let fileName = ''
const contentDisposition = res.headers['content-disposition']
if (contentDisposition) {
const temp = res.headers['content-disposition']
.split(';')[1]
.split('=')[1]
// 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
fileName = decodeURI(temp)
console.log(temp)
}
const blob = new Blob([res.data])
const reader = new FileReader()
reader.readAsDataURL(blob)
reader.onload = (e) => {
const a = document.createElement('a')
a.download = fileName
a.href = e.target.result
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
}
}).catch(() => { })
},
// exportHandle() {
// console.log(1111)
// this.$http.get(this.urlOptions.exportURL, { responseType: 'blob' }).then((res) => {
// console.log(res)
// // if (res !== 0) {
// // return this.$message.error(res.msg)
// // }
// let fileName = ''
// const contentDisposition = res.headers['content-disposition']
// if (contentDisposition) {
// const temp = res.headers['content-disposition']
// .split(';')[1]
// .split('=')[1]
// // 对文件名乱码转义--【Node.js】使用iconv-lite解决中文乱码
// fileName = decodeURI(temp)
// console.log(temp)
// }
// const blob = new Blob([res.data])
// const reader = new FileReader()
// reader.readAsDataURL(blob)
// reader.onload = (e) => {
// const a = document.createElement('a')
// a.download = fileName
// a.href = e.target.result
// document.body.appendChild(a)
// a.click()
// document.body.removeChild(a)
// }
// }).catch(() => { })
// },
handleClick(val) {
console.log(val);
if (val.type === "delete") {
@@ -368,7 +367,7 @@ export default {
this.getDataList();
break;
case "export":
this.exportHandle();
this.exportHandle()
break;
case "add":
this.addOrEditTitle = "新增";
@@ -390,7 +389,6 @@ export default {
// this.$refs.palletTable1.setCurrent("palletTable", -1);
// break;
default:
console.log(val);
}
},
},