diff --git a/src/router/index.js b/src/router/index.js
index b1c448c..3069d4b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,6 +20,7 @@ const _import = require('./import-' + process.env.NODE_ENV)
const globalRoutes = [
{ path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } },
{ path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
+ { path: '/image', component: _import('common/image'), name: 'image', meta: { title: '预览' } },
]
// 主入口路由(需嵌套上左右整体布局)
diff --git a/src/views/common/image.vue b/src/views/common/image.vue
new file mode 100644
index 0000000..25bf0e8
--- /dev/null
+++ b/src/views/common/image.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue
index c2e47e2..1249787 100644
--- a/src/views/modules/common/Chooselist.vue
+++ b/src/views/modules/common/Chooselist.vue
@@ -179,7 +179,7 @@ export default {
if (this.param3) {
sql += " and active like '%" + this.param3 + "%'"
}
- if (this.tagNo <1000 && this.tagNo !== 93){
+ if (this.tagNo <1000 && this.tagNo !== 212){
if (this.param4) {
sql += " and site=" + this.param4
}
diff --git a/src/views/modules/common/Chooselist_eam.vue b/src/views/modules/common/Chooselist_eam.vue
index beb04de..b6260f5 100644
--- a/src/views/modules/common/Chooselist_eam.vue
+++ b/src/views/modules/common/Chooselist_eam.vue
@@ -207,7 +207,7 @@ export default {
if (this.param6 ) {
sql += " and active like '%" + this.param6 + "%'"
}
- if (this.tagNo <= 500 && this.tagNo !== 93) { // 判断site和bu
+ if (this.tagNo <= 500 && this.tagNo !== 212) { // 判断site和bu
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 + "')"
}
diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue
index 261f45c..fa0f6b2 100644
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@@ -170,22 +170,29 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
工作文件
@@ -195,14 +202,14 @@
-
+
-
-
+
+
@@ -232,7 +239,7 @@
责任人
-
+
明细导入
@@ -580,6 +587,12 @@
subDetailUpload
},
watch: {
+ detailData: {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+ }
+ },
detailList: {
deep: true,
handler: function (newV, oldV) {
@@ -1334,7 +1347,9 @@
operator: '',
operatorName: '',
responsiblePerson: '',
- responsiblePersonName: ''
+ responsiblePersonName: '',
+ passQty: '',
+ notPassQty: ''
},
detailInformationFlag: false,
detailList: [],
@@ -1356,7 +1371,9 @@
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
- subDetailList: []
+ subDetailList: [],
+ passQty: '',
+ notPassQty: ''
},
// 子明细数据对象
tableData: [],
@@ -1485,6 +1502,12 @@
},
methods: {
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
// 数据采集
dataAcquisition () {
this.loadFlag = true
@@ -1730,6 +1753,8 @@
}
if (type === 1) {
this.detailData.unqualifiedQty = val
+ } else if (type === 2) {
+ this.detailData.passQty = val
}
},
@@ -1879,6 +1904,16 @@
this.$message.warning(`暂不支持预览${row.fileType.toLowerCase()}文件`)
return;
}
+ // downLoadObjectFile(row).then(({data}) => {
+ // const blob = new Blob([data], { type: type });
+ // // 创建URL来生成预览
+ // const fileURL = URL.createObjectURL(blob);
+ // // alert(blob)
+ // localStorage.setItem("imgUrl",fileURL)
+ // window.open(window.location.origin+"/#/image",'_blank')
+ // // 在新标签页中打开文件预览
+ // // const newTab = window.open(fileURL, '_blank')
+ // })
downLoadObjectFile(row).then(({data}) => {
const blob = new Blob([data], { type: type });
// 创建URL来生成预览
@@ -2031,6 +2066,8 @@
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
+ this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+ this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
// this.saveInformationData.subDetailList = this.acquisitionList
saveFQASDetailedRecord(this.saveInformationData).then(({data}) => {
if (data && data.code === 0) {
@@ -2105,6 +2142,8 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index f705902..696dd12 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -308,10 +308,10 @@
-
+
-
+
@@ -334,7 +334,7 @@
-
+
@@ -2214,6 +2214,12 @@
},
methods: {
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
// 数据采集
dataAcquisition () {
this.loadFlag = true
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 4f85187..a8ece47 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -38,11 +38,14 @@
-
+
+
+
+
@@ -68,16 +71,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -197,10 +200,10 @@
-
+
-
+
@@ -226,7 +229,7 @@
-
+
@@ -675,6 +678,7 @@
poItemNo: '',
orderType: '',
states: ['未开始','待检验'],
+ warehouseName: ''
},
pageIndex: 1,
pageSize: 20,
@@ -815,6 +819,24 @@
fixed: '',
columnWidth: 120,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 301006,
+ serialNumber: '301006Table1WarehouseName',
+ tableId: "301006Table1",
+ tableName: "IQC检验记录表",
+ columnProp: 'warehouseName',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '仓库',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 200,
+ },
{
userId: this.$store.state.user.name,
functionId: 301006,
@@ -849,7 +871,7 @@
sortLv: 0,
status: true,
fixed: '',
- columnWidth: 200,
+ columnWidth: 350,
},
{
userId: this.$store.state.user.name,
@@ -1668,7 +1690,7 @@
this.getSiteAndBuByUserName()
this.favoriteIsOk()
this.disposalMeasuresSearch()
- this.orderTypeSearch()
+ //this.orderTypeSearch()
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
@@ -1681,6 +1703,12 @@
},
methods: {
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
// 数据采集
dataAcquisition () {
this.loadFlag = true
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 6717cd7..140f5b1 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -30,12 +30,12 @@
-
-
-
-
-
-
+
+
+ {{buttons.site||'工厂'}}
+
+
+
@@ -62,13 +62,13 @@
-
+