From a7dd838394ad36cadb74d6bdd379d4d098ab8d8c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 三月 2025 09:13:57 +0800
Subject: [PATCH] 外购件检验提交
---
src/views/business/materialOrder/index.vue | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index a263e75..ebdbcc9 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -14,14 +14,19 @@
</el-input>
</el-form-item>
<el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch">
+ <el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
<el-form-item label="闆朵欢鎻忚堪" prop="partDesc">
- <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch">
+ <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
</el-input>
+ </el-form-item>
+ <el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
+ <el-select v-model="entity.inspectionType" clearable placeholder="璇烽�夋嫨" size="small" @change="refreshTable"
+ style="width: 100%">
+ <el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
+ <el-option label="鍖呮潗" value="鍖呮潗"></el-option>
+ </el-select>
</el-form-item>
<el-form-item>
<el-button v-if="tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
@@ -76,8 +81,7 @@
<!--寰呬笅鍗�-->
<div class="table">
<lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
- ref="tableData"
- :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
+ ref="tableData" :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
:tableLoading="tableLoading"></lims-table>
</div>
<!--妫�楠屼腑-->
@@ -178,7 +182,7 @@
</div>
</el-dialog>
<!-- <Inspection v-if="state>0" :key="InspectionKey" :inspectorList="inspectorList" :orderId="orderId"-->
- <!-- :sonLaboratory="'鍘熸潗鏂�'" :state="state"-->
+ <!-- :sonLaboratory="'鍘熻緟鏂�'" :state="state"-->
<!-- :typeSource="typeSource"-->
<!-- @goback="goback" @refreshView="refreshView"/>-->
</div>
@@ -205,7 +209,7 @@
updateEntrustCode
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
export default {
@@ -221,6 +225,7 @@
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -248,6 +253,7 @@
{
dataType: 'action',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '涓嬪崟',
@@ -263,13 +269,13 @@
this.exemption(row);
},
},
- {
- name: '鎾ら攢鎶ユ',
- type: 'text',
- clickFun: (row) => {
- this.cancelDeclare(row);
- },
- },
+ // {
+ // name: '鎾ら攢鎶ユ',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.cancelDeclare(row);
+ // },
+ // },
]
}
],
@@ -301,6 +307,7 @@
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -440,6 +447,7 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -539,7 +547,7 @@
tableData3: [],
tableLoading3: false,
column3: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode',width: "160px", },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -611,6 +619,7 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -663,7 +672,7 @@
tableData4: [],
tableLoading4: false,
column4: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode',width: "160px", },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
{
dataType: 'tag',
label: '妫�楠岀姸鎬�',
@@ -735,6 +744,7 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -839,7 +849,7 @@
tabIndex: 0,
multipleSelection: [],
active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪�
- orderType: 0, //0锛氬師鏉愭枡涓嬪崟锛�1锛氬搴︽楠屼笅鍗�
+ orderType: 0, //0锛氬師杈呮枡涓嬪崟锛�1锛氬搴︽楠屼笅鍗�
currentId: null,
btnLoading: false,
quashDialogVisible: false, // 鎾ら攢涓嬪崟鎻愰啋寮规
@@ -871,7 +881,7 @@
orderId: 0,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
InspectionKey: 1,
- typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟, 2: 閾滃崟涓濅笅鍗�
+ typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟, 2: 閾滃崟涓濅笅鍗�
InspectInfoDialog: false, // 鏁版嵁鏌ョ湅寮规
insInfo: {},
outLoading: false
@@ -883,7 +893,7 @@
mounted() {
this.refreshTable()
},
- activated () {
+ activated() {
this.refreshTable()
},
// 鏂规硶闆嗗悎
@@ -947,7 +957,7 @@
// 宸叉楠屾煡璇�
getIfsByOverList() {
this.tableLoading2 = true
- if(null != this.entity.date){
+ if (null != this.entity.date) {
this.entity.beginDeclareDate = this.entity.date[0]
this.entity.endDeclareDate = this.entity.date[1]
} else {
@@ -968,7 +978,7 @@
// 鏌ヨ瀛ｅ害妫�楠�
getIfsByQuarterList() {
this.tableLoading4 = true
- if(null != this.entity.date){
+ if (null != this.entity.date) {
this.entity.beginDeclareDate = this.entity.date[0]
this.entity.endDeclareDate = this.entity.date[1]
} else {
@@ -989,7 +999,7 @@
// 鍏ㄩ儴
getIfsByAllList() {
this.tableLoading3 = true
- if(null != this.entity.date){
+ if (null != this.entity.date) {
this.entity.beginDeclareDate = this.entity.date[0]
this.entity.endDeclareDate = this.entity.date[1]
} else {
@@ -1092,7 +1102,7 @@
this.$router.push({
path: "/inspectionTask/inspection",
query: {
- sonLaboratory: '鍘熸潗鏂�',
+ sonLaboratory: '鍘熻緟鏂�',
state: 3,
typeSource: this.insInfo.typeSource,
orderId: this.insInfo.enterOrderId,
@@ -1107,7 +1117,7 @@
this.$router.push({
path: "/inspectionTask/inspection",
query: {
- sonLaboratory: '鍘熸潗鏂�',
+ sonLaboratory: '鍘熻緟鏂�',
state: 3,
typeSource: this.insInfo.typeSource,
orderId: this.insInfo.quarterOrderId,
@@ -1312,7 +1322,7 @@
rawAllExport({ entity: entity }).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx');
+ this.$download.saveAs(blob, '鍘熻緟鏂欐娴嬩俊鎭鍑�.xlsx');
})
},
// 鎻愪氦淇敼濮旀墭缂栧彿淇℃伅
--
Gitblit v1.9.3