From f24b25731e8f1c42c9d123327cfe3453e18b3fd1 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 01 四月 2025 09:02:57 +0800
Subject: [PATCH] 用户管理和外购件调整
---
src/views/business/materialOrder/index.vue | 411 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 331 insertions(+), 80 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index c8e8854..7d9ba95 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -5,46 +5,51 @@
<el-form :model="entity" ref="entity" size="small" :inline="true">
<el-form-item label="鎵瑰彿" prop="updateBatchNo">
<el-input v-model="entity.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
- <el-form-item label="濮旀墭缂栧彿" prop="entrustCode">
+ <el-form-item label="濮旀墭缂栧彿" prop="entrustCode" v-if="tabIndex !== 0">
<el-input v-model="entity.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
<el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="entity.partNo" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ <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="refreshTable">
- </el-input>
+ <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"
+ <el-button v-if="tabIndex === 1 || tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
:icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
@click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
- <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
+ <el-button size="mini" type="primary" @click="goSearch">鏌ヨ</el-button>
<el-button size="mini" @click="refresh()">閲嶇疆</el-button>
+ </el-form-item>
+ <el-form-item label="闆朵欢鎻忚堪" prop="partDesc" v-if="more">
+ <el-input v-model="entity.partDesc" clearable placeholder="璇疯緭鍏�" size="small" @keyup.enter.native="goSearch">
+ </el-input>
</el-form-item>
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-input v-model="entity.supplierName" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍨嬪彿" prop="sampleModel"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-input v-model="entity.sampleModel" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
+ @keyup.enter.native="goSearch">
</el-input>
</el-form-item>
<el-form-item label="妫�楠岀姸鎬�" prop="inspectStatus"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
- <el-select v-model="entity.inspectStatus" clearable size="small" @change="refreshTable()">
+ <el-select v-model="entity.inspectStatus" clearable size="small" @change="goSearch">
<el-option v-for="(a, i) in inspectStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
</el-select>
</el-form-item>
@@ -59,8 +64,11 @@
<div class="table-tab">
<div>
<ul class="tab">
- <li v-for="(m, i) in tabList" :key="m.value" :class="{ active: m.value === tabIndex }" @click="handleTab(m)">
- {{ m.label }}</li>
+ <li :class="{ active: tabIndex === 0 }" @click="handleTab(0)">寰呬笅鍗�</li>
+ <li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">妫�楠屼腑</li>
+ <li :class="{ active: tabIndex === 2 }" @click="handleTab(2)">宸叉楠�</li>
+ <li :class="{ active: tabIndex === 4 }" @click="handleTab(4)">瀛ｅ害妫�楠�</li>
+ <li :class="{ active: tabIndex === 3 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(3)">鍏ㄩ儴</li>
</ul>
</div>
<div>
@@ -73,31 +81,32 @@
<!--寰呬笅鍗�-->
<div class="table">
<lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
- :height="'calc(100vh - 290px)'" key="tableData" :page="page" :tableLoading="tableLoading"></lims-table>
+ ref="tableData" :rowClassName="changeRowClass" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
+ :tableLoading="tableLoading"></lims-table>
</div>
<!--妫�楠屼腑-->
<div class="table">
<lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" :isSelection="true"
- :handleSelectionChange="selectMethod" @pagination="pagination1" :height="'calc(100vh - 290px)'"
- key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination1"
+ :height="'calc(100vh - 290px)'" key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
</div>
<!--宸叉楠�-->
<div class="table">
<lims-table :tableData="tableData2" :column="column2" v-if="tabIndex === 2" :isSelection="true"
- :handleSelectionChange="selectMethod" @pagination="pagination2" :height="'calc(100vh - 290px)'"
- key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination2"
+ :height="'calc(100vh - 290px)'" key="tableData2" :page="page2" :tableLoading="tableLoading2"></lims-table>
</div>
<!--鍏ㄩ儴-->
<div class="table">
<lims-table :tableData="tableData3" :column="column3" v-if="tabIndex === 3" :isSelection="true"
- :handleSelectionChange="selectMethod" @pagination="pagination3" :height="'calc(100vh - 290px)'"
- key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination3"
+ :height="'calc(100vh - 290px)'" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
</div>
<!--瀛ｅ害妫�楠�-->
<div class="table">
<lims-table :tableData="tableData4" :column="column4" v-if="tabIndex === 4" :isSelection="true"
- :handleSelectionChange="selectMethod" @pagination="pagination4" :height="'calc(100vh - 290px)'"
- key="tableData4" :page="page4" :tableLoading="tableLoading4"></lims-table>
+ :rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination4"
+ :height="'calc(100vh - 290px)'" key="tableData4" :page="page4" :tableLoading="tableLoading4"></lims-table>
</div>
</div>
</div>
@@ -105,8 +114,7 @@
<el-dialog :visible.sync="exemptionVisible" title="纭鍏嶆" width="42%">
<div style="display: flex">
<span style="width: 90px; line-height: 32px">瑙勬牸鍨嬪彿锛�</span>
- <el-input v-model="exemptionInfo.partDetail" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable"></el-input>
+ <el-input v-model="exemptionInfo.partDetail" clearable placeholder="璇疯緭鍏�" size="small"></el-input>
</div>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -117,8 +125,8 @@
</el-dialog>
<!-- 鎾ら攢鎶ユ -->
<el-dialog :visible.sync="declareDialogVisible" title="鎶ユ鎾ら攢" width="30%">
- <p style="font-size:16px;color:#333333">鎵瑰彿<span
- style="color:#34BD66">{{ this.insOrderRow.updateBatchNo }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span>
+ <p style="font-size:16px;color:#333333">鎵瑰彿<span style="color:#34BD66">{{ this.insOrderRow.updateBatchNo
+ }}</span>鐨勪俊鎭槸鍚�<span style="color: #FF4902">鎾ら攢鎶ユ</span>
</p>
<span slot="footer" class="dialog-footer">
<el-row>
@@ -174,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>
@@ -191,6 +199,7 @@
concessionRelease,
getIfsByAll,
getIfsByOver,
+ getIfsByQuarter,
getIfsByStateOne,
rawAllExport,
rawOrderRelease,
@@ -200,10 +209,11 @@
updateEntrustCode
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
+import { mapGetters } from "vuex";
// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
export default {
- name: "b1-material-inspection-order",
+ name: "MaterialOrder",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog },
data() {
@@ -215,6 +225,7 @@
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -241,8 +252,8 @@
{ label: '鎶ユ鏃堕棿', prop: 'declareDate' },
{
dataType: 'action',
- fixed: 'right',
label: '鎿嶄綔',
+ fixed: 'right',
operation: [
{
name: '涓嬪崟',
@@ -258,19 +269,19 @@
this.exemption(row);
},
},
- {
- name: '鎾ら攢鎶ユ',
- type: 'text',
- clickFun: (row) => {
- this.cancelDeclare(row);
- },
- },
+ // {
+ // name: '鎾ら攢鎶ユ',
+ // type: 'text',
+ // clickFun: (row) => {
+ // this.cancelDeclare(row);
+ // },
+ // },
]
}
],
page: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData1: [],
@@ -296,6 +307,7 @@
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -351,14 +363,54 @@
],
page1: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData2: [],
tableLoading2: false,
column2: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
- { label: '妫�楠岀姸鎬�', prop: 'inspectStatus' },
+ {
+ label: '濮旀墭缂栧彿',
+ prop: 'entrustCode',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "changeEntrustCode",
+ },
+ {
+ dataType: 'tag',
+ label: '妫�楠岀姸鎬�',
+ prop: 'inspectStatus',
+ formatData: (params) => {
+ if (params == 0) {
+ return '妫�楠屼腑'
+ } else if (params == 1) {
+ return '鍚堟牸'
+ } else if (params == 2) {
+ return '涓嶅悎鏍�'
+ } else if (params == 3) {
+ return '鏈笅鍗�'
+ } else if (params == 4) {
+ return '璁╂鏀捐'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 0) {
+ return 'warning'
+ } else if (params == 1) {
+ return 'success'
+ } else if (params == 2) {
+ return 'danger'
+ } else if (params == 3) {
+ return 'info'
+ } else if (params == 4) {
+ return ''
+ } else {
+ return null
+ }
+ }
+ },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
@@ -367,10 +419,35 @@
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
{ label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
{ label: '涓嶅悎鏍兼弿杩�', prop: 'unqualifiedDesc' },
- { label: '鍏嶆', prop: 'isExemption' },
- { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
+ {
+ dataType: 'tag',
+ label: '鍏嶆',
+ prop: 'isExemption',
+ formatData: (params) => {
+ if (params == 1) {
+ return '鍏嶆'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 1) {
+ return 'success'
+ } else {
+ return null
+ }
+ }
+ },
+ {
+ label: '鏍峰搧鍚嶇О',
+ prop: 'sampleName',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "selectAllByOne",
+ },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -464,14 +541,48 @@
],
page2: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData3: [],
tableLoading3: false,
column3: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
- { label: '妫�楠岀姸鎬�', prop: 'inspectStatus' },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
+ {
+ dataType: 'tag',
+ label: '妫�楠岀姸鎬�',
+ prop: 'inspectStatus',
+ formatData: (params) => {
+ if (params == 0) {
+ return '妫�楠屼腑'
+ } else if (params == 1) {
+ return '鍚堟牸'
+ } else if (params == 2) {
+ return '涓嶅悎鏍�'
+ } else if (params == 3) {
+ return '鏈笅鍗�'
+ } else if (params == 4) {
+ return '璁╂鏀捐'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 0) {
+ return 'warning'
+ } else if (params == 1) {
+ return 'success'
+ } else if (params == 2) {
+ return 'danger'
+ } else if (params == 3) {
+ return 'info'
+ } else if (params == 4) {
+ return ''
+ } else {
+ return null
+ }
+ }
+ },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
@@ -480,10 +591,35 @@
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
{ label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
{ label: '涓嶅悎鏍兼弿杩�', prop: 'unqualifiedDesc' },
- { label: '鍏嶆', prop: 'isExemption' },
- { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
+ {
+ dataType: 'tag',
+ label: '鍏嶆',
+ prop: 'isExemption',
+ formatData: (params) => {
+ if (params == 1) {
+ return '鍏嶆'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 1) {
+ return 'success'
+ } else {
+ return null
+ }
+ }
+ },
+ {
+ label: '鏍峰搧鍚嶇О',
+ prop: 'sampleName',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "selectAllByOne",
+ },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -530,14 +666,48 @@
],
page3: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
tableData4: [],
tableLoading4: false,
column4: [
- { label: '濮旀墭缂栧彿', prop: 'entrustCode' },
- { label: '妫�楠岀姸鎬�', prop: 'inspectStatus' },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
+ {
+ dataType: 'tag',
+ label: '妫�楠岀姸鎬�',
+ prop: 'inspectStatus',
+ formatData: (params) => {
+ if (params == 0) {
+ return '妫�楠屼腑'
+ } else if (params == 1) {
+ return '鍚堟牸'
+ } else if (params == 2) {
+ return '涓嶅悎鏍�'
+ } else if (params == 3) {
+ return '鏈笅鍗�'
+ } else if (params == 4) {
+ return '璁╂鏀捐'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 0) {
+ return 'warning'
+ } else if (params == 1) {
+ return 'success'
+ } else if (params == 2) {
+ return 'danger'
+ } else if (params == 3) {
+ return 'info'
+ } else if (params == 4) {
+ return ''
+ } else {
+ return null
+ }
+ }
+ },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
@@ -546,10 +716,35 @@
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
{ label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName' },
{ label: '涓嶅悎鏍兼弿杩�', prop: 'unqualifiedDesc' },
- { label: '鍏嶆', prop: 'isExemption' },
- { label: '鏍峰搧鍚嶇О', prop: 'sampleName' },
+ {
+ dataType: 'tag',
+ label: '鍏嶆',
+ prop: 'isExemption',
+ formatData: (params) => {
+ if (params == 1) {
+ return '鍏嶆'
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 1) {
+ return 'success'
+ } else {
+ return null
+ }
+ }
+ },
+ {
+ label: '鏍峰搧鍚嶇О',
+ prop: 'sampleName',
+ width: "160px",
+ dataType: "link",
+ linkMethod: "selectAllByOne",
+ },
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ { label: '鎶ユ绫诲瀷', prop: 'inspectionType' },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -613,7 +808,7 @@
],
page4: {
total: 0,
- size: 10,
+ size: 20,
current: 1
},
entity: {
@@ -654,7 +849,7 @@
tabIndex: 0,
multipleSelection: [],
active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪�
- orderType: 0, //0锛氬師鏉愭枡涓嬪崟锛�1锛氬搴︽楠屼笅鍗�
+ orderType: 0, //0锛氬師杈呮枡涓嬪崟锛�1锛氬搴︽楠屼笅鍗�
currentId: null,
btnLoading: false,
quashDialogVisible: false, // 鎾ら攢涓嬪崟鎻愰啋寮规
@@ -686,17 +881,32 @@
orderId: 0,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
InspectionKey: 1,
- typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟, 2: 閾滃崟涓濅笅鍗�
+ typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟, 2: 閾滃崟涓濅笅鍗�
InspectInfoDialog: false, // 鏁版嵁鏌ョ湅寮规
insInfo: {},
outLoading: false
}
},
+ computed: {
+ ...mapGetters(['nickName'])
+ },
mounted() {
+ this.refreshTable()
+ },
+ activated() {
this.refreshTable()
},
// 鏂规硶闆嗗悎
methods: {
+ // 鐐瑰嚮鏌ヨ鍥炶皟
+ goSearch() {
+ this.page.current = 1
+ this.page1.current = 1
+ this.page2.current = 1
+ this.page3.current = 1
+ this.page4.current = 1
+ this.refreshTable()
+ },
// 鏌ヨ鍥炶皟
refreshTable() {
if (this.tabIndex === 0) {
@@ -719,7 +929,7 @@
// 寰呬笅鍗曟煡璇�
getPurchaseOrderList() {
this.tableLoading = true
- const params = { ...this.entity, isInspect: 1, state: 0 }
+ const params = { ...this.entity, isInspect: 1, state: 0, ...this.page }
getWarehouseSubmit(params).then(res => {
this.tableLoading = false
if (res.code === 200) {
@@ -733,7 +943,7 @@
// 妫�楠屼腑鏌ヨ
getIfsByStateOneList() {
this.tableLoading1 = true
- const params = { ...this.entity, orderState: 1, state: 1 }
+ const params = { ...this.entity, orderState: 1, state: 1, ...this.page1 }
getIfsByStateOne(params).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -747,7 +957,14 @@
// 宸叉楠屾煡璇�
getIfsByOverList() {
this.tableLoading2 = true
- const params = { ...this.entity, orderState: 4, state: 2 }
+ if (null != this.entity.date) {
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, orderState: 4, state: 2, ...this.page2 }
getIfsByOver(params).then(res => {
this.tableLoading2 = false
if (res.code === 200) {
@@ -761,8 +978,15 @@
// 鏌ヨ瀛ｅ害妫�楠�
getIfsByQuarterList() {
this.tableLoading4 = true
- const params = { ...this.entity }
- getIfsByOver(params).then(res => {
+ if (null != this.entity.date) {
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, ...this.page4 }
+ getIfsByQuarter(params).then(res => {
this.tableLoading4 = false
if (res.code === 200) {
this.tableData4 = res.data.records
@@ -775,7 +999,14 @@
// 鍏ㄩ儴
getIfsByAllList() {
this.tableLoading3 = true
- const params = { ...this.entity, isInspect: 1 }
+ if (null != this.entity.date) {
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, isInspect: 1, ...this.page3 }
getIfsByAll(params).then(res => {
this.tableLoading3 = false
if (res.code === 200) {
@@ -818,10 +1049,7 @@
if (row.userName) {
inspectorList = row.userName.split(',')
}
- let user = JSON.parse(localStorage.getItem('user'))
- if (user) {
- inspectorList.push(user.name)
- }
+ inspectorList.push(this.nickName)
this.inspectorList = inspectorList
this.insInfo = row
this.InspectInfoDialog = true
@@ -868,16 +1096,34 @@
}).catch(() => { })
},
viewInsInfo0() {
- this.state = 3;
- this.typeSource = this.insInfo.typeSource
- this.orderId = this.insInfo.enterOrderId
+ let inspectorList = []
+ inspectorList.push(this.nickName)
this.InspectInfoDialog = false
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ sonLaboratory: '鍘熻緟鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.enterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
},
viewInsInfo1() {
- this.state = 3;
- this.typeSource = this.insInfo.typeSource
- this.orderId = this.insInfo.quarterOrderId
+ let inspectorList = []
+ inspectorList.push(this.nickName)
this.InspectInfoDialog = false
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ sonLaboratory: '鍘熻緟鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.quarterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
},
goback() {
this.state = 0
@@ -1023,7 +1269,7 @@
repealQuarterRawOrder({ quarterOrderId: this.insOrderRow.quarterOrderId }).then(res => {
if (res.code === 200) {
this.$message.success('鎾ら攢鎴愬姛')
- this.refreshTable('page')
+ this.refreshTable()
}
})
}).catch(() => { })
@@ -1073,11 +1319,10 @@
let entity = this.tabIndex === 3 ? { ...this.entity, isInspect: 2 } : { ...this.entity, state: 2, orderState: 4, }
delete entity.orderBy
this.outLoading = true
- rawAllExport({entity: entity}).then(res => {
+ rawAllExport({ entity: entity }).then(res => {
this.outLoading = false
- this.$message.success('瀵煎嚭鎴愬姛')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx');
+ const blob = new Blob([res], { type: 'application/octet-stream' });
+ this.$download.saveAs(blob, '鍘熻緟鏂欐娴嬩俊鎭鍑�.xlsx');
})
},
// 鎻愪氦淇敼濮旀墭缂栧彿淇℃伅
@@ -1101,13 +1346,19 @@
},
// 鍒囨崲涓嬪崟tab琛ㄦ牸
handleTab(m) {
- this.tabIndex = m.value;
+ this.tabIndex = m;
this.refreshTable()
},
// 琛ㄦ牸閫夋嫨鏂规硶
selectMethod(val) {
this.multipleSelection = val
},
+ changeRowClass({ row, rowIndex }) {
+ if (row.isFirst == 1) {
+ return 'highlight-danger-row-border'
+ }
+ return ''
+ },
},
}
</script>
--
Gitblit v1.9.3