From 057b700019dcfdde20e67d459f52e159d15d2c91 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:36:14 +0800
Subject: [PATCH] main.js调整
---
src/views/business/materialOrder/index.vue | 245 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 188 insertions(+), 57 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 7cb87e6..f4040a3 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -23,35 +23,42 @@
@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="goSearch">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鐗╂枡灞炴��" prop="materialProp">
+ <el-select clearable size="small" v-model="entity.materialProp" style="width: 100%">
+ <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"
+ :value="dict.value">
+ </el-option>
+ </el-select>
+ </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="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="goSearch">
+ <el-option v-for="(a, i) in inspectStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ユ鏃堕棿" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
+ <el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" @change="goSearch"
+ range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" value-format="yyyy-MM-dd">
+ </el-date-picker>
+ </el-form-item>
<el-form-item>
<el-button v-if="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="goSearch">鏌ヨ</el-button>
<el-button size="mini" @click="refresh()">閲嶇疆</el-button>
- </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="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="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="goSearch">
- <el-option v-for="(a, i) in inspectStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
- <el-date-picker v-model="entity.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" @change="goSearch"
- range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" value-format="yyyy-MM-dd">
- </el-date-picker>
</el-form-item>
</el-form>
</div>
@@ -67,7 +74,7 @@
</ul>
</div>
<div>
- <el-button v-show="tabIndex === 3 || tabIndex === 2" :loading="outLoading" size="small" type="primary"
+ <el-button v-show="tabIndex === 3" :loading="outLoading" size="small" type="primary"
@click="handleOut">瀵煎嚭</el-button>
<el-button v-if="tabIndex === 0" size="small" type="primary" @click="copper">閾滄潗鏂欎笅鍗�</el-button>
<el-button v-if="tabIndex !== 0" size="small" type="primary" @click="openPrint">鏍囩鎵撳嵃</el-button>
@@ -201,7 +208,8 @@
repealEnterRawOrder,
repealQuarterRawOrder,
revokeInspectionReport,
- updateEntrustCode
+ updateEntrustCode,
+ getOrderCountByIfsId
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit } from "@/api/business/materialInspection";
import {mapGetters} from "vuex";
@@ -211,15 +219,32 @@
name: "MaterialOrder",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog },
+ dicts: ['material_prop_type'],
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ materialProps: [],
tableData: [],
tableLoading: false,
column: [
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
+ {
+ label: '鐗╂枡灞炴��',
+ prop: 'materialProp',
+ formatData: (params) => {
+ if (!params) return null
+
+ for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+ const item = this.dict.type.material_prop_type[i]
+ if (item.value == params) {
+ return item.label
+ }
+ }
+ return null
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -239,7 +264,7 @@
}
}
},
- { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
+ { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'purQtyInStore' },
{ label: '鍗曚綅', prop: 'buyUnitMeas' },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
@@ -301,6 +326,21 @@
{ label: '妫�楠屼汉', prop: 'userName' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{
+ label: '鐗╂枡灞炴��',
+ prop: 'materialProp',
+ formatData: (params) => {
+ if (!params) return null
+
+ for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+ const item = this.dict.type.material_prop_type[i]
+ if (item.value == params) {
+ return item.label
+ }
+ }
+ return null
+ }
+ },
+ {
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
prop: 'isExpire',
@@ -319,7 +359,7 @@
}
}
},
- { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
+ { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'purQtyInStore' },
{ label: '鍗曚綅', prop: 'buyUnitMeas' },
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
{ label: '鎺ユ敹鏃堕棿', prop: 'receiverDate' },
@@ -404,7 +444,7 @@
}
},
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
- { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
+ { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'purQtyInStore' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
@@ -439,6 +479,21 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ {
+ label: '鐗╂枡灞炴��',
+ prop: 'materialProp',
+ formatData: (params) => {
+ if (!params) return null
+
+ for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+ const item = this.dict.type.material_prop_type[i]
+ if (item.value == params) {
+ return item.label
+ }
+ }
+ return null
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -590,7 +645,7 @@
}
},
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
- { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
+ { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'purQtyInStore' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
@@ -625,6 +680,21 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ {
+ label: '鐗╂枡灞炴��',
+ prop: 'materialProp',
+ formatData: (params) => {
+ if (!params) return null
+
+ for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+ const item = this.dict.type.material_prop_type[i]
+ if (item.value == params) {
+ return item.label
+ }
+ }
+ return null
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -714,7 +784,7 @@
}
},
{ label: '璁㈠崟鍙�', prop: 'orderNo' },
- { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'qtyArrived' },
+ { label: '鎶佃揪鐨勯噰璐暟閲�', prop: 'purQtyInStore' },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
@@ -749,6 +819,21 @@
},
{ label: '鏍峰搧鍨嬪彿', prop: 'sampleModel' },
{ label: '妫�楠屼汉', prop: 'userName' },
+ {
+ label: '鐗╂枡灞炴��',
+ prop: 'materialProp',
+ formatData: (params) => {
+ if (!params) return null
+
+ for (let i = 0; i < this.dict.type.material_prop_type.length; i++) {
+ const item = this.dict.type.material_prop_type[i]
+ if (item.value == params) {
+ return item.label
+ }
+ }
+ return null
+ }
+ },
{
dataType: 'tag',
label: '鐗╂枡绫诲瀷',
@@ -826,6 +911,7 @@
date: null,
beginDeclareDate: null,
endDeclareDate: null,
+ materialProp: null,
},
tabList: [
{
@@ -1108,31 +1194,57 @@
let inspectorList = []
inspectorList.push(this.nickName)
this.InspectInfoDialog = false
- this.$router.push({
- name: "Inspection",
- query: {
- sonLaboratory: '鍘熸潗鏂�',
- state: 3,
- typeSource: this.insInfo.typeSource,
- orderId: this.insInfo.enterOrderId,
- inspectorList: inspectorList,
- },
- })
+ if (this.checkPermi(['business:inspectionView'])) {
+ this.$router.push({
+ name: "InspectionView",
+ query: {
+ sonLaboratory: '鍘熸潗鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.enterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
+ } else {
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ sonLaboratory: '鍘熸潗鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.enterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
+ }
},
viewInsInfo1() {
let inspectorList = []
inspectorList.push(this.nickName)
this.InspectInfoDialog = false
- this.$router.push({
- name: "Inspection",
- query: {
- sonLaboratory: '鍘熸潗鏂�',
- state: 3,
- typeSource: this.insInfo.typeSource,
- orderId: this.insInfo.quarterOrderId,
- inspectorList: inspectorList,
- },
- })
+ if (this.checkPermi(['business:inspectionView'])) {
+ this.$router.push({
+ name: "InspectionView",
+ query: {
+ sonLaboratory: '鍘熸潗鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.quarterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
+ } else {
+ this.$router.push({
+ path: "/inspectionTask/inspection",
+ query: {
+ sonLaboratory: '鍘熸潗鏂�',
+ state: 3,
+ typeSource: this.insInfo.typeSource,
+ orderId: this.insInfo.quarterOrderId,
+ inspectorList: inspectorList,
+ },
+ })
+ }
},
goback() {
this.state = 0
@@ -1164,11 +1276,21 @@
},
// 涓嬪崟
playOrder(row) {
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { orderType: 0, customsInspection: row, active: 1 } });
+ //鏌ヨ褰撳墠鎵规鏄惁宸茬粡涓嬪崟
+ getOrderCountByIfsId(row.id).then(res=>{
+ if(res.code===200 && res.data>0){
+ this.$message.warning('璇ユ壒娆″凡涓嬪崟锛岃鍕块噸澶嶄笅鍗�')
+ this.refreshTable('page')
+ return
+ }
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 0, customsInspection: row, active: 1 } });
+ }).catch(error=>{
+ console.error(error)
+ })
},
// 瀛ｅ害妫�楠屼笅鍗�
playOrderSec(row) {
- this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: { orderType: 1, customsInspection: row, active: 1 } });
+ this.$router.push({ path: "/materialOrder/customsInspectionOrder", query: {isOutsourcing:'f', orderType: 1, customsInspection: row, active: 1 } });
},
// 鐐瑰嚮鏍峰搧鍚嶇О鏌ョ湅璇︽儏
selectAllByOne(row) {
@@ -1324,10 +1446,15 @@
},
// 瀵煎嚭
handleOut() {
- 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 => {
+ let params = {}
+ if (this.multipleSelection.length > 0) {
+ params.ids = this.multipleSelection.map(item => item.id).join(',');
+ } else {
+ params = {...this.entity}
+ }
+ params.orderType = "01raw";
+ rawAllExport(params).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx');
@@ -1355,6 +1482,7 @@
// 鍒囨崲涓嬪崟tab琛ㄦ牸
handleTab(m) {
this.tabIndex = m;
+ this.multipleSelection = []
this.refreshTable()
},
// 琛ㄦ牸閫夋嫨鏂规硶
@@ -1362,8 +1490,11 @@
this.multipleSelection = val
},
changeRowClass({ row, rowIndex }) {
- if (row.isFirst == 1) {
- return 'highlight-danger-row-border'
+ if (row.isFirst != 1 && row.lotBatchNoHasRepeat) {
+ return 'highlight-warning-row-border'
+ }
+ if(row.isFirst == 1){
+ return "highlight-danger-row-border";
}
return ''
},
--
Gitblit v1.9.3