From c8daca7ba2dafb6b6167f2c85cf3529d0f74c590 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:04 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
src/views/business/outsourcingFinishProduct/index.vue | 256 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 242 insertions(+), 14 deletions(-)
diff --git a/src/views/business/outsourcingFinishProduct/index.vue b/src/views/business/outsourcingFinishProduct/index.vue
index b5a862f..b919741 100644
--- a/src/views/business/outsourcingFinishProduct/index.vue
+++ b/src/views/business/outsourcingFinishProduct/index.vue
@@ -3,6 +3,12 @@
<div>
<div class="search">
<el-form :model="entity" ref="entity" size="small" :inline="true">
+ <el-form-item label="IFS鍩�" prop="contract">
+ <el-select @keyup.enter.native="refreshTable" v-model="entity.contract" clearable placeholder="璇烽�夋嫨" size="small">
+ <el-option label="ZTNS" value="ZTNS"/>
+ <el-option label="KJNS" value="KJNS"/>
+ </el-select>
+ </el-form-item>
<el-form-item label="鎵瑰彿" prop="updateBatchNo">
<el-input v-model="entity.updateBatchNo" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="goSearch">
@@ -35,14 +41,6 @@
@keyup.enter.native="goSearch">
</el-input>
</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="sampleModel"
v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
<el-input v-model="entity.sampleModel" clearable placeholder="璇疯緭鍏�" size="small"
@@ -60,6 +58,13 @@
@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>
</div>
@@ -179,10 +184,47 @@
type="primary" @click="viewInsInfo1">鏌ョ湅</el-link>
</div>
</el-dialog>
- <!-- <Inspection v-if="state>0" :key="InspectionKey" :inspectorList="inspectorList" :orderId="orderId"-->
- <!-- :sonLaboratory="'鍘熸潗鏂�'" :state="state"-->
- <!-- :typeSource="typeSource"-->
- <!-- @goback="goback" @refreshView="refreshView"/>-->
+ <!-- IFS鐗╂枡灞炴�х紪杈戝脊妗�-->
+ <el-dialog
+ title="鏇存柊IFS搴撳瓨鐗╂枡鎵规灞炴��"
+ :visible.sync="ifsMaterialPropsVisible"
+ :close-on-click-modal="false"
+ width="20%">
+ <el-form style="width:100%" :model="ifsMaterialPropsForm">
+ <el-form-item label="杞藉叿缂栧彿(Attr1):">
+ <el-input placeholder="杞藉叿缂栧彿" size="small" v-model="ifsMaterialPropsForm.drumNo"></el-input>
+ </el-form-item>
+ <el-form-item label="璧峰绫虫爣(Attr2):">
+ <el-input @blur="validateQuality()" placeholder="璧峰绫虫爣" size="small" v-model="ifsMaterialPropsForm.startMeterMark">
+ <span slot="suffix">km</span>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鎴绫虫爣(Attr3):">
+ <el-input @blur="validateQuality()" placeholder="鎴绫虫爣" size="small" v-model="ifsMaterialPropsForm.endMeterMark">
+ <span slot="suffix">km</span>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="澶栨姢棰滆壊(Attr4):">
+ <el-select style="width:100%" size="small" v-model="ifsMaterialPropsForm.outerColor">
+ <el-option v-for="(item,index) in outerColorList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="缁濈紭棰滆壊(Attr5):">
+ <el-select style="width:100%" size="small" v-model="ifsMaterialPropsForm.insulationColor">
+ <el-option v-for="(item,index) in insulationColorList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍗板瓧淇℃伅(Attr8):">
+ <el-select style="width:100%" size="small" v-model="ifsMaterialPropsForm.letteringInfo" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item,index) in letteringInfoList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="closePartPropDialog()">鍙� 娑�</el-button>
+ <el-button type="primary" @click="saveOrUpdatePartProp()">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -193,6 +235,7 @@
import FilesLookVisible from "@/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue";
import DownFileDialog from "@/views/business/materialOrderComponents/materialOrder/downFileDialog.vue";
import limsTable from "@/components/Table/lims-table.vue";
+import {getDicts} from "@/api/system/dict/data";
import {
concessionRelease,
getIfsByQuarter,
@@ -204,6 +247,7 @@
updateEntrustCode
} from "@/api/business/rawMaterialOrder";
import { getWarehouseSubmit, getIfsByStateOne, getIfsByOver, getIfsByAll } from "@/api/business/outsourcingFinishProductInspection";
+import {getOneByIfsId,saveOrUpdateProps} from "@/api/business/ifsPartProps.js";
import { mapGetters } from "vuex";
export default {
@@ -214,9 +258,44 @@
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ selectedRow:{},
+ outerColorList:[],
+ insulationColorList:[],
+ letteringInfoList: [],
+ ifsMaterialPropsForm:{
+ id:null,
+ ifsInventoryId: null,
+ drumNo: '', // 杞藉叿缂栧彿
+ startMeterMark: '', // 璧峰绫虫爣
+ endMeterMark: '', // 鎴绫虫爣
+ insulationColor: '', // 缁濈紭棰滆壊
+ outerColor: '', // 澶栨姢棰滆壊
+ inboundLength: '', // 鍏ュ簱闀垮害
+ letteringInfo: '', // 鍗板瓧淇℃伅
+ },
+ ifsMaterialPropsVisible:false,
tableData: [],
tableLoading: false,
column: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{ label: '闆朵欢鎻忚堪', prop: 'partDesc' },
@@ -295,6 +374,25 @@
tableData1: [],
tableLoading1: false,
column1: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{ label: '鎵瑰彿', prop: 'updateBatchNo' },
{
label: '濮旀墭缂栧彿',
@@ -391,6 +489,25 @@
tableData2: [],
tableLoading2: false,
column2: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{
label: '濮旀墭缂栧彿',
prop: 'entrustCode',
@@ -564,6 +681,25 @@
tableData3: [],
tableLoading3: false,
column3: [
+ {
+ label: 'IFS鍩�',
+ prop: 'contract',
+ width: '120px',
+ dataType: 'tag',
+ formatData: (params) => {
+ return params
+ },
+ formatType: (params) => {
+ if (params === 'ZTNS') {
+ return ''
+ } else if (params === 'KJNS') {
+ return 'success'
+ }else {
+ return null
+ }
+ }
+
+ },
{ label: '濮旀墭缂栧彿', prop: 'entrustCode', width: "160px", },
{
dataType: 'tag',
@@ -691,6 +827,13 @@
clickFun: (row) => {
this.handleFileLook(row);
},
+ },
+ {
+ name: '鏇存柊IFS鎵规灞炴��',
+ type: 'text',
+ clickFun: (row) => {
+ this.showMaterialPropsDialog(row);
+ },
}
]
}
@@ -701,6 +844,7 @@
current: 1
},
entity: {
+ contract: null,
updateBatchNo: null,
entrustCode: null,
partDesc: null,
@@ -793,6 +937,90 @@
},
// 鏂规硶闆嗗悎
methods: {
+ validateQuality(){
+ let inboundLength = Number(this.calcInbondLength(this.ifsMaterialPropsForm.startMeterMark,this.ifsMaterialPropsForm.endMeterMark));
+ let testQuantity = Number(this.selectedRow.purQtyInStore);
+ if(inboundLength!=null && testQuantity!==inboundLength){
+ this.$message.warning(`鍏ュ簱闀垮害(${inboundLength}km)涓庢楠屾暟閲�(${testQuantity}km)涓嶇锛岃纭锛乣);
+ }
+ },
+ calcInbondLength(startMeterMark,endMeterMark){
+ let inboundLength = null;
+ if((startMeterMark!=null && startMeterMark!=='') && (endMeterMark!=null&&endMeterMark!=='')){
+ let minus = this.$Big(endMeterMark).minus(this.$Big(startMeterMark));
+ inboundLength = Math.abs(minus)
+ }
+ return inboundLength;
+ },
+ saveOrUpdatePartProp(){
+ this.ifsMaterialPropsForm.ifsInventoryId = this.selectedRow.id
+ saveOrUpdateProps({
+ ...this.ifsMaterialPropsForm,
+ partNo: this.selectedRow.partNo,
+ lotBatchNo: this.selectedRow.updateBatchNo,
+ contract: this.selectedRow.contract
+ }).then((res)=>{
+ if(res.code==200){
+ this.$message.success("淇濆瓨鎴愬姛");
+ this.ifsMaterialPropsVisible = false;
+ this.refreshView()
+ }
+ })
+ },
+ getPartProps(ifsId){
+ getOneByIfsId(ifsId).then((res)=>{
+ if(res.code==200 && res.data){
+ this.ifsMaterialPropsForm = res.data;
+ }
+ })
+ },
+ //鎵撳紑IFS鐗╂枡灞炴�у脊妗�
+ showMaterialPropsDialog(row){
+ this.selectedRow = row
+ this.getPartProps(row.id)
+ this.getOuterColorDicts()
+ this.getInsulationColorDicts()
+ this.getLetteringInfoDicts()
+ this.$nextTick(()=>{
+ this.ifsMaterialPropsVisible = true;
+ })
+ },
+ getLetteringInfoDicts(){
+ getDicts("lettering_info_type").then(res=>{
+ if(res.code==200){
+ this.letteringInfoList = res.data
+ }
+ })
+ },
+ getInsulationColorDicts(){
+ getDicts("insulation_color_type").then(res=>{
+ if(res.code==200){
+ this.insulationColorList = res.data
+ }
+ })
+ },
+ getOuterColorDicts(){
+ getDicts("outer_color_type").then(res=>{
+ if(res.code==200){
+ this.outerColorList = res.data
+ }
+ })
+ },
+ closePartPropDialog(){
+ this.ifsMaterialPropsForm = {
+ id:null,
+ ifsInventoryId: null,
+ drumNo: '', // 杞藉叿缂栧彿
+ startMeterMark: '', // 璧峰绫虫爣
+ endMeterMark: '', // 鎴绫虫爣
+ insulationColor: '', // 缁濈紭棰滆壊
+ outerColor: '', // 澶栨姢棰滆壊
+ inboundLength: '', // 鍏ュ簱闀垮害
+ letteringInfo: '', // 鍗板瓧淇℃伅
+ }
+ this.selectedRow = {}
+ this.ifsMaterialPropsVisible = false;
+ },
// 鐐瑰嚮鏌ヨ鍥炶皟
goSearch() {
this.page.current = 1
@@ -964,7 +1192,7 @@
type: 'success',
message: '鏀捐鎴愬姛!'
});
- this.refresh()
+ this.refreshTable()
}
})
}).catch(() => {
@@ -1103,7 +1331,7 @@
if (res.code === 200) {
this.exemptionVisible = false
this.$message.success('鎿嶄綔鎴愬姛')
- this.refresh()
+ this.refreshTable()
}
this.exemptionLoading = false
}).catch(err => {
--
Gitblit v1.9.3