From 72780bc3f7a4b47ebba49f28f4ffe219c14349ba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 01 七月 2026 11:16:01 +0800
Subject: [PATCH] 不合格处理调整&合格率统计调整
---
src/views/business/unpass/components/unPassDialog.vue | 5 ++
src/views/business/unpass/components/OAProcess.vue | 53 +++++++++++++++-----------
src/views/business/unpass/index-manage.vue | 53 ++++++++------------------
3 files changed, 51 insertions(+), 60 deletions(-)
diff --git a/src/views/business/unpass/components/OAProcess.vue b/src/views/business/unpass/components/OAProcess.vue
index 53b774d..4f31879 100644
--- a/src/views/business/unpass/components/OAProcess.vue
+++ b/src/views/business/unpass/components/OAProcess.vue
@@ -67,6 +67,7 @@
{
id: 1,
name: "1妫�楠屽憳",
+ classType: '-1',
info: "",
infoTitle:"涓嶅悎鏍兼儏鍐垫弿杩�:",
time: "",
@@ -77,6 +78,7 @@
{
id: 2,
name: "2妫�娴嬩富绠＄‘璁�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -87,6 +89,7 @@
{
id: 3,
name: "3鐗╂祦閮ㄧ‘璁�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -97,6 +100,7 @@
{
id: 4,
name: "4浜у搧宸ョ▼甯堝鐞嗘剰瑙�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -107,6 +111,7 @@
{
id: 5,
name: "5.鎬诲伐鎴栬�呭壇缁忕悊鐨勫鐞嗘剰瑙�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -117,6 +122,7 @@
{
id: 6,
name: "6璐ㄩ噺閮ㄥ鐞嗘剰瑙�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -127,6 +133,7 @@
{
id: 7,
name: "7璐ㄩ噺閮ㄧ粡鐞�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -137,6 +144,7 @@
{
id: 8,
name: "8鏍哥畻鍛�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -147,6 +155,7 @@
{
id: 9,
name: "9鐗╂祦閮ㄧ储璧旂粨鏋�",
+ classType: '-1',
infoTitle:"澶勭悊鎰忚:",
info: "",
time: "",
@@ -245,17 +254,17 @@
operation: "",
hasData: false,
},
- {
- id: 9,
- classType: "0",
- name: "6褰掓。锛堜竴绫讳笉鍚堟牸锛�",
- info: "",
- infoTitle:"澶勭悊鎰忚:",
- time: "",
- operator: "",
- operation: "",
- hasData: false,
- },
+ // {
+ // id: 9,
+ // classType: "0",
+ // name: "6褰掓。锛堜竴绫讳笉鍚堟牸锛�",
+ // info: "",
+ // infoTitle:"澶勭悊鎰忚:",
+ // time: "",
+ // operator: "",
+ // operation: "",
+ // hasData: false,
+ // },
{
id: 10,
classType: "1",
@@ -267,17 +276,17 @@
operation: "",
hasData: false,
},
- {
- id: 11,
- classType: "1",
- name: "7褰掓。锛堜簩绫讳笉鍚堟牸锛�",
- info: "",
- infoTitle:"澶勭悊鎰忚:",
- time: "",
- operator: "",
- operation: "",
- hasData: false,
- },
+ // {
+ // id: 11,
+ // classType: "1",
+ // name: "7褰掓。锛堜簩绫讳笉鍚堟牸锛�",
+ // info: "",
+ // infoTitle:"澶勭悊鎰忚:",
+ // time: "",
+ // operator: "",
+ // operation: "",
+ // hasData: false,
+ // },
],
classType:null,
};
diff --git a/src/views/business/unpass/components/unPassDialog.vue b/src/views/business/unpass/components/unPassDialog.vue
index b6c79ae..12dca54 100644
--- a/src/views/business/unpass/components/unPassDialog.vue
+++ b/src/views/business/unpass/components/unPassDialog.vue
@@ -70,7 +70,7 @@
<el-row >
<el-col :span="12">
<el-form-item label="鍒嗙被" prop="classification">
- <el-select style="width:100%" v-model="unPassForm.classification" :disabled="type === 'view' || !unPassForm.id" size="small" placeholder="璇烽�夋嫨">
+ <el-select style="width:100%" v-model="unPassForm.classification" disabled size="small" placeholder="璇烽�夋嫨">
<el-option v-for="item in classificationOptions" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
@@ -247,6 +247,9 @@
this.$emit('resetForm')
}
this.handlunPassLoading = false
+ }).catch(error => {
+ console.error(error)
+ this.handlunPassLoading = false
})
} else {
console.log('error submit!!');
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index bac9723..35f81e2 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -69,11 +69,11 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="OA瀹℃牳鐘舵��" prop="operation">
+ <el-form-item label="OA瀹℃牳鐘舵��" prop="oaState">
<el-select
clearable
size="small"
- v-model="entity.operation"
+ v-model="entity.oaState"
style="width: 100%"
@change="refreshTable()"
>
@@ -159,7 +159,6 @@
:close-on-click-modal="false"
:visible.sync="insOrderVisible"
@closed="resetInsOrderForm"
- @open="getListData"
width="50%"
>
<el-row :gutter="20" style="margin-bottom: 10px">
@@ -185,9 +184,7 @@
:tableData="insOrderDataList"
:column="insOrderTableDataColumn"
:isSelection="true"
- :selectionSelectable="insOrderSelectable"
:handleSelectionChange="handlerSelection"
- :rowClassName="insOrderRowClassName"
@pagination="insOrderPageination"
:height="500"
:page="insOrderPage"
@@ -202,9 +199,7 @@
:tableData="wgInsOrderDataList"
:column="wgInsOrderTableDataColumn"
:isSelection="true"
- :selectionSelectable="insOrderSelectable"
:handleSelectionChange="handlerSelection"
- :rowClassName="insOrderRowClassName"
@pagination="wgInsOrderPageination"
:height="500"
:page="wgInsOrderPage"
@@ -248,8 +243,7 @@
deleteUnqualifiedHandler,
page,
pushOA,
- exportUnqualifiedHandler,
- getList
+ exportUnqualifiedHandler
} from "@/api/business/unqualifiedHandler";
import { transformExcel } from "@/utils/file";
export default {
@@ -546,7 +540,7 @@
supplierName: null,
feedbackDateTime: [],
materialProp: null,
- operation: null,
+ oaState: null,
},
tableData: [],
tableLoading: false,
@@ -572,16 +566,23 @@
{ label: "缂栧彿", prop: "no", width: "160px" },
{
label: "OA瀹℃牳鐘舵��",
- prop: "operation",
+ prop: "oaState",
width: "100px",
dataType: "tag",
formatData: (params) => {
+ if (params) {
+ this.dict.type.oa_workflow_state.forEach((item) => {
+ if (item.value == params) {
+ params = item.raw.dictLabel;
+ }
+ });
+ }
return params;
},
formatType: (params) => {
if (params) {
this.dict.type.oa_workflow_state.forEach((item) => {
- if (item.value === params) {
+ if (item.value == params) {
params = item.raw.listClass;
}
});
@@ -684,7 +685,7 @@
operation: [
{
name: (row) => {
- return row.requestId !== null && row.operation === "閫�鍥�"
+ return row.requestId !== null && row.oaState === 4
? "閲嶆柊鎻愪氦"
: "鎻愪氦OA";
},
@@ -693,7 +694,7 @@
this.openOA(row);
},
disabled: (row, index) => {
- return row.requestId !== null && row.operation !== "閫�鍥�"; // 鏈塺equestId璇存槑宸茬粡鎻愪氦杩嘜A锛屼笉鍙啀娆℃彁浜�
+ return row.requestId !== null && row.oaState !== 4; // 鏈塺equestId璇存槑宸茬粡鎻愪氦杩嘜A锛屼笉鍙啀娆℃彁浜�
},
},
{
@@ -710,7 +711,7 @@
this.deleteOA(row);
},
disabled: (row, index) => {
- return row.requestId !== null && row.operation !== "閫�鍥�"; // 鏈塺equestId璇存槑宸茬粡鎻愪氦杩嘜A锛屼笉鍙啀娆℃彁浜�
+ return row.requestId !== null && row.oaState !== 4; // 鏈塺equestId璇存槑宸茬粡鎻愪氦杩嘜A锛屼笉鍙啀娆℃彁浜�
},
},
],
@@ -738,28 +739,6 @@
this.refreshTable();
},
methods: {
- getListData(){
- getList().then(res => {
- this.insOrderIds = [];
- if(res.code === 200){
- this.insOrderIds = res.data;
- }
- }).catch(err => {
- console.error(err)
- })
- },
- insOrderSelectable(row) {
- const existsInMain = this.insOrderIds.some(
- (id) => id === row.enterOrderId
- );
- return !existsInMain;
- },
- insOrderRowClassName({ row }) {
- const existsInMain = this.insOrderIds.some(
- (id) => id === row.enterOrderId
- );
- return existsInMain ? "disabled-selection-row" : "";
- },
resetInsOrderForm() {
this.activeName = "raw";
this.insOrderDataList = [];
--
Gitblit v1.9.3