From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 1437 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 1,236 insertions(+), 201 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index f4fbfe0..15addfc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -1,24 +1,39 @@
<script setup>
-import {computed, nextTick, onMounted, reactive, ref, toRefs} from "vue";
-import {useRouter} from 'vue-router'
+import {computed, nextTick, onMounted, onUnmounted, reactive, ref, toRefs} from "vue";
+import {useRouter,useRoute} from 'vue-router'
import request from "@/utils/request";
-import {ElMessage} from "element-plus";
+import {ElCheckbox, ElMessage} from "element-plus";
import {changeFilterEvent, filterChanged} from "@/hook"
+import domZIndex from 'dom-zindex'
import {indexOf} from "xe-utils";
import {addListener, toolbarButtonClickEvent} from "@/hook/mouseMove";
import userInfo from "@/stores/userInfo"
+import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum"
+import companyInfo from "@/stores/sd/companyInfo"
+domZIndex.setCurrent(3000)
+const company = companyInfo()
+//璇█鑾峰彇
+const { t } = useI18n()
let brokenVisible = ref(false)
const xGrid = ref()
const brokenGrid =ref()
-let router = useRouter()
+const router = useRouter()
+const route = useRoute()
const user=userInfo()
+//鏄惁澶嶅悎宸ュ簭
+const laminating = ref(null)
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ //鏄惁鍚堢墖宸ュ簭
+ laminating:'',
+ reportingWorkId: null,
//娴佺▼鍗″彿
- processId: 'NG24030701B01/1',
+ processId: null,
//閿�鍞崟鍙�
orderId: '',
+ reviewedState:0,
//鐢熶骇鍗曞彿
productionId: '',
//璁惧绫诲瀷
@@ -43,6 +58,8 @@
classes: '',
//璐ｄ换宸ュ簭
responsibleProcess: '',
+ //鍖呰鏂瑰紡
+ packagingMethod:'',
order: {
//瀹㈡埛缂栧彿
customerId: '',
@@ -59,6 +76,12 @@
})
let detail = ref([])
+let layer=''
+let technologicalProcess=''
+let processName = ref([])
+
+//闅愯棌鍏ㄩ儴瀹屽伐搴忓彿
+let hiddenVal = ref(1)
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -75,6 +98,123 @@
})
+let btnValue=company.storageBtn
+let teamsTypeValue=company.teamsType
+//鏄惁鐐瑰嚮鎶ュ伐鍏ュ簱
+let storageBtn = ref(false)
+//绠卞彿 搴撲綅 澶囨敞
+const storageRegion = ref(null);
+const container = ref(null);
+const remark = ref(null);
+
+//鍖呰鏂瑰紡
+const mannerPacking = ref(null)
+const mannerPackingOp = [
+ // {
+ // value: t('reportingWorks.early'),
+ // label: t('reportingWorks.early'),
+ // },
+ // {
+ // value: t('reportingWorks.nightShift'),
+ // label: t('reportingWorks.nightShift'),
+ // },
+ {
+ value: t('reportingWorks.woodenBox'),
+ label: t('reportingWorks.woodenBox'),
+ },
+ {
+ value: t('reportingWorks.brandreth'),
+ label: t('reportingWorks.brandreth'),
+ },
+ {
+ value: t('reportingWorks.tilting'),
+ label: t('reportingWorks.tilting'),
+ },
+]
+
+
+let inputDisabled = ref(false)
+onMounted(async () =>{
+ await initTiltle()
+ if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
+ titleUploadData.value.processId = route.query.processId
+ //褰撹川妫�瀹℃牳鍚庡姞杞芥槑缁嗕俊鎭�
+ if(route.query.reviewStatus === '1'){
+ if(titleUploadData.value.thisProcess !== undefined
+ && titleUploadData.value.thisProcess!==''
+ && titleUploadData.value.thisProcess!=null){
+ getWork()
+ getQuantity()
+
+ }
+ }
+ }
+ //route.query.reportingWorkId = 'BG2403150004'
+ //鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
+ if(route.query.reportingWorkId !== '' && route.query.reportingWorkId!=null){
+ gridOptions.loading = true
+ request.post(`reportingWork/selectUpdateReportingWork/${route.query.reportingWorkId}`).then(res=>{
+ if(res.code === '200'){
+ titleUploadData.value = res.data.reportingWork
+ titleSelectJson.value = res.data.basic
+ layer= res.data.layer
+
+ //娣诲姞琛ョ墖鐘舵�佸垪
+ let column = {field: 'patchStatusOther', width: 90,title: t('reportingWorks.patchCondition')}
+ gridOptions.columns.push(column)
+
+ const s01Values = [];
+ for (let i = 0; i < res.data.reportingWorkDetails.length; i++) {
+ const s01Values = [];
+ // 閬嶅巻 detailList 鏁扮粍锛屾彁鍙� S01 鍊煎埌 s01Values 鏁扮粍
+ if (res.data.reportingWorkDetails[i].other_columns!=null|| res.data.reportingWorkDetails[i].other_columns!=undefined){
+ res.data.reportingWorkDetails.forEach(element => {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ s01Values.push(s01Value || ''); // 濡傛灉 S01 鍊间负绌猴紝娣诲姞绌哄瓧绗︿覆鎴栬�呭叾浠栭粯璁ゅ��
+ });
+
+ // 灏� s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.reportingWorkDetails.forEach((detail, index) => {
+ detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 璧嬪�肩粰 s01Value 灞炴��
+ });
+ }
+
+ }
+
+
+ //titleUploadData.value.processId=titleUploadData.value.processId+'/'+layer
+ xGrid.value.reloadData(res.data.reportingWorkDetails)
+ let button = {
+ code: 'update',
+ name: t('basicData.update'),
+ status: 'primary',
+ disabled:'false'
+ }
+ if(route.query.reviewStatus === "1"){
+ button.name=t('basicData.review')
+ titleUploadData.value.qualityInspector=user.user.userName
+ }
+ gridOptions.toolbarConfig.buttons.push(button)
+ for (let i = 0; i < res.data.reportingWorkDetails.length; i++) {
+ if (res.data.reportingWorkDetails[i].patchStatusOther === '宸茶ˉ鐗�') {
+ gridOptions.toolbarConfig.buttons[2].disabled=true
+ break
+ }
+ else{
+ gridOptions.toolbarConfig.buttons[2].disabled=false
+ }
+ }
+ }
+ // getQuantity()
+ gridOptions.loading = false
+ inputDisabled.value = true
+ })
+ }
+})
+
+const data = [{id:1,num:2},{id:1,num:3},{id:2,num:2},{id:1,num:2}];
+
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
let count = 0
@@ -87,31 +227,17 @@
const optionVal = ref('')
-const options = [
- {
- value: '鍒囧壊',
- label: '鍒囧壊',
- },
- {
- value: '纾ㄨ竟',
- label: '纾ㄨ竟',
- },
- {
- value: '閽㈠寲',
- label: '閽㈠寲',
- },
-]
//鐝
-const classesVal = ref('鏃╃彮')
+const classesVal = ref(t('reportingWorks.early'))
const classesOption = [
{
- value: '鏃╃彮',
- label: '鏃╃彮',
+ value: t('reportingWorks.early'),
+ label: t('reportingWorks.early'),
},
{
- value: '鏅氱彮',
- label: '鏅氱彮',
+ value: t('reportingWorks.nightShift'),
+ label: t('reportingWorks.nightShift'),
},
]
@@ -122,7 +248,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddReportingWork_1',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -134,28 +260,89 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- // remote: true
+ // remote: true
},
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
+ },
editConfig: {
- trigger: 'click',
+ trigger: 'dblclick',
mode: 'row',
showStatus: true
- },//琛ㄥご鍙傛暟
+ },
+ menuConfig: {
+ body: {
+ //鍙抽敭鑿滃崟
+ options: [
+ [
+ {
+ code: 'copyChecked',
+ name: t('basicData.selectSame'),
+ prefixIcon: 'vxe-icon-copy',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'copyAll',
+ name: t('basicData.sameAfterwards'),
+ prefixIcon: 'vxe-icon-feedback',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'clearChecked',
+ name: t('basicData.clearSelection'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'SecondaryBreakage',
+ name: t('reportingWorks.secondaryBreakage'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ {
+ code: 'checkedBreakage',
+ name: t('reportingWorks.checkedBreakage'),
+ prefixIcon: 'vxe-icon-indicator',
+ visible: true,
+ disabled: false
+ },
+ ]
+ ]
+ }
+ },
+ //琛ㄥご鍙傛暟
columns: [
// {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
{
field: 'order_number',
- title: '搴忓彿',
+ title: t('order.OrderNum'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
+ {
+ field: 's01Value',
+ title: t('reportingWorks.glassNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'glass_child',
- title: '鍗曠墖鍚嶇О',
+ title: t('reportingWorks.glassChild'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
@@ -163,21 +350,21 @@
},
{
field: 'technology_number',
- title: '鏍囪',
+ title: t('processCard.technologyNumber'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'glass_address',
- title: '鐗囨爣璁�',
+ title: t('reportingWorks.glassAddress'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'quantity_card',
- title: '娴佺▼鍗℃暟閲�',
+ title: t('reportingWorks.numberProcessCards'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
showOverflow: "ellipsis",
@@ -185,83 +372,154 @@
},
{
field: 'child_width',
- title: '瀹�',
+ title: t('order.width'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'child_height',
- title: '楂�',
+ title: t('order.height'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged
},
{
field: 'shape',
- title: '褰㈢姸',
+ title: t('order.shape'),
filters: [{data: ''}],
slots: {filter: 'num1_filter'},
showOverflow: "ellipsis",
filterMethod: filterChanged
},
- {field: 'quantity', title: '涓婂伐瀹屽伐鏁伴噺',},
+ {field: 'quantity', title: t('reportingWorks.reportableQuantityOk'),},
{
- field: 'completedQuantity', title: '瀹屽伐鏁伴噺',
+ field: 'completedQuantity', title: t('reportingWorks.completedQuantity'),width: 120,
editRender: {
name: 'input',
- attrs: {placeholder: ''},
+ attrs: {placeholder: ''}
},
},
{
- field: 'breakageQuantity', title: '娆＄牬鏁伴噺',
+ field: 'breakageQuantity', title: t('reportingWorks.quantityBroken'),
},
- {field: 'completed', width: 90, title: '宸插畬宸�',},
- {field: 'onceBroken', width: 90, title: '宸叉鐮�',},
+ {field: 'completed', width: 90, title:t('reportingWorks.completed'),},
+ {field: 'onceBroken', width: 90, title: t('reportingWorks.onceBroken'),},
+ {
+ field: 'reviewed_state',
+ title: t('processCard.reviewedState'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged
+ },
],
//琛ㄥ崟楠岃瘉
editRules: {
completedQuantity: [
{
- validator ({ row }) {
+ validator ({ row ,cellValue }) {
const regex = /^[0-9]\d*$/
const brokenNum =
(row.breakageQuantity === undefined || row.breakageQuantity===null) ? 0 : row.breakageQuantity
+ //鏁存暟楠岃瘉
if (row.completedQuantity && !regex.test(row.completedQuantity)) {
- return new Error('璇疯緭鍏ユ暣鏁帮紝骞朵笖澶т簬绛変簬0')
+ return new Error(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
+ //瀹屽伐+娆＄牬鏁伴噺涓嶈兘澶т簬鍙畬宸ユ暟閲�
}else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
- return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
+ return new Error(t('reportingWorks.pleaseNumber11'))
+ //鏈瀹屽伐鏁伴噺涓嶈兘澶т簬瀹屽伐鏁伴噺
+ }else if(row.quantity_card<row.completedQuantity){
+ return new Error(t('reportingWorks.pleaseNumber10'))
}
+ const nextProcess = titleUploadData.value.nextProcess//涓嬪伐搴�
+ const completedSum = Number(row.thisQuantitySum) //鎬诲畬宸ユ暟閲�
+ let nextQuantitySum = ''
+ if (nextProcess!=''){
+ nextQuantitySum = Number(row.nextQuantitySum) //鎬讳笅宸ュ簭瀹屽伐鏁伴噺
+ }else {
+ nextQuantitySum = Number(row.received_quantity) //鎬讳笅宸ュ簭瀹屽伐鏁伴噺
+ }
+ const totalQuantity = Number(row.quantity) //鍙畬宸ユ暟閲�
+ const val = Number(cellValue) //杈撳叆鍊�
+
+ //瀹屽伐鏁�
+ const completedNum =
+ (row.completedQuantity === undefined || row.completedQuantity===null || row.completedQuantity==='') ? 0 : row.completedQuantity
+ //
+ const okVal = completedSum - totalQuantity + row.breakageQuantity
+
+ //褰撳彲鎿嶄綔鏁伴噺涓�0锛屽苟涓斿畬宸ユ暟閲忎笉绛変簬鍙畬宸ユ暟閲忔椂
+ if(row.minQuantity===0 && val!==(totalQuantity-row.breakageQuantity) ){
+ return new Error(`${t('reportingWorks.pleaseNumber12')} ${okVal}+${val}=${okVal+val}\n
+ ${t('reportingWorks.pleaseNumber13')} ${nextQuantitySum}\n
+ ${t('reportingWorks.pleaseNumber14')}
+ `)
+ }
+ if(titleUploadData.value.reportingWorkId!=null){
+ if (nextProcess!=''){//闈炴渶鍚庝竴閬撳伐搴�
+ if(row.completedQuantityComputed>=row.minQuantity ){
+ if((val<(row.completedQuantityComputed-row.minQuantity || val>=row.completedQuantityComputed))){
+ return new Error(`${row.completedQuantityComputed-row.minQuantity}
+ <=val<=
+ ${row.completedQuantityComputed}`)
+ }
+ }else{
+ if((val>row.completedQuantityComputed)){
+ return new Error(`val
+ <=
+ ${row.completedQuantityComputed}`)
+ }
+ }
+ }else {//鏈�鍚庝竴閬撳伐搴�
+ if (val<row.completedQuantityComputed){
+ //搴撳瓨鏁伴噺銆佸凡鍏ュ簱鏁伴噺
+ if (val>(row.inventory_quantity-row.received_quantity)){
+ if (totalQuantity-val>(row.inventory_quantity-row.received_quantity)){
+ return new Error(`val
+ <=
+ ${row.inventory_quantity-row.received_quantity}`)
+ }
+ }else {
+ if (val < (row.inventory_quantity-row.received_quantity)){
+ //瀹屽伐鎬绘暟銆佹湰娆″畬宸ユ暟銆佸凡鍏ュ簱鏁伴噺
+ if (completedSum-row.completedQuantityComputed <row.received_quantity){
+ return new Error(`${t('reportingWorks.pleaseNumber15')}`)
+ }
+ }
+ }
+ }
+ }
+
+ }
}
}
]
},
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
- // {code: 'empty', name: '娓呯┖鎶ュ伐鏁伴噺'},
- // {code: 'sameCompletion', name: '瀹屽伐鐩稿悓'},
- // {code: 'sameDamage', name: '娆＄牬鐩稿悓'},
- // {code: 'sameOneCompletion', name: '瀹屽伐涓�鍒楃浉鍚�'},
- // {code: 'sameOneDamage', name: '娆＄牬涓�鍒楃浉鍚�'},
- {code: 'saveReportingWork', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
- {code: 'print_lck', name: '淇濆瓨骞跺鏍�', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'saveReportingWork', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save',disabled:true},
+ {code: 'saveReportingWorkReview', name: t('reportingWorks.saveAndReview'), status: 'primary', icon: 'vxe-icon-save',disabled:true},
+ {code: 'saveWorkStorage', name: t('reportingWorks.saveWorkStorage'), status: 'primary', icon: 'vxe-icon-save'},
],
- // import: false,
- // export: true,
- // print: true,
+ // slots: {
+ // tools: 'toolbar_buttons'
+ // },
zoom: true,
custom: true
},
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '', '', '']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
+ }
+ const List = ["quantity_card",'quantity','completedQuantity','completed','onceBroken']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -270,39 +528,102 @@
})
-let brokenRow = ref()
+let brokenRow = ref({
+ glass_child:'',
+ order_number:'',
+ technology_number:''
+
+})
const gridEvents = {
async toolbarButtonClick({code}) {
const $grid = xGrid.value
if ($grid) {
switch (code) {
- case 'saveReportingWork': {
- if($grid.getTableData().fullData.length===0){
- ElMessage.warning(`璇烽�夋嫨娴佺▼鍗℃暟鎹甡)
- return false
+ case 'saveReportingWork': {//淇濆瓨
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+ saveReportingWork(0,'save')
+ break
+ }
+ case 'saveReportingWorkReview': {
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+ saveReportingWork(1,'save')
+ break
+ }
+ case 'update': {//淇敼
+ //鏍规嵁琛ョ墖鐘舵�佸垽鏂槸鍚﹁兘淇敼
+ // request.post(`/reportingWork/getPatchCondition/${route.query.reportingWorkId}`).then(async (res) => {
+ // if (res.code == 200) {
+ // if (res.data > 0) {
+ // ElMessage.error("璇ユ姤宸ュ寘鍚凡琛ョ墖鏁版嵁锛屼笉鍙慨鏀�!")
+ // return
+ // } else {
+ getQuantity()
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+ saveReportingWork(0, 'update')
+ // }
+ // } else {
+ // ElMessage.warning(res.msg)
+ // }
+ // })
+
+ break
+ }
+ case 'saveWorkStorage':{
+ if(xGrid.value.getTableData().fullData.length===0){
+ ElMessage.warning(t('reportingWorks.selectProcessCardData'))
+ return
}
const device = titleUploadData.value.deviceName
if(device === null || device === undefined || device === ''){
- ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
+ ElMessage.error(t('reportingWorks.selectWorkReportingEquipment'))
return
}
const teamsGroupsName = titleUploadData.value.teamsGroupsName
if(teamsGroupsName === null || teamsGroupsName === undefined || teamsGroupsName === ''){
- ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
+ ElMessage.error(t('reportingWorks.selectWorkReportingTeam'))
return
}
- const errMap = await $grid.validate(true)
- if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+
+ if (mannerPacking.value === null || mannerPacking.value === undefined || mannerPacking.value === ''){
+ ElMessage.error(t('reportingWorks.msgMannerPacking'))
return
}
- saveReportingWork()
- break
+ const parts = technologicalProcess.split('->');
+ const last = parts[parts.length - 1];
+ let processId = titleUploadData.value.processId
+ //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+ const regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const resultProcessId = processId.match(regex);
+ //娴佺▼鍗″彿
+ let processIdStr = resultProcessId[1];
+ //灞傚彿
+ let technologyStr = resultProcessId[2];
+ if (last != titleUploadData.value.thisProcess){
+ ElMessage.error(t('reportingWorks.pleaseNumber16'))
+ return
+ }
+ storageBtn.value = true
+ //鎶ュ伐鏂板
+ saveReportingWork(0,'save')
+
}
}
}
},
- cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
+ cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑娆＄牬鐣岄潰
const { row } = params
brokenRow.value = row
if(brokenRow.value.damageDetails=== undefined){
@@ -310,10 +631,116 @@
}
//brokenGrid.value.reloadData(brokenRow.damageDetail)
//鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
- brokenVisible.value = true
- //console.log(brokenGrid.value)
+ const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
+ //鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
+ if(column.field=="breakageQuantity"){
+ // if (row.patchStatusOther!="宸茶ˉ鐗�"){
+ brokenVisible.value = true
+ //}
+ }
+ },
+ menuClick({menu, row, column}) {//鍙抽敭鑿滃崟
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'copyChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
- }
+ break
+ }
+ case 'copyAll' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start][result.cell]
+ dataList.forEach((item, index) => {
+ if (index >= result.start) {
+ item[result.cell] = val
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'clearChecked' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "completedQuantity" ) {
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item[result.cell] = ''
+ }
+ })
+ }
+ }
+ break
+ }
+ case 'SecondaryBreakage' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const seenOrders = {}
+ dataList.forEach((item, index) => {
+ const list = item.damageDetails
+ if (list!== null || list.length > 0){
+ const { order_number, damageDetails, breakageQuantity } = item;
+ // 濡傛灉 order_number 杩樻病鏈夊鐞嗚繃
+ if (!seenOrders[order_number]) {
+ // 璁板綍绗竴涓嚭鐜扮殑 damageDetails 鍜� breakageQuantity
+ seenOrders[order_number] = {
+ damageDetails,
+ breakageQuantity
+ };
+ } else {
+ // 灏嗗悗缁殑 damageDetails 鍜� breakageQuantity 鏇存柊涓虹涓�涓殑
+ item.damageDetails = seenOrders[order_number].damageDetails;
+ item.breakageQuantity = seenOrders[order_number].breakageQuantity;
+ }
+ }
+
+ })
+ }
+ }
+ break
+ }
+ case 'checkedBreakage' : {
+ let result = toolbarButtonClickEvent()
+ if (result.cell === "breakageQuantity" || result.cell === "completedQuantity"){
+ if (result) {
+ const dataList = xGrid.value.getTableData().visibleData
+ const val = dataList[result.start].damageDetails
+ const quantity = dataList[result.start].breakageQuantity
+ dataList.forEach((item, index) => {
+ if (index >= result.start && index <= result.end) {
+ item.damageDetails = val
+ item.breakageQuantity = quantity
+ if (index!=result.start){
+ item.completedQuantity = item.completedQuantity - quantity
+ }
+
+ }
+ })
+ }
+ }
+ break
+ }
+ }
+ }
+ },
}
@@ -324,7 +751,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'AddReportingWork_2',
//showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -347,7 +774,8 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- {type: 'seq',fixed:"left", title: '鑷簭', width: 80 },
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'),width: 78},
+ {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
// {
// field: 'order_number',
// title: '搴忓彿'
@@ -355,48 +783,48 @@
{
field: 'breakageQuantity',
- title: '娆＄牬鏁伴噺',
+ title: t('reportingWorks.quantityBroken'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
{field: 'available',
- title: '鍙埄鐢�',
+ title: t('reportingWorks.available'),
slots: {default: 'available'}
},
- {field: 'returnProcess', title: '閫�鍥炲伐搴�',
+ {field: 'returnProcess', title: t('reportingWorks.returnProcess'),
editRender: {},
slots: {default: 'returnProcess_default', edit: 'returnProcess'}
},
{
- field: 'breakageType', title: '娆＄牬绫诲瀷',
+ field: 'breakageType', title: t('reportingWorks.breakageType'),
editRender: {},
slots: {default: 'breakageType_default', edit: 'breakageType'}
},
{
- field: 'breakageReason', title: '娆＄牬鍘熷洜',
+ field: 'breakageReason', title: t('reportingWorks.breakageReason'),
editRender: {},
slots: {default: 'breakageReason_default', edit: 'breakageReason'}
},
{
- field: 'responsibleProcess', title: '璐ｄ换宸ュ簭',
+ field: 'responsibleProcess', title: t('reportingWorks.responsibleProcess'),
editRender: {},
slots: {default: 'responsibleProcess_default', edit: 'responsibleProcess'}
},
{
field: 'responsibleEquipment',
- title: '璐ｄ换璁惧',
+ title: t('reportingWorks.responsibleEquipment'),
editRender: {},
slots: {default: 'reportingDeviceSort_default', edit: 'reportingDeviceSort'}
// editRender: {name: 'input', attrs: {placeholder: ''}}
},
{
- field: 'responsibleTeam', title: '璐ｄ换鐝粍',
+ field: 'responsibleTeam', title: t('reportingWorks.responsibleTeam'),
editRender: {},
slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}
},
{
field: 'responsiblePersonnel',
- title: '璐ｄ换浜哄憳',
+ title: t('rework.responsibilityInformation'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
@@ -409,7 +837,7 @@
validator ({ cellValue }) {
const regex = /^[1-9]\d*$/
if (!regex.test(cellValue)) {
- return new Error('杈撳叆澶т簬0鐨勬暣鏁�')
+ return new Error(t('reportingWorks.enterIntegerGreaterThan'))
}
}
}
@@ -419,31 +847,31 @@
validator ({ row }) {
const regex = /^\s*$/i
if(row.available===true && (regex.test(row.returnProcess)==='' || row.returnProcess===null)){
- return new Error('鍙埄鐢ㄥ凡閫夋嫨锛岃閫夋嫨杩斿洖宸ュ簭')
+ return new Error(t('reportingWorks.availableOkReturnProcess'))
}
}
}
],
breakageType: [
- { required: true, message: '璇烽�夋嫨娆＄牬绫诲瀷' }
+ { required: true, message: t('reportingWorks.selectBreakageType') }
],
breakageReason: [
- { required: true, message: '璇烽�夋嫨娆＄牬鍘熷洜' }
+ { required: true, message: t('reportingWorks.selectBreakageReason') }
],
responsibleProcess: [
- { required: true, message: '璇烽�夋嫨璐ｄ换宸ュ簭' }
+ { required: true, message: t('reportingWorks.selectResponsibleProcess')}
],
responsibleEquipment: [
- { required: true, message: '璇烽�夋嫨璐ｄ换璁惧' }
+ { required: true, message: t('reportingWorks.selectResponsibleEquipment') }
],
responsibleTeam: [
- { required: true, message: '璐ｄ换鐝粍' }
+ { required: true, message: t('reportingWorks.selectResponsibleTeam') }
],
},
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
- {code: 'addRow', name: '娣诲姞', status: 'primary', icon: 'vxe-icon-square-plus'},
- {code: 'removeRow', name: '鍒犻櫎', status: 'primary', icon: 'vxe-icon-delete'},
+ {code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
],
// import: false,
// export: true,
@@ -462,9 +890,10 @@
break
}
case 'removeRow': {
- let result = toolbarButtonClickEvent()
- if(result){
- $grid.remove(result.row)
+ const $grid = brokenGrid.value
+ const checkedList = $grid.getCheckboxRecords()
+ if(checkedList){
+ $grid.remove(checkedList)
}
break
}
@@ -472,18 +901,30 @@
}
}
}
-const openedBrokenTable = () => {
- addListener(brokenGrid.value,brokenGridOptions)
+
+const brokenGridKey = ref(0)
+const openedBrokenTable = async () => {
+ brokenGridKey.value++
+ await nextTick()
+ console.log('breakageType:', titleSelectJson.value.breakageType)
+ console.log('breakageReason:', titleSelectJson.value.breakageReason)
+ //addListener(brokenGrid.value,brokenGridOptions)
let damage =ref(brokenRow.value.damageDetails)
brokenGrid.value.reloadData(damage.value)
- //console.log(brokenRow.value)
}
const checkClose = async (done) => {
+ if(brokenGrid.value.getTableData().fullData.length===0){
+ brokenRow.value.breakageQuantity=null
+ brokenRow.value.completedQuantity = brokenRow.value.quantity
+ brokenRow.value.damageDetails=[]
+ done()
+ return true
+ }
const errMap = await brokenGrid.value.validate(true)
if (errMap) {
- ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ ElMessage.error(t('basicData.msg.checkoutLose'))
return false
}
let breakageQuantityCount = 0
@@ -493,33 +934,151 @@
})
let reportingWorkNum = isNaN(brokenRow.value.completedQuantity*1)?0:brokenRow.value.completedQuantity*1
- if(breakageQuantityCount+reportingWorkNum>brokenRow.value.quantity*1){
- ElMessage.warning(`鎹熻�楁暟:'${breakageQuantityCount}'
- 瀹屽伐鏁�:'${reportingWorkNum}'涔嬪拰${breakageQuantityCount+reportingWorkNum}
- 涓嶈兘澶т簬${brokenRow.value.quantity*1}`)
+ if((breakageQuantityCount>brokenRow.value.quantity*1) ){
+ ElMessage.warning(`${t('reportingWorks.lossCount1')}':'${breakageQuantityCount}
+ ${t('reportingWorks.lossCount2')}${brokenRow.value.quantity*1}`)
return false
}
-
+ brokenRow.value.completedQuantity = brokenRow.value.quantity-breakageQuantityCount
breakageQuantityCount = breakageQuantityCount === 0 ? null : breakageQuantityCount
brokenRow.value.breakageQuantity = breakageQuantityCount
brokenRow.value.damageDetails=brokenGrid.value.getTableData().fullData
+ // xGrid.value.getTableData().fullData.forEach(
+ //
+ // )
+ const equalByOrderNum = xGrid.value.getTableData().fullData.filter((row) =>{
+ return row.order_number === brokenRow.value.order_number
+ })
+ const maxQuantity = Math.max(...equalByOrderNum.map(item =>item.breakageQuantity || 0))
+ let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
+ equalByOrderNum.forEach((row) =>{
+ if (laminating != ''){
+ row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ }
+ })
+
+
+ getQuantity()
+
done()
}
-
//绗竴娆″姞杞芥暟鎹�
+let groupChangeProcess = ref(false)//鐢ㄤ簬鏈彮缁勬樉绀洪棶棰�
+const initTiltle = async () => {
+ hideButton()
+ await request.post(`/reportingWork/selectProcess/${user.user.userId}`).then((res) => {
+ if (res.code == 200) {
+ titleSelectJson.value.processType = res.data.process
+ processName = res.data.processNameList
+ if(user.user.address!==null && user.user.address!==''){
+ titleUploadData.value.thisProcess = user.user.address
+ titleUploadData.value.teamsGroupsName = user.user.userName
+ groupChangeProcess.value = true
+ if (user.user.address==='鎶�鏈儴澶氭洸' || user.user.address==='澶硅兌'){
+ groupChangeProcess.value = false
+ }
+ gridOptions.toolbarConfig.buttons[1].visible=false
+ }
-request.post(`/reportingWork/selectProcess`).then((res) => {
- if (res.code == 200) {
- titleSelectJson.value.processType = res.data.process;
- } else {
- ElMessage.warning(res.msg)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+
+function checkSameNumForId(data, targetId) {
+ // 鍒濆鍖栦竴涓璞℃潵瀛樺偍閬囧埌鐨刬d鍙婂叾瀵瑰簲鐨刵um鍊�
+ const idNums = {};
+ let firstNum = null;
+
+ for (const item of data) {
+ if (item.order_number === targetId) {
+ // 濡傛灉鎵惧埌浜嗙洰鏍噄d锛屾鏌um鏄惁涓庣涓�涓亣鍒扮殑num鐩稿悓
+ if (firstNum === null) {
+ // 濡傛灉鏄涓�涓亣鍒扮殑锛岃褰昻um鍊�
+ firstNum = item.completedQuantity;
+ } else if (item.completedQuantity !== firstNum) {
+ // 濡傛灉num鍊间笌绗竴涓亣鍒扮殑num涓嶅悓锛岃繑鍥瀎alse
+ return false;
+ }
+ }
}
-})
-const saveReportingWork = () => {
+ // 濡傛灉閬嶅巻瀹屾暟缁勫悗娌℃湁杩斿洖false锛岄偅涔堟墍鏈夊叿鏈夌洰鏍噄d鐨勫璞￠兘鍏锋湁鐩稿悓鐨刵um鍊�
+ return true;
+}
+
+
+
+
+
+const saveReportingWork = (state,saveType) => {
+
+ if(xGrid.value.getTableData().fullData.length===0){
+ ElMessage.warning(t('reportingWorks.selectProcessCardData'))
+ return
+ }
+ const device = titleUploadData.value.deviceName
+ if(device === null || device === undefined || device === ''){
+ ElMessage.error(t('reportingWorks.selectWorkReportingEquipment'))
+ return
+ }
+ const teamsGroupsName = titleUploadData.value.teamsGroupsName
+ if(teamsGroupsName === null || teamsGroupsName === undefined || teamsGroupsName === ''){
+ ElMessage.error(t('reportingWorks.selectWorkReportingTeam'))
+ return
+ }
+
+ const reportingWorkTime = titleUploadData.value.reportingWorkTime
+ const currentTime = new Date()
+ const targetTime = new Date(reportingWorkTime)
+ //鏈潵鏃堕棿
+ if (targetTime > currentTime) {
+ ElMessage.error(t('reportingWorks.futureTime'))
+ return
+ }
+ // 涓や釜鏃堕棿鐨勬绉掑樊
+ const diffMs = currentTime - targetTime
+ // 杞崲涓哄ぉ鏁�
+ const diffDays = diffMs / (1000 * 60 * 60 * 24)
+ if (diffDays > 396 && saveType!="update") {
+ ElMessage.error(t('reportingWorks.longTime'))
+ return
+ }
+
+ const seenIds = {}
+ const uniqueByOrderNum = xGrid.value.getTableData().fullData.filter(item => {
+ // 妫�鏌tem鐨刬d鏄惁宸茬粡鍦╯eenIds涓�
+ if (!seenIds[item.order_number]) {
+ // 濡傛灉涓嶅湪锛屾坊鍔犲畠骞惰繑鍥瀟rue浠ヤ繚鐣欒繖涓璞�
+ seenIds[item.order_number] = true;
+ return true;
+ }
+ // 濡傛灉宸茬粡鍦╯eenIds涓紝杩斿洖false浠ヨ繃婊ゆ帀杩欎釜瀵硅薄
+ return false;
+ });
+ const notFinishList = xGrid.value.getTableData().fullData.filter(item =>{
+ return item.saveFlag === 0
+ })
+ let process = titleUploadData.value.thisProcess
+ //鏆傛椂鍙栨秷
+ for(let item of uniqueByOrderNum){
+ const result = processName.find(item => item.basic_name === process);
+ const nickname = result ? result.nickname : null;
+ if(!checkSameNumForId(notFinishList,item.order_number ) && nickname && nickname.includes('step')){
+ ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}:
+ ${item.order_number}
+ ${t('reportingWorks.pleaseCheckTheOrderNumber2')}`)
+ return false
+ }
+ }
+//鍖呰鏂瑰紡
+ titleUploadData.value.packagingMethod = mannerPacking.value
titleUploadData.value.creator = user.user.userName
titleUploadData.value.creatorId = user.user.userId
const requestDetailData = xGrid.value.getTableData().fullData.filter((row) => {
@@ -527,24 +1086,78 @@
const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '' && row.breakageQuantity*1!==0)
return (a || b)
})
- if(requestDetailData.length === 0){
- ElMessage.warning('璇峰～鍐欒嚦灏戜竴鏉℃崯鑰楁暟鍜屽畬宸ユ暟澶т簬0')
+ if(requestDetailData.length === 0 && (route.query.reportingWorkId===undefined)){
+ ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
return false
}
-
+ let status=company.qualityInsStatus
const requestData = {
title:titleUploadData.value,
- detail:xGrid.value.getTableData().fullData
+ detail:xGrid.value.getTableData().fullData,
+ type:state,//瀹℃牳鐘舵��
+ userId:user.user.userId,
+ userName:user.user.userName,
+ qualityInsStatus:status
}
+ gridOptions.toolbarConfig.buttons[0].disabled=true
+ gridOptions.toolbarConfig.buttons[1].disabled=true
+ gridOptions.loading=true
+ //鍒ゆ柇淇濆瓨杩樻槸淇敼
+ if(saveType==='save'){
+ saveReportingWorkRequest(requestData)
+ }else{
+ updateReportingWorkRequest(requestData)
+ }
+
+}
+
+const saveReportingWorkRequest = (requestData) =>{
request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
if (res.code == 200){
- ElMessage.success("鎶ュ伐鎴愬姛")
- router.push({path:'/main/reportingWorks/AddReportingWork',query:{random:Math.random()}})
+ ElMessage.success(t('reportingWorks.successfulJobApplication'))
+ //鎶ュ伐鍏ュ簱
+ if(storageBtn.value == true){
+ getStorageWork();
+ }
+ gridOptions.loading=false
+ router.push({path:'/main/reportingWorks/AddReportingWork',query:{processId:titleUploadData.value.processId,random:Math.random()}})
}else{
- ElMessage.error(res.msg)
+ const errorObj = JSON.parse(res.msg)
+ const msg = t('reportingWorks.pleaseNumber1')+"锛�"+errorObj.orderNumber+'\n'
+ +t('reportingWorks.pleaseNumber2')+'锛�'+errorObj.technologyNumber+'\n'
+ +t('reportingWorks.pleaseNumber3')+'锛�'+errorObj.processNum+'<'+
+ +t('reportingWorks.pleaseNumber4')+'锛�'+errorObj.sumNum+'\n'
+ +t('reportingWorks.pleaseNumber5')
+ gridOptions.loading=false
+ ElMessage.error(msg)
}
}).catch(err =>{
- ElMessage.error(err.message)
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ gridOptions.loading=false
+ }).finally(()=>{
+ gridOptions.toolbarConfig.buttons[0].disabled=false
+ gridOptions.toolbarConfig.buttons[1].disabled=false
+ gridOptions.loading=false
+ })
+}
+
+//鏇存柊鎶ュ伐鏁版嵁
+const updateReportingWorkRequest = (requestData) =>{
+ let reviewState = 'update'
+ if(route.query.reviewStatus==="1"){
+ reviewState = 'review'
+ }
+ request.post(`/reportingWork/updateReportingWork/${reviewState}`,requestData).then(res =>{
+ if (res.code == 200 && res.data===true){
+ ElMessage.success(t('reportingWorks.successfulModificationOfWorkApplication'))
+ router.push({path:'/main/reportingWorks/AddReportingWork',
+ query:{
+ processId:titleUploadData.value.processId,
+ random:Math.random()}
+ })
+ } else {
+ ElMessage.warning(t('reportingWorks.changeFailed'))
+ }
})
}
@@ -559,6 +1172,7 @@
})
// 鏌ヨ璐ｄ换鐝粍
const computedResponsibleTeam = computed((responsibleProcess) => {
+ titleSelectJson.value.historyTeams.push({basic_name: user.user.userName, process: titleUploadData.value.thisProcess, basic_type: 'teamsgroups', basic_category: 179, id: 555})
return function (responsibleProcess){
return titleSelectJson.value.historyTeams.filter((item) => {
return item.process === responsibleProcess
@@ -575,48 +1189,125 @@
}
})
-
-//涓嬫媺娆鹃�夋嫨宸ュ簭鏃舵煡璇�
-const getWork = () => {
-
- let processId = titleUploadData.value.processId
+let loadingFlag = ref(false)
+let disabledFlag = ref(true)
+const reviewReportingWork = () => {
+ const processId = titleUploadData.value.processId
if (processId.indexOf("/") < 0) {
-
- ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ ElMessage.warning(t('reportingWorks.correctFormatProcessCard'))
return
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
- if (leftString.length != 13) {
- ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ if (leftString.length < 14) {
+ ElMessage.warning(t('reportingWorks.processCardCorrectNumberDigits'))
+ return
+ }
+//宸ュ簭
+ let process = titleUploadData.value.thisProcess
+ if (process === "" || process == null) {
+ ElMessage.warning(t('reportingWorks.selectProcess'))
+ return
+ }
+ if(titleUploadData.value.previousProcess===''){
+ ElMessage.warning(t('reportingWorks.firstProcessNotReview'))
+ return
+ }
+ //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+ const regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const result = processId.match(regex);
+ //娴佺▼鍗″彿
+ let processIdStr = result[1];
+ //灞傚彿
+ let technologyStr = result[2];
+ const reportWork = {
+ process: titleUploadData.value.previousProcess,
+ processId:processId,
+ thisProcess:titleUploadData.value.thisProcess,
+ technologyStr:technologyStr,
+ userName:user.user.userName
+ }
+ loadingFlag.value= true
+ request.post("/reportingWork/reviewReportingWork",reportWork).then((res) =>{
+ if(res.code === '200'){
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ router.push({path:'/main/reportingWorks/AddReportingWork',
+ query:{
+ processId:titleUploadData.value.processId,
+ reviewStatus:1,
+ random:Math.random()
+ }
+ })
+ }
+ }).finally(
+ loadingFlag.value= false
+ )
+
+}
+
+
+//涓嬫媺娆鹃�夋嫨宸ュ簭鏃舵煡璇�
+const getWork = () => {
+ let processId = titleUploadData.value.processId
+ if (processId == "" || processId == null) {
+ ElMessage.warning(t('reportingWorks.theProcessCardNumberCannotBeEmpty'))
+ return
+ }
+ let parts = processId.split('/');
+
+ if (processId.indexOf("/") < 0 ||parts[1].trim() == '') {
+ ElMessage.warning(t('reportingWorks.correctFormatProcessCard'))
+ return
+ }
+ let indexOfChar = processId.indexOf("/")
+ let leftString = processId.slice(0, indexOfChar)
+ if (leftString.length < 14) {
+ ElMessage.warning(t('reportingWorks.processCardCorrectNumberDigits'))
return
}
//宸ュ簭
let process = titleUploadData.value.thisProcess
if (process == "" || process == null) {
-
- ElMessage.warning("璇烽�夋嫨宸ュ簭")
+ ElMessage.warning(t('reportingWorks.selectProcess'))
return
}
-
- if (titleSelectJson.value.thisProcessType.indexOf(process) == -1 && process != "鍒囧壊" && titleSelectJson.value.thisProcessType != "") {
- ElMessage.warning("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
- return
+ if (titleSelectJson.value.thisProcessType.length!=0){
+ if (titleSelectJson.value.thisProcessType.indexOf(process) === -1 && process !== t('machine.cutting')) {
+ ElMessage.warning(t('reportingWorks.thisProcessNotProcessCard'))
+ return
+ }
}
+
+ //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+ const regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const result = processId.match(regex);
//娴佺▼鍗″彿
- let processIdStr = processId.substring(0, 13);
+ let processIdStr = result[1];
//灞傚彿
- let technologyStr = processId.substring(14);
+ let technologyStr = result[2];
- request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
+ let reportType= company.reportType
+ request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
if (res.code == 200) {
+ if(res.data.data==null){
+ ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
+ return
+ }
+ technologicalProcess=res.data.technologicalProcess
//琛ㄥご璧嬪��
titleUploadData.value = res.data.data
titleUploadData.value.processId = processId
+ titleUploadData.value.teamsGroupsName = user.user.userName
+ titleUploadData.value.laminating = res.data.laminating
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
- titleSelectJson.value.teamsType = res.data.teams
+ if (teamsTypeValue==true){
+ titleSelectJson.value.teamsType = res.data.teams
+ }
+
//褰撳墠娴佺▼鍗″伐搴�
titleSelectJson.value.thisProcessType = res.data.thisProcess
//鍘嗗彶鐝粍
@@ -629,14 +1320,42 @@
titleSelectJson.value.breakageType = res.data.breakageType
//娆＄牬鍘熷洜
titleSelectJson.value.breakageReason = res.data.breakageReason
- //console.log(res.data)
- titleUploadData.value.classes='鏃╃彮'
+ if(titleUploadData.value.reviewedState==1){
+ gridOptions.toolbarConfig.buttons[0].disabled=false
+ gridOptions.toolbarConfig.buttons[1].disabled=false
+ disabledFlag.value=true
+ }else {
+ gridOptions.toolbarConfig.buttons[0].disabled=true
+ gridOptions.toolbarConfig.buttons[1].disabled=true
+ disabledFlag.value=false
+ }
+
+ //鍒ゆ柇鏃╂櫄鐝�
+ titleUploadData.value.classes=t('reportingWorks.early')
+ titleUploadData.value.reportingWorkTime = res.data.reportingWorkTiem
- titleUploadData.value.reportingWorkTime = formatCurrentTime()
//缁戝畾涓嬫柟琛ㄦ牸
- detail.value = res.data.Detail
+
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = res.data.Detail.map(item => {
+ if (item.reviewed_state === 1) {
+ return { ...item, reviewed_state: t('productStock.approved') };
+ }
+ else if (item.reviewed_state === 0) {
+ return { ...item, reviewed_state: t('reportingWorks.unreviewed') };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ detail.value = modifiedCollection
xGrid.value.reloadData(detail.value)
+ hideButton()
+ // nextTick(() => {
+ // hiddenCompletedOk()
+ // })
} else {
ElMessage.warning(res.msg)
}
@@ -658,11 +1377,11 @@
}
if (item.quantity < item.completedQuantity) {
- ElMessage.success("搴忓彿" + item.order_number + "鐨勬暟閲忎笉鑳藉ぇ浜庝笂宸ュ簭鏁伴噺")
+ ElMessage.success(t('reportingWorks.pleaseNumber6') + item.order_number + t('reportingWorks.pleaseNumber7'))
} else if (item.breakageQuantity * 1 + item.completedQuantity * 1 > item.quantity * 1) {
- ElMessage.success("璇疯緭鍏ュ簭鍙�" + item.order_number + "姝ｇ‘鐨勫畬宸ユ垨娆＄牬鏁伴噺")
+ ElMessage.success(t('reportingWorks.pleaseNumber8') + item.order_number + t('reportingWorks.pleaseNumber9'))
}
sum = item.completedQuantity * 1 + sum * 1
@@ -683,25 +1402,287 @@
let hours = dateObj.getHours().toString().padStart(2, '0'); // 灏忔椂
let minutes = dateObj.getMinutes().toString().padStart(2, '0'); // 鍒嗛挓
let seconds = dateObj.getSeconds().toString().padStart(2, '0'); // 绉掓暟
- if(parseInt(hours)>=17)titleUploadData.value.classes='鏅氱彮'
+ if(parseInt(hours)>=17 && parseInt(hours)<8)titleUploadData.value.classes=t('reportingWorks.nightShift')
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; // 杩斿洖鏍煎紡鍖栧悗鐨勬椂闂村瓧绗︿覆
}
-const ptypeChangeEvent = (row) => {
- // for (let i = 0; i < row.length; i++){
- //
- // let process=row[i].responsibleProcess
- // }
+const editClosedEvent = ({ row, column }) => {
+ let process = titleUploadData.value.thisProcess
+ let laminating = titleUploadData.value.laminating
+ if (column.property==='completedQuantity') {
+ xGrid.value.getTableData().fullData.forEach((item, index) =>{
+ if(item.order_number===row.order_number && laminating != ''){
+ item.completedQuantity=row.completedQuantity
+ }
+ })
+ getQuantity()
+ }
+}
+const getQuantity = () => {
+ titleUploadData.value.thisCompletedQuantity = 0
+ titleUploadData.value.thisWornQuantity = 0
+ let laminating = titleUploadData.value.laminating
+ const arr = xGrid.value.getTableData().fullData
+ //鏍规嵁鏄惁鍚堢墖宸ュ簭杩囨护
+ const returnArr =
+ laminating != ""
+ ? arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+ : arr;
+ let sumBreak = 0
+ let sumQuantity = 0
+ returnArr.forEach((item)=>{
+ sumQuantity+=Number(item.completedQuantity*1)
+ })
+ arr.forEach((item)=>{
+ sumBreak+=Number(item.breakageQuantity) || 0
+ })
+ titleUploadData.value.thisCompletedQuantity = sumQuantity
+ titleUploadData.value.thisWornQuantity = sumBreak
+}
+
+const changeTable=()=>{
+ const $grid = xGrid.value
+ this.$grid.commitProxy('data', yourData)
+}
+onMounted(() => {
+ window.addEventListener('keypress', qrcodeScanner);
+ addListener(xGrid.value, gridOptions)
+})
+
+// 鍦ㄧ粍浠跺嵏杞芥椂绉婚櫎閿洏浜嬩欢鐩戝惉
+onUnmounted(() => {
+ window.removeEventListener('keypress', qrcodeScanner);
+})
+
+let code = '';
+let codeArr = [];
+let lastTime,nextTime = ''
+let lastCode,nextCode = ''
+const qrcodeScanner = (e) =>{
+
+ nextCode = e.key;
+
+
+ // 褰撳墠瑙﹀彂鏃堕棿
+ nextTime = new Date().getTime();
+ // 绗竴娆¤幏鍙�
+ if(!lastTime && !lastCode && e.key !== 'Enter'){
+ codeArr = []
+ codeArr.push(e.key)
+ }
+
+ if(lastCode && lastTime && (nextTime - lastTime > 50)){
+ // 鐩搁殧鏃堕棿澶т簬30 璇存槑涓嶆槸鎵爜鏋壂鎻忕殑 娓呯┖閲嶆柊
+ codeArr = []
+ // 褰撴壂鐮佸墠鏈塳eypress浜嬩欢鏃�,闃叉棣栧瓧缂哄け
+ } else if(lastCode && lastTime && e.key !== 'Enter'){
+ codeArr.push(e.key)
+ }
+ lastCode = nextCode
+ lastTime = nextTime
+ // 鎵弿缁撴潫
+ if(e.keyCode === 13){
+ // 鍙繘琛屼笅涓�姝ユ搷浣�
+ /* 涓嬩竴姝ユ搷浣� */
+ if(codeArr.length!==0){
+ titleUploadData.value.processId = codeArr.join('')
+ }
+ if(user.user.address!==null || user.user.address!==''){
+ getWork()
+ }
+
+ codeArr=[]
+ lastTime = ''
+ nextTime = ''
+ lastCode = ''
+ nextCode = ''
+ }
+
+}
+
+
+const cellClassName = ({ row, column }) => {
+ if (column.field === 'breakageQuantity') {
+ return 'col-red'
+ }
+
+}
+const changeRowClass = ({ row, rowIndex, $rowIndex }) => {
+ return row?.rowClass
+
+}
+const editConfigDisable = reactive({
+ trigger: 'click',
+ mode: 'cell',
+ beforeEditMethod ({ row }) {
+ if (row.patchStatusOther === '宸茶ˉ鐗�') {
+ return false
+ }
+ return true
+ }
+})
+
+
+//鎶ュ伐鍏ュ簱鏂规硶
+const getStorageWork = () => {
+ let processId = titleUploadData.value.processId
+ //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+ const regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const resultProcessId = processId.match(regex);
+ //娴佺▼鍗″彿
+ let processIdStr = resultProcessId[1];
+ //灞傚彿
+ let technologyStr = resultProcessId[2];
+ //寮�濮嬪鐞嗗叆搴撻渶瑕佺殑鏁版嵁
+ let rawData = xGrid.value.getTableData().fullData
+ const seen = new Set();
+ const result = rawData.filter(item => {
+ // 1. 鍏堟妸 completedQuantity 涓� 0 鐨勫墧闄�
+ if (item.completedQuantity === 0 || item.completedQuantity =="0" || item.completedQuantity =="") {
+ return false;
+ }
+ // 2. 閬囧埌鐩稿悓 order_number锛屽彧淇濈暀绗竴娆★紝鍚庨潰閮戒涪寮�
+ if (seen.has(item.order_number)) {
+ return false;
+ }
+ seen.add(item.order_number);
+ return true;
+ });
+
+ // 缁欐瘡鏉¤褰曡拷鍔� order 瀛楁
+ const resultData = result.map(item => ({
+ ...item,
+ order: {
+ orderId: titleUploadData.value.orderId
+ },
+ processId:processIdStr,
+ orderNumber:item.order_number,
+ inventoryQuantity:item.completedQuantity
+ }));
+ let flowData = ref({
+ decValue:company.decValue,
+ userId: user.user.userId,
+ userName: user.user.userName,
+ storageRegion: storageRegion.value,
+ remark: remark.value,
+ container: container.value,
+ flowCard: resultData,
+ createTime: titleUploadData.value.reportingWorkTime
+ })
+ //璋冪敤鍏ュ簱鎺ュ彛
+ request.post("/finishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('productStock.receivedSuccessfully'))
+ // router.push({path:'/maiggn/productStock/CreateProductStock',query:{random:Math.random()}})
+ }else if(res.data==="false1"){
+ ElMessage.warning(t('basicData.msg.quantityError'))
+ }else if(res.data==="false2"){
+ ElMessage.warning(t('basicData.msg.dataDoesNotExist'))
+ }else{
+ ElMessage.warning(t('productStock.entryFailure'))
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+}
+
+const hideButton = () => {
+ // 鑾峰彇鏈�鍚庝竴閬撳伐搴�
+ const parts = technologicalProcess.split('->');
+ let last = parts[parts.length - 1];
+ if (last === '') {
+ last = null;
+ }
+ const els = document.querySelectorAll('.inventory_content');
+
+ // 鏄惁鏄剧ず鎶ュ伐鍏ュ簱鐩稿叧鎸夐挳鍐呭
+ if (btnValue == false || last != titleUploadData.value.thisProcess) {
+ els.forEach(el => {
+ el.style.display = 'none';
+ });
+ } else {
+ els.forEach(el => {
+ el.style.display = '';
+ });
+ // 閬垮厤閲嶅娣诲姞鎸夐挳
+ const exists = gridOptions.toolbarConfig.buttons.some(btn => btn.code === 'saveWorkStorage');
+ if (!exists) {
+ let buttons = {
+ code: 'saveWorkStorage',
+ name: t('reportingWorks.saveWorkStorage'),
+ status: 'primary',
+ icon: 'vxe-icon-save'
+ };
+ gridOptions.toolbarConfig.buttons.push(buttons);
+ }
+ }
+
+ // 杩囨护鎸夐挳锛岄殣钘� saveWorkStorage 鎸夐挳鏃舵満
+ gridOptions.toolbarConfig.buttons = gridOptions.toolbarConfig.buttons.filter(button => {
+ if ((btnValue == false || last != titleUploadData.value.thisProcess) && button.code === 'saveWorkStorage') {
+ return false;
+ }
+ return true;
+ });
+};
+
+
+
+const changeGroup = (value)=> {
+ //鍒ゆ柇鍘嗗彶鐝粍鏄惁鏈夋鐝粍淇℃伅
+ const exists = titleSelectJson.value.historyTeams.some(item => item.basic_name === value)
+ if(! exists){
+ titleSelectJson.value.historyTeams.push({
+ basic_name: value,
+ process: titleUploadData.value.thisProcess,
+ basic_type: 'teamsgroups',
+ id: 555
+ })
+ }
+
+
+}
+
+const onHiddenChange = (checked) => {
+ hiddenVal.value = checked ? 1 : 0
+ hiddenCompletedOk()
+}
+
+const hiddenCompletedOk = () => {
+ const $grid = xGrid.value
+ const data = $grid.getTableData().fullData
+ const laminating = titleUploadData.value.laminating
+ const filteredData = data.filter(row => {
+ return row.completedQuantity>0 //杩囨护鍙畬宸ユ暟閲忎负0鐨�
+ })
+ if (laminating == ''){
+ if (hiddenVal.value == 1){
+ // 閲嶆柊鍔犺浇杩囨护鍚庣殑鏁版嵁
+ $grid.loadData(filteredData)
+ }else {
+ //鍘熷鏁版嵁
+ $grid.loadData(detail.value);
+ }
+ }
}
</script>
<template>
- <div style="height: 100%;width: 100%">
- <div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
- <el-input v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
+ <div style="width: 100%;height: 100%">
+ <div class="head">
+ <el-input :disabled="inputDisabled" v-if="titleUploadData.reportingWorkId" v-model="titleUploadData.reportingWorkId" :placeholder="$t('reportingWorks.reportingWorkId')" style="width: 200px" />
+ <el-input :disabled="inputDisabled" v-model="titleUploadData.processId" :placeholder="$t('processCard.processId')" style="width: 200px" @keyup.enter.native="getWork();getQuantity()"/>
- <el-select v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
- @change="getWork">
+ <el-select :disabled="inputDisabled || groupChangeProcess"
+ v-model="titleUploadData.thisProcess"
+ clearable
+ :placeholder="$t('reportingWorks.selectProcess')"
+ style="width: 120px"
+ @change="getWork();getQuantity()">
<el-option
v-for="item in titleSelectJson['processType']"
:key="item.id"
@@ -710,51 +1691,70 @@
/>
</el-select>
- <el-button type="primary">瀹℃牳閫氳繃</el-button>
- <el-button type="primary">瀹℃牳涓嶉�氳繃</el-button>
+ <el-button :disabled="disabledFlag" :loading="loadingFlag" @click="reviewReportingWork" type="primary">{{$t('reportingWorks.passAudit')}}
+ </el-button>
- <label>娴佺▼鍗￠潰绉細xxx骞虫柟绫�</label>
+ <span class="inventory_content">
+ <el-select style="width: 100px" v-model="mannerPacking" class="processesSt" :placeholder="$t('reportingWorks.mannerPacking')">
+ <el-option
+ v-for="item in mannerPackingOp"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ <el-input style="width: 100px" v-model="container" class="m-2" :placeholder="$t('productStock.pleaseEnterTheBoxNumber')">
+ </el-input>
+ <el-input style="width: 100px" v-model="storageRegion" class="m-2" :placeholder="$t('productStock.pleaseEnterTheStorageLocation')">
+ </el-input>
+ <el-input style="width: 200px" v-model="remark" class="m-2" :placeholder="$t('productStock.pleaseEnterANote')">
+ </el-input>
+ </span>
+<!-- <el-button type="primary">瀹℃牳涓嶉�氳繃</el-button>-->
+
+ <label>{{technologicalProcess}}</label>
</div>
- <div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
+ <div class="head1">
<el-row>
<el-col :span="2">
- <el-text>閿�鍞崟鍙凤細</el-text>
+ <el-text>{{$t('order.orderId')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.orderId }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鐢熶骇璁㈠崟鍙凤細</el-text>
+ <el-text>{{$t('workOrder.productionId')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.productionId }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>瀹㈡埛缂栫爜锛�</el-text>
+ <el-text>{{$t('processCard.customerId')}}锛�</el-text>
</el-col>
<el-col :span="2">
<el-text>{{ titleUploadData.order.customerId }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>瀹㈡埛鍚嶇О锛�</el-text>
+ <el-text>{{$t('processCard.customerName')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text class="customClass"></el-text>
</el-col>
<el-col :span="2">
- <el-text>椤圭洰鍚嶇О锛�</el-text>
+ <el-text >{{$t('order.project')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-text wrap-text="false">{{ titleUploadData.order.project }}</el-text>
+ <el-input :readonly="true" v-model="titleUploadData.order.project"/>
+<!-- <el-text style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{ titleUploadData.order.project }}</el-text>-->
</el-col>
</el-row>
<el-row>
<el-col :span="2">
- <el-text>鎶ュ伐璁惧锛�</el-text>
+ <el-text>{{$t('reportingWorks.deviceType')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.deviceName" clearable placeholder="璇烽�夋嫨璁惧">
+ <el-select @change="getQuantity" v-model="titleUploadData.deviceName" clearable :placeholder="$t('reportingWorks.pleaseDevice')">
<el-option
v-for="item in titleSelectJson['deviceType']"
:key="item.id"
@@ -764,27 +1764,27 @@
</el-select>
</el-col>
<el-col :span="2">
- <el-text>涓婂伐搴忥細</el-text>
+ <el-text>{{$t('reportingWorks.previousProcess')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.previousProcess }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鍙姤宸ユ暟閲忥細</el-text>
+ <el-text>{{$t('reportingWorks.numberReported')}}锛�</el-text>
</el-col>
<el-col :span="2">
- <el-text>{{ titleUploadData.flowCard.quantity }}</el-text>
+ <el-text>{{ titleUploadData.previousProcessQuantity }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鏈伐搴忓畬宸ワ細</el-text>
+ <el-text>{{$t('reportingWorks.thisCompletedQuantity')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.thisCompletedQuantity }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鏈伐搴忔鐮达細</el-text>
+ <el-text>{{$t('reportingWorks.thisWornQuantity')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-text>{{ titleUploadData.thisWornQuantity }}</el-text>
@@ -793,23 +1793,27 @@
</el-row>
<el-row>
<el-col :span="2">
- <el-text>鎶ュ伐鐝粍锛�</el-text>
+ <el-text>{{$t('reportingWorks.teamsType')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.teamsGroupsName" clearable placeholder="璇烽�夋嫨鐝粍">
+ <el-select :disabled="groupChangeProcess"
+ v-model="titleUploadData.teamsGroupsName"
+ @change="changeGroup"
+ clearable
+ :placeholder="$t('reportingWorks.selectTeam')">
<el-option
v-for="item in titleSelectJson['teamsType']"
:key="item.id"
- :label="item.basicName"
- :value="item.basicName"
+ :label="item.user_name"
+ :value="item.user_name"
/>
</el-select>
</el-col>
<el-col :span="2">
- <el-text>鐝锛�</el-text>
+ <el-text>{{$t('reportingWorks.classes')}}锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.classes" class="processesSt" placeholder="">
+ <el-select v-model="titleUploadData.classes" class="processesSt" :placeholder="$t('reportingWorks.selectClasses')">
<el-option
v-for="item in classesOption"
:key="item.value"
@@ -819,14 +1823,14 @@
</el-select>
</el-col>
<el-col :span="2">
- <el-text>涓嬪伐搴忥細</el-text>
+ <el-text>{{$t('reportingWorks.nextProcess')}}锛�</el-text>
</el-col>
<el-col :span="2">
<el-text>{{ titleUploadData.nextProcess }}</el-text>
</el-col>
<el-col :span="2">
- <el-text>鎶ュ伐鏃ユ湡锛�</el-text>
+ <el-text>{{$t('reportingWorks.reportingWorkTime')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-date-picker
@@ -839,7 +1843,7 @@
/>
</el-col>
<el-col :span="2">
- <el-text>澶囨敞锛�</el-text>
+ <el-text>{{$t('basicData.remarks')}}锛�</el-text>
</el-col>
<el-col :span="3">
<el-input v-model="titleUploadData.notes" placeholder="" />
@@ -847,15 +1851,18 @@
</el-row>
</div>
- <div class="main-div-customer" style="width: 100%;height: 70%">
+ <div class="main-table">
<vxe-grid
ref="xGrid"
class="mytable-scrollbar"
- max-height="100%"
+ :row-class-name="changeRowClass"
+ height="100%"
size="small"
v-bind="gridOptions"
v-on="gridEvents"
- @filter-change="filterChanged"
+ @edit-closed="editClosedEvent"
+ :cell-class-name="cellClassName"
+ :edit-config="editConfigDisable"
>
@@ -863,23 +1870,35 @@
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
- <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+ <input v-model="option.data" type="type"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
-
+ <template #toolbar_buttons>
+ <el-checkbox
+ :model-value="hiddenVal === 1"
+ @change="onHiddenChange"
+ >
+ {{ t('reportingWorks.hiddenVal') }}
+ </el-checkbox>
+
+ </template>
</vxe-grid>
+ </div>
<el-dialog
@opened="openedBrokenTable"
:before-close="checkClose"
v-model="brokenVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
- title="鐮存崯鍒楄〃"
+ :title="$t('reportingWorks.damageList')+':'
+ +brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
style="width: 80%;height:75% ">
<vxe-grid
-
+ :key="brokenGridKey"
height="400px"
ref="brokenGrid"
class="mytable-scrollbar"
@@ -918,10 +1937,8 @@
</template>
<!-- 鍒虹牬绫诲瀷breakageType -->
<template #breakageType="{ row }">
- <vxe-select v-model="row.breakageType "
- filterable
- clearable
- placeholder="">
+ <vxe-select v-model="row.breakageType"
+ clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageType" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
</template>
@@ -931,10 +1948,8 @@
<!--娆＄牬鍘熷洜-->
<template #breakageReason="{ row }">
- <vxe-select v-model="row.breakageReason "
- filterable
- clearable
- placeholder="">
+ <vxe-select v-model="row.breakageReason"
+ clearable placeholder=" " allow-create filterable>
<vxe-option v-for="item in titleSelectJson.breakageReason" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
</vxe-select>
</template>
@@ -976,12 +1991,24 @@
</vxe-grid>
</el-dialog>
- </div>
</div>
</template>
<style scoped>
+.head{
+ width: 100%;
+ height: 35px;
+}
+.head1{
+ width: 100%;
+ height: 105px;
+ background-color: white;
+}
+.main-table{
+ width: 100%;
+ height: calc(100% - 135px);
+}
.processCard {
width: 140px;
@@ -1051,4 +2078,12 @@
user-select: none;
}
+::v-deep(.mytable-scrollbar .col-red) {
+ background-color: rgb(66,159,254)!important;
+}
+
+
+::v-deep(.latter) {
+ //display: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0