From ec8a0cdd8d529bd3354fd9204b42af622ac46905 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 01 十一月 2023 14:16:45 +0800
Subject: [PATCH] s
---
src/api/quality/unqualifiedprocess.js | 24 +++
src/views/quality/processconfiguration/index.vue | 354 +++++++++++++++++++++++++++++++++++++++-----------
public/index.html | 3
3 files changed, 301 insertions(+), 80 deletions(-)
diff --git a/public/index.html b/public/index.html
index df31d71..69894b1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -34,6 +34,8 @@
</head>
<body>
+ <script src="https://cdn.staticfile.org/FileSaver.js/2014-11-29/FileSaver.min.js"></script>
+<script src="https://cdn.staticfile.org/xlsx/0.18.2/xlsx.full.min.js"></script>
<noscript>
<strong
>寰堟姳姝夛紝濡傛灉娌℃湁 JavaScript 鏀寔锛岀綉绔欏皢涓嶈兘姝ｅ父宸ヤ綔銆傝鍚敤娴忚鍣ㄧ殑
@@ -57,6 +59,7 @@
</div>
</div>
<!-- built files will be auto injected -->
+
<script
src="<%= BASE_URL %>cdn/axios/1.0.0/axios.min.js"
charset="utf-8"
diff --git a/src/api/quality/unqualifiedprocess.js b/src/api/quality/unqualifiedprocess.js
index 07f5917..a0bda0f 100644
--- a/src/api/quality/unqualifiedprocess.js
+++ b/src/api/quality/unqualifiedprocess.js
@@ -1,5 +1,29 @@
import request from '@/router/axios'
+export function UnqualifiedList(query) {
+ return request({
+ url: '/mes/qualityInspectUnaccepted/page',
+ method: 'get',
+ params: query
+ })
+}
+
+export function pullInsUnapi(query) {
+ return request({
+ url: '/mes/qualityInspectUnaccepted/pullInsUn',
+ method: 'post',
+ params: query
+ })
+}
+
+// export function pullInsi(query) {
+// return request({
+// url: '/mes/qualityInspectUnaccepted/getResult',
+// method: 'post',
+// params: query
+// })
+// }
+
export function fetchListUnqualifiedProcess(query) {
return request({
url: '/mes/unqualifiedProcess/page',
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 6302a67..d8f82bc 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -19,23 +19,47 @@
ref="addOrUpdate"
@refreshDataList="getData"
></table-form>
+ <table></table>
</basic-container>
+ <div>
+ <el-dialog title="鏈�缁堝缃剰瑙�" :visible.sync="dialogVisible" width="30%">
+ <el-form label-width="120px">
+ <div>
+ <el-form-item label="鏈�缁堝缃剰瑙侊細">
+ <el-input type="textarea" :rows="3" placeholder="璇疯緭鍏ュ唴瀹�" v-model="WayIdea" />
+ </el-form-item>
+ <el-checkbox-group v-model="checkList">
+ <el-checkbox label="杩斾慨"></el-checkbox>
+ <el-checkbox label="鎹㈣揣"></el-checkbox>
+ <el-checkbox label="閫�璐�"></el-checkbox>
+ <el-checkbox label="浣滃簾"></el-checkbox>
+ <el-checkbox label="璁╂鎺ユ敹"></el-checkbox>
+ <el-checkbox label="闄嶇骇浣跨敤"></el-checkbox>
+ </el-checkbox-group>
+ </div>
+ </el-form>
+ <span slot="footer" >
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="WaySure">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
</div>
</template>
<script>
-import {
- getqualityUnqualifiedConfiguration,
- delqualityUnqualifiedConfiguration
+import { UnqualifiedList,pullInsUnapi,
} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
-import { remote } from '@/api/admin/dict'
+// import { remote } from '@/api/admin/dict'
import ttable from '@/views/common/ztt-table.vue'
export default {
data() {
return {
- ajaxFun: getqualityUnqualifiedConfiguration,
+ checkList: [],
+ WayIdea:'',
+ ajaxFun: UnqualifiedList,
addOrUpdateVisible: false,
multipleSelection: [],
typeOptions: [],
@@ -45,6 +69,7 @@
isShow: false,
url: ''
},
+ dialogVisible: false,
prelang: 'operation',
options: {
height: 300, // 榛樿楂樺害-涓轰簡琛ㄥご鍥哄畾
@@ -56,7 +81,7 @@
multiSelect: true, //
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
- isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+ isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
@@ -66,111 +91,280 @@
data: [],
// 鏍囬
column: [
- // 缂栧彿
+ // 浜у搧澶х被
{
minWidth: '140',
- prop: 'workShop',
- label: '杞﹂棿',
- sort: true,
+ prop: 'type',
+ label: '妫�楠岀被鍨�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ formatter: this.materialTypeList,
+ optList: () => {
+ return this.materialType
+ // render: { fun: this.addOrUpdateHandle }
+ }
+ },
+ // 浜у搧鍚嶇О
+ {
+ minWidth: '140',
+ prop: 'material',
+ label: '浜у搧鍚嶇О',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
},
- // 浜у搧绫诲瀷
- {
- minWidth: '120',
- prop: 'type',
- label: '浜у搧绫诲瀷',
- sort: true,
+ // 瑙勬牸鍨嬪彿
+ {
+ minWidth: '140',
+ prop: 'specs',
+ label: '瑙勬牸鍨嬪彿',
isTrue: true,
isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatType,
- optList: () => {
- return this.typeOptions
- }
+ searchInfoType: 'text',
},
- // 澶勭悊鏂瑰紡
- {
- minWidth: '200',
- prop: 'processMode',
- label: '澶勭悊鏂瑰紡',
- sort: true,
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatProcessMode,
- optList: () => {
- return this.processModeOptions
- }
- },
- // 鍙戣捣浜�
- // {
- // minWidth: '200',
- // prop: 'originator',
- // label: '鍙戣捣浜�',
- // sort: true,
- // isTrue: true,
- // isSearch: true,
- // searchInfoType: 'text'
- // },
- // 瀹℃牳浜�
{
minWidth: '140',
- prop: 'examiner',
- label: '瀹℃牳浜�',
- sort: true,
+ prop: 'materialCode',
+ label: '浜у搧缂栧彿',
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
+ searchInfoType: 'text',
},
- // 澶勭悊浜�
- {
- minWidth: '120',
- prop: 'handler',
- label: '澶勭悊浜�',
- sort: true,
+ // 涓嶅悎鏍煎搧鏁伴噺
+ {
+ minWidth: '140',
+ prop: 'number',
+ label: '涓嶅悎鏍煎搧鏁伴噺',
isTrue: true,
isSearch: true,
- searchInfoType: 'text'
- }
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '140',
+ prop: 'reason',
+ label: '鐜拌薄鎻忚堪',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ // 澶勭悊鎰忚
+ {
+ minWidth: '140',
+ prop: 'way',
+ label: '澶勭悊鎰忚',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'faultyMaterials',
+ label: '鏄惁鐟曠柕',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ formatter: this.flaw,
+ optList: () => {
+ return this.insStateList
+ }
+ },
+ // 鐢宠浜�
+ {
+ minWidth: '140',
+ prop: 'createUser',
+ label: '鐢宠浜�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ // 鏃ユ湡
+ {
+ minWidth: '130',
+ width: '150',
+ prop: 'dealTime',
+ label: '瀹℃牳鏃堕棿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'datetimerange',
+ formatter: this.formatDateTime,
+ },
+ {
+ minWidth: '120',
+ prop: 'state',
+ label: '鐘舵��',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ formatter: this.formatInsState,
+ optList: () => {
+ return this.StateList
+ }
+ },
+ // {
+ // minWidth: '120',
+ // prop: '',
+ // label: '浜у搧鍚嶇О',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatType,
+ // optList: () => {
+ // return this.typeOptions
+ // }
+ // },
+ // 澶勭悊鏂瑰紡
+ // {
+ // minWidth: '200',
+ // prop: 'processMode',
+ // label: '澶勭悊鏂瑰紡',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'select',
+ // formatter: this.formatProcessMode,
+ // optList: () => {
+ // return this.processModeOptions
+ // }
+ // },
+ //鍙戣捣浜�
+ // {
+ // minWidth: '200',
+ // prop: 'originator',
+ // label: '鍙戣捣浜�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // 瀹℃牳浜�
+ // {
+ // minWidth: '140',
+ // prop: 'examiner',
+ // label: '瀹℃牳浜�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+ // 澶勭悊浜�
+ // {
+ // minWidth: '120',
+ // prop: 'handler',
+ // label: '澶勭悊浜�',
+ // sort: true,
+ // isTrue: true,
+ // isSearch: true,
+ // searchInfoType: 'text'
+ // },
+
],
toolbar: [
{
- text: '鏂板',
+ text: '瀵煎嚭',
type: 'primary',
- fun: this.addOrUpdateHandle
- }
+ // fun: this.addOrUpdateHandle
+ },
],
operator: [
+ // {
+ // text: '鍒犻櫎',
+ // type: 'text',
+ // size: 'small',
+ // fun: this.deleteHandle
+ // },
{
- text: '鍒犻櫎',
+ text: '鎻愪氦瀹℃牳',
type: 'text',
size: 'small',
- fun: this.deleteHandle
+ fun: this.Submitreview
+ },
+ {
+ text: '瀹℃牳缁撴灉',
+ type: 'text',
+ size: 'small',
+ fun: this.AuditResult
}
],
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
- width: 100,
+ width: 150,
minWidth: 100
}
- }
+ },
+ materialType: [{label:'鍘熸潗鏂欐楠�',value:'鍘熸潗鏂欐楠�'},{label:'杩囩▼妫�楠�',value:'杩囩▼妫�楠�'},{label:'璐ㄩ噺妫�楠�',value:'璐ㄩ噺妫�楠�'}],
+ StateList: [{label:'鍏ㄩ儴',value:''},{label:'宸叉彁浜ゅ鏍�',value:'1'},{label:'寰呭鐞�',value:'0'},{label:'宸插鐞�',value:'2'}],
+ insStateList: [{label:'鍏朵粬',value:''},{label:'鐟曠柕',value:'1'}],
}
},
components: {
+ ttable,
TableForm,
- ttable
},
computed: {
...mapGetters(['permissions'])
},
created() {
- this.getType()
+ // this.getType()
},
methods: {
+ //瀹℃牳缁撴灉
+ AuditResult(){
+ this.dialogVisible = true
+ },
+ WaySure(row){
+ let aa = this.checkList
+ let bb = this.WayIdea
+ console.log(aa,bb);
+ this.dialogVisible = false
+ },
+ //鎻愪氦瀹℃牳
+ Submitreview(row){
+ console.log(row.id);
+ pullInsUnapi({id:row.id}).then(res =>{
+ console.log(res);
+ })
+ },
+
+ //鐘舵��
+ formatInsState(row, column, cellValue){
+ if(cellValue != undefined || cellValue != null){
+ if(cellValue == 0){
+ return "<span style='color:#E84738;'>寰呭鐞�</span>"
+ }
+ if(cellValue == 1){
+ return "<span style='color:#34BD66;'>宸叉彁浜ゅ鏍�</span>"
+ }
+ if(cellValue == 2){
+ return "<span style='color:#34BD66;'>宸插鐞�</span>"
+ }
+ }
+ },
+ flaw(row, column, cellValue){
+ if(cellValue != undefined || cellValue != null){
+ if(cellValue == 1){
+ return "<span style='color:#E84738;'>鐟曠柕鍝�</span>"
+ }
+ return "<span style='color:#34BD66;'></span>"
+ }
+ },
+ // materialTypeList(row, column, cellValue){
+ // if(cellValue != undefined || cellValue != null){
+ // if(cellValue == 鍘熸潗鏂欐楠�){
+ // return "<span style='color:#E84738;'>鍘熸潗鏂欐楠�</span>"
+ // }
+ // if(cellValue == 杩囩▼妫�楠�){
+ // return "<span style='color:#34BD66;'>杩囩▼妫�楠�</span>"
+ // }
+ // if(cellValue == 璐ㄩ噺妫�楠�){
+ // return "<span style='color:#34BD66;'>璐ㄩ噺妫�楠�</span>"
+ // }
+ // }
+ // },
+
// 鑾峰彇鏁版嵁鍒楄〃
getData() {
this.$refs.processconfiguration.getDataList()
@@ -202,18 +396,18 @@
})
return cellValue
},
- getType() {
- remote('unqualified_handle_type').then((response) => {
- if (response.data.code === 0) {
- this.typeOptions = response.data.data
- }
- })
- remote('unqualified_process_mode').then((response) => {
- if (response.data.code === 0) {
- this.processModeOptions = response.data.data
- }
- })
- },
+ // getType() {
+ // remote('unqualified_handle_type').then((response) => {
+ // if (response.data.code === 0) {
+ // this.typeOptions = response.data.data
+ // }
+ // })
+ // remote('unqualified_process_mode').then((response) => {
+ // if (response.data.code === 0) {
+ // this.processModeOptions = response.data.data
+ // }
+ // })
+ // },
// 鍒犻櫎
deleteHandle(row) {
this.$confirm('鏄惁纭鍒犻櫎杞﹂棿涓猴細' + row.workShop, '鎻愮ず', {
--
Gitblit v1.9.3