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 | 154 +++++++++++++++++++++
src/api/performance/class.js | 9 +
src/views/performance/class/index.vue | 222 +++++++++++++++----------------
3 files changed, 264 insertions(+), 121 deletions(-)
diff --git a/src/api/performance/class.js b/src/api/performance/class.js
index 8555eb1..38f95ca 100644
--- a/src/api/performance/class.js
+++ b/src/api/performance/class.js
@@ -2,6 +2,15 @@
import request from "@/utils/request";
+// 缁╂晥绠＄悊-鐝-缂栬緫鎵规敞鍐呭
+export function editAnnotationText(data) {
+ return request({
+ url: "/performanceShift/editAnnotationText",
+ method: "post",
+ data: data,
+ });
+}
+
// 缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ
export function page(query) {
return request({
diff --git a/src/views/business/outsourcingFinishProduct/index.vue b/src/views/business/outsourcingFinishProduct/index.vue
index d3ae946..b919741 100644
--- a/src/views/business/outsourcingFinishProduct/index.vue
+++ b/src/views/business/outsourcingFinishProduct/index.vue
@@ -184,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>
@@ -198,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,
@@ -209,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 {
@@ -219,6 +258,22 @@
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ selectedRow:{},
+ outerColorList:[],
+ insulationColorList:[],
+ letteringInfoList: [],
+ ifsMaterialPropsForm:{
+ id:null,
+ ifsInventoryId: null,
+ drumNo: '', // 杞藉叿缂栧彿
+ startMeterMark: '', // 璧峰绫虫爣
+ endMeterMark: '', // 鎴绫虫爣
+ insulationColor: '', // 缁濈紭棰滆壊
+ outerColor: '', // 澶栨姢棰滆壊
+ inboundLength: '', // 鍏ュ簱闀垮害
+ letteringInfo: '', // 鍗板瓧淇℃伅
+ },
+ ifsMaterialPropsVisible:false,
tableData: [],
tableLoading: false,
column: [
@@ -772,6 +827,13 @@
clickFun: (row) => {
this.handleFileLook(row);
},
+ },
+ {
+ name: '鏇存柊IFS鎵规灞炴��',
+ type: 'text',
+ clickFun: (row) => {
+ this.showMaterialPropsDialog(row);
+ },
}
]
}
@@ -875,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
diff --git a/src/views/performance/class/index.vue b/src/views/performance/class/index.vue
index ff3a4f1..c398c77 100644
--- a/src/views/performance/class/index.vue
+++ b/src/views/performance/class/index.vue
@@ -22,7 +22,7 @@
</div>
</div>
<div class="search_thing" style="padding-left: 30px">
- <el-button size="mini" type="primary" @click="refreshTable()"> 璇�</el-button>
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
<el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</div>
<div class="search_thing btns" style="padding-left: 30px">
@@ -101,18 +101,12 @@
<el-dropdown trigger="click" placement="bottom" @command="(e) => handleCommand(e, m)"
:disabled="!checkPermi(['performance:class:edit'])"
style="width: 100%; height: 100%; cursor: pointer">
- <div class="work-box" :class="{
- type0: m.shift === '0',
- type1: m.shift === '1',
- type2: m.shift === '2',
- type3: m.shift === '3',
- type4: m.shift === '4',
- type5: m.shift === '5',
- type6: m.shift === '6',
- }">
- <span style="cursor: pointer" :style="`opacity: ${getShiftByDic(m.shift) == '鏃�' ? 0 : 1
- };`">{{ getShiftByDic(m.shift) }}</span>
- </div>
+ <el-tooltip :disabled="!m.annotationText" :content="m.annotationText">
+ <el-tag @contextmenu.prevent.native="handleContextMenu(m,$event)" class="work-box" :type="getDictTypeByShift(m.shift)">{{ getShiftByDic(m.shift) }}</el-tag>
+ </el-tooltip>
+ <i v-if="m.checkinResult==='success'" class="el-icon-success" style="position: relative;top:-20px;color:#67c23a;"></i>
+ <i v-else-if="m.checkinResult==='fail'" class="el-icon-warning" style="position: relative;top:-20px;color:#f56c6c;"></i>
+ <svg v-if="m.annotationText" style="position: relative;top:-62px;left:31px;" t="1772437700487" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6193" width="12" height="12"><path d="M751.228537 117.332567c-1.023063 7.672974-1.470653 15.601715-1.278829 23.466514l1.278829 41.434062-32.418317 25.768406L473.466862 402.639333l-34.656268 27.494825-42.137418-13.747412a332.495559 332.495559 0 0 0-270.280524 28.965478l193.742604 194.637785 49.107037 49.362802 14.51471 14.642593 193.99837 194.829609a331.21673 331.21673 0 0 0 29.732776-271.559353l-13.747413-42.137418 27.494825-34.656268 194.509902-245.535182 25.768406-32.354375 41.434062 1.278829 4.220136 0.127883c6.522028 0 13.044057-0.44759 19.438202-1.406712l-155.377732-155.24985zM734.539817 0c9.719101 0 19.566085 3.644663 27.111177 11.189754l251.034146 250.650499a38.236989 38.236989 0 0 1-5.946555 59.081903 219.255244 219.255244 0 0 1-119.570518 35.359623c-2.301892 0-4.539843 0-6.841736-0.127882L685.752488 601.689078a413.253615 413.253615 0 0 1-71.742311 388.764038 39.451877 39.451877 0 0 1-58.378547 2.941307l-235.752139-236.775202L64.497325 1012.193211a37.277867 37.277867 0 1 1-52.623816-52.7517l255.510048-255.57399L31.631418 467.092319a39.451877 39.451877 0 0 1 3.197072-58.378548 411.399313 411.399313 0 0 1 258.771063-91.244454c43.480188 0 86.832494 6.905677 128.586263 20.461265l245.407299-194.573843A218.871596 218.871596 0 0 1 702.56909 17.264192a37.981223 37.981223 0 0 1 31.970727-17.264192z" fill="#f56c6c" p-id="6194"></path></svg>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(n, j) in classType" :key="'h' + j" :command="n.dictValue">{{ n.dictLabel
}}</el-dropdown-item>
@@ -203,6 +197,13 @@
style="margin-top: 10px; text-align: right; margin-right: 30px">
</el-pagination>
+ <ul v-show="showMenu"
+ class="contextmenu"
+ :style="{left:menuX+'px',top:menuY+'px'}"
+ @click.stop>
+ <li @click="editAnnotation()">缂栬緫鎵规敞</li>
+ <li class="divider"></li>
+ </ul>
<el-dialog title="鏃堕棿閰嶇疆" :visible.sync="configTimeVisible" width="620px">
<div v-loading="configTimeVisibleLoading" style="min-height: 200px">
<div v-for="(item, index) in timeQuery">
@@ -319,6 +320,7 @@
obtainItemParameterList,
update,
selectUserCondition,
+ editAnnotationText
} from "@/api/performance/class";
export default {
name: 'Class',
@@ -395,7 +397,7 @@
},
list: [],
currentPage: 1, // 褰撳墠椤�
- pageSize: 6, // 涓�椤�10鏉�
+ pageSize: 20, // 涓�椤�10鏉�
total: 0,
pageLoading: false, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
@@ -406,31 +408,17 @@
configTimeVisibleLoading: false, // 鏃堕棿閰嶇疆寮规loading
timeTypeList: [],
timeQuery: [],
+ showMenu: false,
+ menuX: 0,
+ menuY: 0,
+ selectedTarget: null,
};
},
watch: {
- // 'query.year'(val){
- // this.monthList = []
- // if(val.getFullYear()==new Date().getFullYear()){
- // for(let i=new Date().getMonth()+1;i>0;i--){
- // this.monthList.push(i)
- // }
- // }else{
- // for (let i=12;i>0;i--) {
- // this.monthList.push(i)
- // }
- // }
- // this.monthList.reverse()
- // },
- // 'query.month'(val){
- // if(!val){
- // this.currentPage = 1;
- // this.yearList = []
- // this.initYear()
- // }
- // }
+
},
mounted() {
+ document.addEventListener('click', this.handleClickOutside)
this.selectEnumByCategory();
this.obtainItemParameterList();
this.getUsers();
@@ -445,7 +433,64 @@
}
this.monthList.reverse();
},
+ destroyed() {
+ document.removeEventListener('click', this.handleClickOutside)
+ },
methods: {
+ handleContextMenu(target,e) {
+ // 闃绘娴忚鍣ㄩ粯璁ゅ彸閿彍鍗�
+ e.preventDefault()
+
+ const menuMinWidth = 105
+ const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
+ const offsetWidth = this.$el.offsetWidth // container width
+ const maxLeft = offsetWidth - menuMinWidth // left boundary
+ const left = e.clientX - offsetLeft + 15 // 15: margin right
+
+ if (left > maxLeft) {
+ this.menuX = maxLeft
+ } else {
+ this.menuX = left
+ }
+ this.menuY = e.clientY - 60
+ // 鏄剧ず鑿滃崟
+ this.selectedTarget = target
+ this.showMenu = true
+ },
+ editAnnotation() {
+ // 鐐瑰嚮鑿滃崟鍚庡叧闂彍鍗�
+ this.showMenu = false
+ if(this.selectedTarget && !this.selectedTarget.shift){
+ this.$message.warning('璇峰厛閫夋嫨鐝')
+ return
+ }
+ this.$prompt('', '缂栬緫鎵规敞', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType:'textarea',
+ inputPlaceholder:'濉啓鎵规敞鍐呭',
+ inputPattern: /^.{0,100}$/,
+ inputErrorMessage: '鏈�澶ц緭鍏�100涓瓧绗�'
+ }).then(({ value }) => {
+ editAnnotationText({
+ id:this.selectedTarget.id,
+ annotationText:value
+ }).then(res=>{
+ this.refreshTable()
+ this.$message.success("鎻愪氦鎴愬姛")
+ })
+ }).catch(() => { });
+ },
+ handleClickOutside() {
+ this.showMenu = false
+ },
+ getDictTypeByShift(e) {
+ let obj = this.classType.find((m) => m.dictValue == e);
+ if (obj) {
+ return obj.listClass;
+ }
+ return "";
+ },
refresh() {
this.list = [];
this.yearList = [];
@@ -539,6 +584,7 @@
}
return item;
});
+ console.log(this.list)
let headerList = res.data.headerList;
this.weeks = [];
headerList.forEach((item) => {
@@ -823,17 +869,9 @@
};
</script>
-<style scoped>
+<style scoped lang="scss">
.class-page {
padding: 10px;
-}
-
-.form_title {
- height: 36px;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- font-weight: 800;
}
.search {
@@ -980,83 +1018,10 @@
height: 100%;
display: flex;
align-items: center;
- justify-content: space-around;
- background: #edeff2;
+ justify-content: center;
border-radius: 8px 8px 8px 8px;
- color: #999;
font-size: 14px;
}
-
-.work-box.type0 {
- background: rgba(58, 123, 250, 0.15);
- color: #3a7bfa !important;
-}
-
-.work-box.type0 span {
- color: #3a7bfa !important;
-}
-
-.work-box.type1 {
- background: #e3dcfe;
- color: #635998 !important;
-}
-
-.work-box.type1 span {
- color: #635998 !important;
-}
-
-.work-box.type2 {
- background: #fae2ca;
- color: #bc8d5e !important;
-}
-
-.work-box.type2 span {
- color: #bc8d5e !important;
-}
-
-.work-box.type3 {
- background: #e1f3d8;
- color: #67c23a !important;
-}
-
-.work-box.type3 span {
- color: #67c23a !important;
-}
-
-.work-box.type4 {
- background: #fde2e2;
- color: #f56c6c !important;
-}
-
-.work-box.type4 span {
- color: #f56c6c !important;
-}
-
-.work-box.type5 {
- background: #ff46c145;
- color: #ff46c0 !important;
-}
-
-.work-box.type5 span {
- color: #ff46c0 !important;
-}
-
-.work-box.type6 {
- background: #00036418;
- color: #000464 !important;
-}
-
-.work-box.type6 span {
- color: #000464 !important;
-}
-
-.work-box-left {
- display: flex;
- justify-content: center;
- flex-direction: column;
- line-height: 24px;
-}
-
.content-user {
width: 100%;
height: 70px;
@@ -1118,4 +1083,27 @@
flex-direction: column;
justify-content: center;
}
+
+/* 鑷畾涔夊彸閿彍鍗曟牱寮� */
+.contextmenu {
+ margin: 0;
+ background: #fff;
+ z-index: 3000;
+ position: absolute;
+ list-style-type: none;
+ padding: 5px 0;
+ border-radius: 4px;
+ font-size: 12px;
+ font-weight: 400;
+ color: #333;
+ box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+ li {
+ margin: 0;
+ padding: 7px 16px;
+ cursor: pointer;
+ &:hover {
+ background: #eee;
+ }
+ }
+}
</style>
--
Gitblit v1.9.3