From b0d4df5f39525ae7fe252e8ee65d85fd71dca721 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:53:32 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
src/views/business/rawMaterialInspection/index.vue | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 7563e12..c3d95ed 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -5,8 +5,7 @@
<el-row>
<el-form-item label="IFS鍩�" prop="contract">
<el-select @keyup.enter.native="refreshTable" v-model="componentData.contract" clearable placeholder="璇烽�夋嫨" size="small">
- <el-option label="ZTNS" value="ZTNS"/>
- <el-option label="KJNS" value="KJNS"/>
+ <el-option v-for="(item,index) in contractList" :key="index" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="鎵瑰彿" prop="updateBatchNo">
@@ -35,9 +34,10 @@
</el-select>
</el-form-item>
<el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 3 || tabIndex === 4) && more">
- <el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange" @change="refreshTable()"
- value-format="yyyy-MM-dd">
+ <el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鏃ユ湡"
+ range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="datetimerange" @change="refreshTable()"
+ :default-time="['00:00:00','23:59:59']"
+ value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="濮旀墭缂栧彿" prop="entrustCode" v-if="(tabIndex === 3 || tabIndex === 4) && more">
@@ -82,13 +82,13 @@
<!--寰呮姤妫�銆佸緟涓嬪崟-->
<div class="table">
<lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0 || tabIndex === 1" :isSelection="true"
- :handleSelectionChange="selectMethod" @pagination="pagination" :height="'calc(100vh - 290px)'" :page="page"
+ :handleSelectionChange="selectMethod" @pagination="pagination" :height="50" :more="more" :page="page"
:tableLoading="tableLoading"></lims-table>
</div>
<!--宸插畬鎴愩�佸叏閮�-->
<div class="table">
<lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 3 || tabIndex === 4"
- @pagination="pagination1" :height="'calc(100vh - 290px)'" :page="page1"
+ @pagination="pagination1" :page="page1" :height="50" :more="more"
:tableLoading="tableLoading1"></lims-table>
</div>
</div>
@@ -119,12 +119,15 @@
:visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
<el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
label-position="right">
- <el-form-item class="declareObj-form-item" label="IFS鍩�:" prop="contract" style="width: calc(50% - 54px)">
- <el-tag :type="declareObj.contract==='ZTNS'?'':'success'">{{declareObj.contract}}</el-tag>
- </el-form-item>
<el-form-item class="declareObj-form-item" label="璁㈠崟鍙�:" prop="orderNo">
<el-input v-model="declareObj.orderNo" :disabled="declareType !== 'add'" class="addObj-info" clearable
- placeholder="" size="small"></el-input>
+ placeholder="" size="small"></el-input>
+ </el-form-item>
+ <el-form-item class="declareObj-form-item" label="IFS鍩�:" prop="contract">
+ <el-select v-model="declareObj.contract" v-if="declareType === 'add'" clearable size="small">
+ <el-option v-for="(item,index) in contractList" :key="index" :label="item.label" :value="item.value"/>
+ </el-select>
+ <el-tag v-else :type="declareObj.contract==='ZTNS'?'':'success'">{{declareObj.contract}}</el-tag>
</el-form-item>
<el-form-item class="declareObj-form-item" label="闆朵欢鍙�:" prop="partNo">
<el-input v-model="declareObj.partNo" :disabled="declareType !== 'add'" class="addObj-info" clearable
@@ -321,12 +324,16 @@
import { getDicts } from "@/api/system/dict/data";
import limsTable from "@/components/Table/lims-table.vue";
import {transformExcel} from '@/utils/file'
+import tab from "../../../plugins/tab";
export default {
name: 'RawMaterialInspection',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DataLookVisible },
computed:{
+ tab() {
+ return tab
+ },
splitOrderAction(){
return this.javaApi + '/rawMaterialOrder/importSplitOrderData'
}
@@ -747,6 +754,16 @@
upLoading: false,
orderTypeList: [],
materialPropList: [],
+ contractList:[
+ {
+ label:"ZTNS",
+ value:"ZTNS"
+ },
+ {
+ label:"KJNS",
+ value:"KJNS"
+ },
+ ]
}
},
mounted() {
@@ -1110,7 +1127,9 @@
id: this.declareObj.id,
updateBatchNo: this.declareObj.updateBatchNo,
orderType: this.declareObj.orderType,
- materialProp: this.declareObj.materialProp
+ materialProp: this.declareObj.materialProp,
+ partNo: this.declareObj.partNo,
+ contract: this.declareObj.contract
}).then(res => {
if (res.code === 200) {
this.declareDialogVisible = false
@@ -1195,6 +1214,7 @@
buyUnitMeas: '', // 鍗曚綅
isExpire: '', // 鍗曚綅
orderType: null, // 閿�鍞鍗曞垎绫�
+ materialProp: null, // 鐗╂枡灞炴��
}
}
},
--
Gitblit v1.9.3