From 6afada5b2288dcad1edb2b7d6d05c6fac1195f8e Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 17:29:05 +0800
Subject: [PATCH] modified: src/api/quality/finishedProduct.js modified: src/api/quality/unqualifiedprocess.js modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/processconfiguration/index.vue
---
src/views/quality/processconfiguration/index.vue | 105 ++++++++++++++++++++++------------------------------
1 files changed, 44 insertions(+), 61 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 336e90a..906ad00 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -3,6 +3,8 @@
<basic-container>
<ttable
:table="table"
+ :resultData="resultData"
+ @change ="costPlannedAmountChange"
@handleSelectionChange="handleSelectionChange"
:uploadInfo="uploadInfo"
:isShowHide="true"
@@ -36,18 +38,34 @@
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
</el-radio-group>
</div>
- <div v-if="type === '浜у搧妫�楠�' || '杩囩▼妫�楠�'">
+ <div v-if="type === '浜у搧妫�楠�' ">
<el-radio-group v-model="checkList">
<el-radio label="杩斾慨">杩斾慨</el-radio>
<el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
<el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
<el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
-
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </el-radio-group>
+ </div>
+ <div v-if="type === '杩囩▼妫�楠�'">
+ <el-radio-group v-model="checkList">
+ <el-row>
+ <div style="padding: 20px;">
+ <el-radio label="杩斾慨">杩斾慨</el-radio>
+ <el-radio label="鎺ユ敹">鎺ユ敹</el-radio>
+ <el-radio label="闄嶇骇浣跨敤">闄嶇骇浣跨敤</el-radio>
+ <el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
+ </div>
+ <div style="padding: 20px;">
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
+ <el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
+ </div>
+ </el-row>
</el-radio-group>
</div>
</el-form>
<span slot="footer" >
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button @click="WayCancel()">鍙� 娑�</el-button>
<el-button type="primary" @click="WaySure()">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -56,20 +74,21 @@
</template>
<script>
-import { UnqualifiedList,pullInsUnapi,AuditSuggestion
-} from '@/api/quality/unqualifiedprocess'
+import { UnqualifiedList,pullInsUnapi,AuditSuggestion,UnqualifiedDisposal} from '@/api/quality/unqualifiedprocess'
import TableForm from './table-form'
import { mapGetters } from 'vuex'
// import { remote } from '@/api/admin/dict'
+import { transform } from '@/util/fileTransform'
import ttable from '@/views/common/ztt-table.vue'
export default {
data() {
return {
+ resultData:[],
checkList: "",
// WayIdea:'',
UserId:{},
type:'',
- ajaxFun: UnqualifiedList,
+ ajaxFun: UnqualifiedList,pullInsUnapi,AuditSuggestion,
addOrUpdateVisible: false,
multipleSelection: [],
typeOptions: [],
@@ -240,43 +259,13 @@
// 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: '瀵煎嚭',
type: 'primary',
- // fun: this.addOrUpdateHandle
+ fun: this.exportExcel
},
],
operator: [
@@ -317,31 +306,38 @@
},
computed: {
...mapGetters(['permissions'])
+
},
created() {
// this.getType()
},
methods: {
+ exportExcel(){
+ let queryParam=this.$refs.processconfiguration.getQueryParam();
+ delete queryParam.criteria
+ console.log(queryParam);
+ UnqualifiedDisposal(queryParam).then((res)=>{
+ transform(res)
+ })
+ },
//瀹℃牳缁撴灉
AuditResult(row){
- console.log(row);
this.UserId = row.id
this.type = row.type
this.dialogVisible = true;
- console.log(row.type);
- // setTimeout(() => {
- // if (this.type === 鍘熸潗鏂欐楠�) {
- // return
- // } else
- // if (this.type === 浜у搧妫�楠�) {
- // }
- // }, 100)
+
+ },
+ WayCancel(){
+ this.dialogVisible = false
+ this.checkList = null
+ this.WayIdea = null
},
WaySure(){
AuditSuggestion({id:this.UserId,way:this.checkList}).then(
res =>{
this.checkList = null
this.WayIdea = null
+ this.$refs.processconfiguration.refreshData()
;})
this.dialogVisible = false
},
@@ -350,6 +346,7 @@
console.log(row.id);
pullInsUnapi({id:row.id}).then(res =>{
console.log(res);
+ this.$refs.processconfiguration.refreshData()
})
},
@@ -375,23 +372,9 @@
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()
+ // this.$refs.processconfiguration.getDataList()
},
handleSelectionChange(val) {
// 澶氳閫変腑
--
Gitblit v1.9.3