From 1c13bd7a2cd2c8ba69a185da69344c8b59f4e561 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 04 七月 2024 09:29:15 +0800
Subject: [PATCH] 选中求和功能以及还原双击回车才能点击单元格
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 1233 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 999 insertions(+), 234 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 af4a56d..132bd11 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,27 +1,38 @@
<script setup>
-import {reactive, ref} 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 {changeFilterEvent, filterChanged} from "@/hook"
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"
+//璇█鑾峰彇
+const { t } = useI18n()
let brokenVisible = ref(false)
const xGrid = ref()
-let router = useRouter()
-
-
+const brokenGrid =ref()
+const router = useRouter()
+const route = useRoute()
+const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ reportingWorkId: null,
+ //娴佺▼鍗″彿
+ processId: null,
//閿�鍞崟鍙�
orderId: '',
+ reviewedState:0,
//鐢熶骇鍗曞彿
productionId: '',
//璁惧绫诲瀷
- deviceType: '',
- //鐝粍绫诲瀷
- teamsType: '',
+ deviceName: '',
+ //鐝粍鍚嶇О
+ teamsGroupsName: '',
//鐢熶骇鏃ユ湡
- reportingWorkDate: '',
+ reportingWorkTime: '',
//鎶ュ伐宸ュ簭
thisProcess: '',
//涓婂伐搴�
@@ -53,6 +64,8 @@
})
+let detail = ref([])
+let layer=''
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -61,7 +74,77 @@
processType: [],
thisProcessType: [],
mateProcessType: [],
+ historyDevice:[],
+ historyTeams:[],
+ historyProcess:[],
+ breakageType:[],
+ breakageReason:[]
+
})
+
+
+
+let inputDisabled = ref(false)
+onMounted(() =>{
+ if(route.query.processId !== undefined && route.query.processId!=='' && route.query.processId!=null ){
+ titleUploadData.value.processId = route.query.processId
+ }
+ //route.query.reportingWorkId = 'BG2403150004'
+ //鍒ゆ柇鏄惁浼犲叆鎶ュ伐缂栧彿
+ if(route.query.reportingWorkId !== '' && route.query.reportingWorkId!=null){
+ 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
+
+ const s01Values = [];
+ // 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
+ res.data.numberList.forEach(element => {
+ try {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ if (s01Value) {
+ s01Values.push(s01Value);
+ } else {
+ // 濡傛灉 S01 鍊间负绌猴紝鍙互閫夋嫨娣诲姞榛樿鍊兼垨鑰呭拷鐣ヨ繖涓厓绱�
+ s01Values.push(''); // 渚嬪娣诲姞绌哄瓧绗︿覆
+ }
+ } catch (error) {
+ // console.error('Error parsing JSON or accessing S01 value:', error);
+ // 澶勭悊 JSON 瑙ｆ瀽閿欒鎴栧叾浠栧紓甯告儏鍐�
+ }
+ });
+ // 閬嶅巻 res.data.Detail 鏁扮粍锛屽皢 s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.reportingWorkDetails.forEach((detail, index) => {
+ if (index < s01Values.length) {
+ detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
+ } else {
+ detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
+ }
+ });
+ //titleUploadData.value.processId=titleUploadData.value.processId+'/'+layer
+ xGrid.value.reloadData(res.data.reportingWorkDetails)
+ let button = {
+ code: 'update',
+ name: t('basicData.update'),
+ status: 'primary',
+ }
+ if(route.query.reviewStatus === "1"){
+ button.name=t('basicData.review')
+ titleUploadData.value.qualityInspector=user.user.userName
+ }
+
+ gridOptions.toolbarConfig.buttons.push(button)
+ }
+ // getQuantity()
+ 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) => {
@@ -72,41 +155,24 @@
return count.toFixed(2)
}
-const form = reactive({
- processId: 'NG24022302A01/1'
-})
+
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'),
},
]
-//瀛愮粍浠舵帴鏀跺弬鏁�
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -130,23 +196,69 @@
customConfig: {
storage: true
},
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true,
+ isDel: true,
+ isEnter: true,
+ isTab: true,
+ isEdit: true,
+ isChecked: true
+ },
editConfig: {
trigger: 'click',
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
+ },
+ ]
+ ]
+ }*/
+ },
+ //琛ㄥご鍙傛暟
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'},
@@ -154,21 +266,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",
@@ -176,82 +288,65 @@
},
{
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: 'breakageNumber', title: '娆＄牬鏁伴噺',
-
+ field: 'breakageQuantity', title: t('reportingWorks.quantityBroken'),
},
- // {field: 'available', width: 80, title: '鍙埄鐢�', editRender: {name: 'input', attrs: {placeholder: ''}}},
- // {field: 'returnProcess', width: 100, title: '閫�鍥炲伐搴�', editRender: {name: 'input', attrs: {placeholder: ''}}},
- // {
- // field: 'reasonType', width: 100, title: '娆＄牬绫诲瀷',
- // editRender: {name: 'input', attrs: {placeholder: '', type: 'selected'}}
- // },
- // {
- // field: 'reasonDamage', width: 100, title: '娆＄牬鍘熷洜',
- // editRender: {name: 'input', attrs: {placeholder: ''}}
- // },
- // {
- // field: 'responsibleProcess', width: 100, title: '璐ｄ换宸ュ簭',
- // editRender: {},
- // slots: {default: 'reportingWordSort_default', edit: 'reportingWordSort'}
- // //editRender: {name: 'input', attrs: {placeholder: '',type: 'selected'}},
- //
- // },
- // {
- // field: 'responsibleEquipment',
- // width: 100,
- // title: '璐ｄ换璁惧',
- // editRender: {},
- // slots: {default: 'reportingDeviceSort_default', edit: 'reportingDeviceSort'}
- // // editRender: {name: 'input', attrs: {placeholder: ''}}
- // },
- //
- // {
- // field: 'responsibleTeam', width: 100, title: '璐ｄ换鐝粍',
- // editRender: {name: 'input', attrs: {placeholder: ''}}
- // },
- // {
- // field: 'responsibilityPersonnel',
- // width: 100,
- // title: '璐ｄ换浜哄憳',
- // editRender: {name: 'input', attrs: {placeholder: ''}}
- //
- // },
- {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'),},
],
//琛ㄥ崟楠岃瘉
- editRules: {},
+ editRules: {
+ completedQuantity: [
+ {
+ validator ({ row }) {
+ 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(t('reportingWorks.enterIntegerGreaterThanEqualTo'))
+ }else if((row.completedQuantity*1+brokenNum*1)>row.quantity*1){
+ return new Error((`${row.completedQuantity}+${brokenNum}>${row.quantity}`))
+ }
+ if(titleUploadData.value.reportingWorkId!=null && row.completedQuantity<row.minQuantity){
+ return new Error(`${t('reportingWorks.pleaseGreaterThanOrEqual1')}
+ ${row.minQuantity}
+ ${t('reportingWorks.pleaseGreaterThanOrEqual2')}`)
+ }
+
+ }
+ }
+ ]
+ },
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
// {code: 'empty', name: '娓呯┖鎶ュ伐鏁伴噺'},
@@ -259,8 +354,8 @@
// {code: 'sameDamage', name: '娆＄牬鐩稿悓'},
// {code: 'sameOneCompletion', name: '瀹屽伐涓�鍒楃浉鍚�'},
// {code: 'sameOneDamage', name: '娆＄牬涓�鍒楃浉鍚�'},
- {code: 'print_lck', 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},
],
// import: false,
// export: true,
@@ -268,51 +363,148 @@
zoom: true,
custom: true
},
- data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- // footerMethod({columns, data}) {//椤佃剼鍑芥暟
- // let footList = ['', '', '', '', '']
- // return [
- // columns.map((column, columnIndex) => {
- // if (columnIndex === 0) {
- // return '鍚堣:'
- // }
- // if (footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
- // return ''
- // })
- // ]
- // }
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return t('basicData.total')
+ }
+ const List = ["quantity_card",'quantity','completedQuantity','completed','onceBroken']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
})
-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': {
+ 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': {
+ getQuantity()
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(t('basicData.msg.checkoutLose'))
+ return
+ }
+ saveReportingWork(0,'update')
+ break
+ }
+ }
+ }
+ },
cellDblclick (params) {//琛ㄦ牸鍐呭鍙屽嚮鎵撳紑浜у搧鐣岄潰
const { row } = params
- brokenRow = row
- console.log(row)
- //brokenGrid.value.reload()
- //brokenVisible.value = true
- }
+ brokenRow.value = row
+ if(brokenRow.value.damageDetails=== undefined){
+ brokenRow.value.damageDetails=[]
+ }
+ //brokenGrid.value.reloadData(brokenRow.damageDetail)
+ //鏀瑰彉brokenVisible鐨勫�艰Е鍙憃penedBrokenTable锛堬級鏂规硶
+ const { rows, column, cell } = params; // 瑙ｆ瀯鑾峰彇琛屻�佸垪鍜屽崟鍏冩牸淇℃伅
+ //鐐瑰嚮娆＄牬鏁伴噺鏃舵墦寮�鏄庣粏鐣岄潰
+ if(column.field=="breakageQuantity"){
+ 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
+ }
+ }
+ }
+ },
}
-const brokenGrid =ref()
+
+
const brokenGridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
- showFooter: true,//鏄剧ず鑴�
+ id: 'CustomerListDetail',
+ //showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ //scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
showOverflow: true,
columnConfig: {
resizable: true,
@@ -330,61 +522,103 @@
showStatus: true
},//琛ㄥご鍙傛暟
columns: [
- // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {
- field: 'order_number',
- title: '搴忓彿',
- filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged
- },
+ {type: 'seq',fixed:"left", title: t('basicData.Number'), width: 80 },
+ // {
+ // field: 'order_number',
+ // title: '搴忓彿'
+ // },
{
- field: 'breakageNumber', title: '娆＄牬鏁伴噺',
-
- },
- {field: 'available', title: '鍙埄鐢�', editRender: {name: 'input', attrs: {placeholder: ''}}},
- {field: 'returnProcess', title: '閫�鍥炲伐搴�', editRender: {name: 'input', attrs: {placeholder: ''}}},
- {
- field: 'reasonType', title: '娆＄牬绫诲瀷',
- editRender: {name: 'input', attrs: {placeholder: '', type: 'selected'}}
- },
- {
- field: 'reasonDamage', title: '娆＄牬鍘熷洜',
+ field: 'breakageQuantity',
+ title: t('reportingWorks.quantityBroken'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
- {
- field: 'responsibleProcess', title: '璐ｄ换宸ュ簭',
+ {field: 'available',
+ title: t('reportingWorks.available'),
+ slots: {default: 'available'}
+ },
+ {field: 'returnProcess', title: t('reportingWorks.returnProcess'),
editRender: {},
- slots: {default: 'reportingWordSort_default', edit: 'reportingWordSort'}
- //editRender: {name: 'input', attrs: {placeholder: '',type: 'selected'}},
-
+ slots: {default: 'returnProcess_default', edit: 'returnProcess'}
+ },
+ {
+ field: 'breakageType', title: t('reportingWorks.breakageType'),
+ editRender: {},
+ slots: {default: 'breakageType_default', edit: 'breakageType'}
+ },
+ {
+ field: 'breakageReason', title: t('reportingWorks.breakageReason'),
+ editRender: {},
+ slots: {default: 'breakageReason_default', edit: 'breakageReason'}
+ },
+ {
+ 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: '璐ｄ换鐝粍',
- editRender: {name: 'input', attrs: {placeholder: ''}}
+ field: 'responsibleTeam', title: t('reportingWorks.responsibleTeam'),
+ editRender: {},
+ slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}
},
{
- field: 'responsibilityPersonnel',
- title: '璐ｄ换浜哄憳',
+ field: 'responsiblePersonnel',
+ title: t('reportingWorks.responsiblePersonnel'),
editRender: {name: 'input', attrs: {placeholder: ''}}
},
],
//琛ㄥ崟楠岃瘉
- editRules: {},
+ editRules: {
+ breakageQuantity: [
+ {
+ validator ({ cellValue }) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(cellValue)) {
+ return new Error(t('reportingWorks.enterIntegerGreaterThan'))
+ }
+ }
+ }
+ ],
+ returnProcess:[
+ {
+ validator ({ row }) {
+ const regex = /^\s*$/i
+ if(row.available===true && (regex.test(row.returnProcess)==='' || row.returnProcess===null)){
+ return new Error(t('reportingWorks.availableOkReturnProcess'))
+ }
+ }
+ }
+ ],
+ breakageType: [
+ { required: true, message: t('reportingWorks.selectBreakageType') }
+ ],
+ breakageReason: [
+ { required: true, message: t('reportingWorks.selectBreakageReason') }
+ ],
+ responsibleProcess: [
+ { required: true, message: t('reportingWorks.selectResponsibleProcess')}
+ ],
+ responsibleEquipment: [
+ { required: true, message: t('reportingWorks.selectResponsibleEquipment') }
+ ],
+ responsibleTeam: [
+ { required: true, message: t('reportingWorks.selectResponsibleTeam') }
+ ],
+ },
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
- {code: 'print_lck', name: '娣诲姞', status: 'primary', icon: 'vxe-icon-save'},
+ {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,
@@ -393,70 +627,417 @@
custom: true
},
})
+const brokenGridEvents = {
+ toolbarButtonClick({code}) {
+ const $grid = brokenGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'addRow': {
+ $grid.insertAt({})
+ break
+ }
+ case 'removeRow': {
+ let result = toolbarButtonClickEvent()
+ if(result){
+ $grid.remove(result.row)
+ }
+ break
+ }
+ }
+ }
+ }
+}
+const openedBrokenTable = () => {
+ addListener(brokenGrid.value,brokenGridOptions)
+ let damage =ref(brokenRow.value.damageDetails)
+ brokenGrid.value.reloadData(damage.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(t('basicData.msg.checkoutLose'))
+ return false
+ }
+ let breakageQuantityCount = 0
+ brokenRow.value.breakageQuantity=0
+ brokenGrid.value.getTableData().fullData.forEach((row) =>{
+ breakageQuantityCount+=row.breakageQuantity*1
+ })
+
+ let reportingWorkNum = isNaN(brokenRow.value.completedQuantity*1)?0:brokenRow.value.completedQuantity*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))
+ equalByOrderNum.forEach((row) =>{
+ row.completedQuantity= brokenRow.value.quantity*1-maxQuantity
+ })
+
+
+ getQuantity()
+
+ done()
+}
//绗竴娆″姞杞芥暟鎹�
request.post(`/reportingWork/selectProcess`).then((res) => {
-
if (res.code == 200) {
titleSelectJson.value.processType = res.data.process;
- //console.log(titleSelectJson.value.processType)
} else {
ElMessage.warning(res.msg)
}
})
-//涓嬫媺娆鹃�夋嫨宸ュ簭鏃舵煡璇�
-const getWork = () => {
+function checkSameNumForId(data, targetId) {
+ // 鍒濆鍖栦竴涓璞℃潵瀛樺偍閬囧埌鐨刬d鍙婂叾瀵瑰簲鐨刵um鍊�
+ const idNums = {};
+ let firstNum = null;
- let processId = form.processId
+ 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;
+ }
+ }
+ }
+
+ // 濡傛灉閬嶅巻瀹屾暟缁勫悗娌℃湁杩斿洖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 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
+ })
+
+ for(let item of uniqueByOrderNum){
+ if(!checkSameNumForId(notFinishList,item.order_number)){
+ ElMessage.error(`${t('reportingWorks.pleaseCheckTheOrderNumber1')}':'
+ ${item.order_number}
+ ${t('reportingWorks.pleaseCheckTheOrderNumber1')}`)
+ return false
+ }
+ }
+
+
+ titleUploadData.value.creator = user.user.userName
+ titleUploadData.value.creatorId = user.user.userId
+ const requestDetailData = xGrid.value.getTableData().fullData.filter((row) => {
+ const a = (row.completedQuantity !== undefined && row.completedQuantity !== null && row.completedQuantity !== '' && row.completedQuantity*1!==0)
+ const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '' && row.breakageQuantity*1!==0)
+ return (a || b)
+ })
+ if(requestDetailData.length === 0){
+ ElMessage.warning(t('reportingWorks.atLeastOneFinishedAndWornEligible'))
+ return false
+ }
+
+ const requestData = {
+ title:titleUploadData.value,
+ detail:xGrid.value.getTableData().fullData,
+ type:state//瀹℃牳鐘舵��
+ }
+ gridOptions.toolbarConfig.buttons[0].disabled=true
+ gridOptions.toolbarConfig.buttons[1].disabled=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(t('reportingWorks.successfulJobApplication'))
+ router.push({path:'/main/reportingWorks/AddReportingWork',query:{processId:titleUploadData.value.processId,random:Math.random()}})
+ }else{
+ 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')
+
+ ElMessage.error(msg)
+ }
+ }).catch(err =>{
+ ElMessage.error(err.message)
+ }).finally(()=>{
+
+ gridOptions.toolbarConfig.buttons[0].disabled=false
+ gridOptions.toolbarConfig.buttons[1].disabled=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){
+ ElMessage.success(t('reportingWorks.successfulModificationOfWorkApplication'))
+ router.push({path:'/main/reportingWorks/AddReportingWork',
+ query:{
+ processId:titleUploadData.value.processId,
+ random:Math.random()}
+ })
+ }
+ })
+}
+
+
+//鏌ヨ璐ｄ换璁惧
+const computedDevice = computed((responsibleProcess) => {
+ return function (responsibleProcess){
+ return titleSelectJson.value.historyDevice.filter((item) => {
+ return item.basic_category === responsibleProcess
+ })
+ }
+})
+// 鏌ヨ璐ｄ换鐝粍
+const computedResponsibleTeam = computed((responsibleProcess) => {
+ return function (responsibleProcess){
+ return titleSelectJson.value.historyTeams.filter((item) => {
+ return item.process === responsibleProcess
+ })
+ }
+})
+
+//鍒ゆ柇鏄惁鐐瑰嚮鍙埄鐢� 鏄剧ず杩斿洖宸ュ簭
+const computedReturnProcess = computed((available) => {
+ return function (available){
+ if(available){
+ return titleSelectJson.value.historyProcess
+ }
+ }
+})
+
+let loadingFlag = ref(false)
+let disabledFlag = ref(true)
+const reviewReportingWork = () => {
+ const processId = titleUploadData.value.processId
if (processId.indexOf("/") < 0) {
-
- ElMessage.success("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ ElMessage.warning(t('reportingWorks.correctFormatProcessCard'))
return
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
- if (leftString.length != 13) {
- ElMessage.success("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ 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 reportWork = {
+ process: titleUploadData.value.previousProcess,
+ processId:processId
+ }
+ 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,
+ 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.success("璇烽�夋嫨宸ュ簭")
+ ElMessage.warning(t('reportingWorks.selectProcess'))
return
}
-
- if (titleSelectJson.value.thisProcessType.indexOf(process) == -1 && process != "鍒囧壊" && titleSelectJson.value.thisProcessType != "") {
- ElMessage.success("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
- 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) => {
if (res.code == 200) {
+ if(res.data.data==null){
+ ElMessage.error(t('reportingWorks.noDataThisProcessCard'))
+ return
+ }
+
//琛ㄥご璧嬪��
titleUploadData.value = res.data.data
+ titleUploadData.value.processId = processId
//璁惧涓嬫媺妗�
titleSelectJson.value.deviceType = res.data.device
//鐝粍涓嬫媺妗�
titleSelectJson.value.teamsType = res.data.teams
//褰撳墠娴佺▼鍗″伐搴�
titleSelectJson.value.thisProcessType = res.data.thisProcess
- //鎶ュ伐鏃堕棿榛樿褰撳ぉ
- const today = new Date
- today.setTime(today.getTime())
- titleUploadData.value.reportingWorkDate = today.getFullYear() +
- '-' + ("0" + (today.getMonth() + 1)).slice(-2)
- + '-' + ("0" + today.getDate()).slice(-2)
+ //鍘嗗彶鐝粍
+ titleSelectJson.value.historyTeams= res.data.historyTeams
+ //鍘嗗彶璁惧
+ titleSelectJson.value.historyDevice = res.data.historyDevice
+ //鍘嗗彶宸ュ簭
+ titleSelectJson.value.historyProcess = res.data.historyProcess
+ //娆＄牬绫诲瀷
+ titleSelectJson.value.breakageType = res.data.breakageType
+ //娆＄牬鍘熷洜
+ titleSelectJson.value.breakageReason = res.data.breakageReason
+ 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 = formatCurrentTime()
+
+ // 澹版槑涓�涓┖鏁扮粍锛岀敤浜庡瓨鍌ㄦ瘡涓鍗曠殑 S01 鍊�
+ const s01Values = [];
+
+// 閬嶅巻 res.data.numberList 鏁扮粍锛岃幏鍙栨瘡涓厓绱犵殑 S01 鍊煎苟瀛樺偍鍒� s01Values 鏁扮粍涓�
+ res.data.numberList.forEach(element => {
+ try {
+ const otherColumnsObject = JSON.parse(element.other_columns);
+ const s01Value = otherColumnsObject.S01;
+ if (s01Value) {
+ s01Values.push(s01Value);
+ } else {
+ // 濡傛灉 S01 鍊间负绌猴紝鍙互閫夋嫨娣诲姞榛樿鍊兼垨鑰呭拷鐣ヨ繖涓厓绱�
+ s01Values.push(''); // 渚嬪娣诲姞绌哄瓧绗︿覆
+ }
+ } catch (error) {
+ // console.error('Error parsing JSON or accessing S01 value:', error);
+ // 澶勭悊 JSON 瑙ｆ瀽閿欒鎴栧叾浠栧紓甯告儏鍐�
+ }
+ });
+
+// 閬嶅巻 res.data.Detail 鏁扮粍锛屽皢 s01Values 涓殑鍊艰祴缁欐瘡涓鍗曡鎯呭璞＄殑 s01Value 灞炴��
+ res.data.Detail.forEach((detail, index) => {
+ if (index < s01Values.length) {
+ detail.s01Value = s01Values[index]; // 娣诲姞涓�涓悕涓� s01Value 鐨勬柊灞炴�э紝瀛樺偍瀵瑰簲鐨� S01 鍊�
+ } else {
+ detail.s01Value = ''; // 濡傛灉 s01Values 涓殑鍊间笉瓒筹紝鍙互娣诲姞榛樿鍊兼垨鑰呬笉杩涜璧嬪�煎鐞�
+ }
+ });
+
+
//缁戝畾涓嬫柟琛ㄦ牸
- xGrid.value.reloadData(res.data.Detail)
+ detail.value = res.data.Detail
+ xGrid.value.reloadData(detail.value)
} else {
ElMessage.warning(res.msg)
}
@@ -467,50 +1048,144 @@
const verifyNum = () => {
const $grid = xGrid.value
const table = $grid.getTableData().fullData
- //console.log(table)
let sum = 0;
let sumBreak = 0;
table.forEach((item) => {
if (item.completedQuantity == null || item.completedQuantity == "") {
item.completedQuantity = 0;
}
- if (item.breakageNumber == null || item.breakageNumber == "") {
- item.breakageNumber = 0;
+ if (item.breakageQuantity == null || item.breakageQuantity == "") {
+ item.breakageQuantity = 0;
}
if (item.quantity < item.completedQuantity) {
- ElMessage.success("搴忓彿" + item.order_number + "鐨勬暟閲忎笉鑳藉ぇ浜庝笂宸ュ簭鏁伴噺")
+ ElMessage.success(t('reportingWorks.pleaseNumber6') + item.order_number + t('reportingWorks.pleaseNumber7'))
- } else if (item.breakageNumber * 1 + item.completedQuantity * 1 > item.quantity * 1) {
- ElMessage.success("璇疯緭鍏ュ簭鍙�" + item.order_number + "姝ｇ‘鐨勫畬宸ユ垨娆＄牬鏁伴噺")
+ } else if (item.breakageQuantity * 1 + item.completedQuantity * 1 > item.quantity * 1) {
+ ElMessage.success(t('reportingWorks.pleaseNumber8') + item.order_number + t('reportingWorks.pleaseNumber9'))
}
sum = item.completedQuantity * 1 + sum * 1
- sumBreak = item.breakageNumber * 1 + sumBreak * 1
+ sumBreak = item.breakageQuantity * 1 + sumBreak * 1
})
titleUploadData.value.thisCompletedQuantity = sum
titleUploadData.value.thisWornQuantity = sumBreak
}
-
-const ptypeChangeEvent = (row) => {
- // for (let i = 0; i < row.length; i++){
- //
- // let process=row[i].responsibleProcess
- // }
+//鑾峰彇褰撳墠鏃堕棿
+function formatCurrentTime() {
+ let dateObj = new Date(); // 鍒涘缓涓�涓〃绀哄綋鍓嶆椂闂寸殑Date瀵硅薄
+ let year = dateObj.getFullYear(); // 骞翠唤
+ let month = (dateObj.getMonth() + 1).toString().padStart(2, '0'); // 鏈堜唤锛堟敞鎰忛渶瑕佸姞涓�1锛�
+ let day = dateObj.getDate().toString().padStart(2, '0'); // 澶╂暟
+ 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 && parseInt(hours)<8)titleUploadData.value.classes=t('reportingWorks.nightShift')
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; // 杩斿洖鏍煎紡鍖栧悗鐨勬椂闂村瓧绗︿覆
}
+
+const editClosedEvent = ({ row, column }) => {
+ if (column.property==='completedQuantity') {
+ xGrid.value.getTableData().fullData.forEach((item, index) =>{
+ if(item.order_number===row.order_number){
+ item.completedQuantity=row.completedQuantity
+ }
+ })
+ getQuantity()
+ }
+}
+const getQuantity = () => {
+ titleUploadData.value.thisCompletedQuantity = 0
+ titleUploadData.value.thisWornQuantity = 0
+ const arr = xGrid.value.getTableData().fullData
+ const returnArr = arr.filter((obj, index, self) =>
+ self.findIndex((t) => t.order_number === obj.order_number) === index
+ )
+
+
+ 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('')
+ }
+
+ codeArr=[]
+ lastTime = ''
+ nextTime = ''
+ lastCode = ''
+ nextCode = ''
+ }
+
+}
+
</script>
<template>
<div style="height: 100%;width: 100%">
<div id="head" style="height: 5%;width: 100%;margin-bottom: 5px">
- <el-input v-model="form.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
+ <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" 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"
@@ -519,40 +1194,40 @@
/>
</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>
+<!-- <el-button type="primary">瀹℃牳涓嶉�氳繃</el-button>-->
- <label>娴佺▼鍗￠潰绉細xxx骞虫柟绫�</label>
+ <label>{{$t('reportingWorks.processCardArea')}}锛�</label>
</div>
<div style="background-color: white;margin-bottom: 5px;height: 17%;width: 100%">
<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">{{ titleUploadData.order.customerName }}</el-text>
-
+ <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>
@@ -561,10 +1236,10 @@
</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.deviceType" 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"
@@ -574,27 +1249,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>
@@ -603,10 +1278,10 @@
</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.teamsType" clearable placeholder="璇烽�夋嫨鐝粍">
+ <el-select v-model="titleUploadData.teamsGroupsName" clearable :placeholder="$t('reportingWorks.selectTeam')">
<el-option
v-for="item in titleSelectJson['teamsType']"
:key="item.id"
@@ -616,10 +1291,10 @@
</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="classesVal" 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"
@@ -629,28 +1304,30 @@
</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
- v-model="titleUploadData.reportingWorkDate"
+ v-model="titleUploadData.reportingWorkTime"
+ format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss"
placeholder=""
style="width: 100%"
- type="date"
+ type="datetime"
/>
</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="" />
</el-col>
</el-row>
@@ -660,31 +1337,14 @@
ref="xGrid"
class="mytable-scrollbar"
max-height="100%"
+ height="400px"
size="small"
v-bind="gridOptions"
v-on="gridEvents"
- @filter-change="filterChanged"
- @edit-closed="verifyNum"
+ @edit-closed="editClosedEvent"
>
- <!-- 璐ｄ换宸ュ簭-->
- <template #reportingWordSort="{ row }">
- <vxe-select v-model="row.responsibleProcess" transfer @change="ptypeChangeEvent(row)">
- <vxe-option v-for="item in titleSelectJson.thisProcessType" :key="item" :label="item" :value="item"/>
- </vxe-select>
- </template>
- <template #reportingWordSort_default="{ row }">
- <span>{{ row.responsibleProcess }}</span>
- </template>
- <!-- 璐ｄ换璁惧 -->
- <template #reportingDeviceSort="{ row }">
- <vxe-select v-model="row.responsibleEquipment" transfer>
- <vxe-option v-for="item in titleSelectJson.mateProcessType" :key="item" :label="item" :value="item"/>
- </vxe-select>
- </template>
- <template #reportingDeviceSort_default="{ row }">
- <span>{{ row.responsibleEquipment }}</span>
- </template>
+
<template #num1_filter="{ column, $panel }">
<div>
@@ -696,8 +1356,106 @@
</vxe-grid>
- <el-dialog v-model="brokenVisible" title="鐮存崯鍒楄〃" style="width: 80%;height:75% ">
- <vxe-grid ref="brokenGrid" v-bind="brokenGridOptions">
+ <el-dialog
+ @opened="openedBrokenTable"
+ :before-close="checkClose"
+ v-model="brokenVisible"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ :title="$t('reportingWorks.damageList')+':'
+ +brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
+ style="width: 80%;height:75% ">
+ <vxe-grid
+
+ height="400px"
+ ref="brokenGrid"
+ class="mytable-scrollbar"
+ v-bind="brokenGridOptions"
+ v-on="brokenGridEvents">
+ <!-- 杩斿洖宸ュ簭-->
+ <template #returnProcess="{ row }">
+ <vxe-select v-model="row.returnProcess"
+ filterable
+ clearable
+ placeholder="" >
+ <vxe-option v-for="item in computedReturnProcess(row.available)"
+ :key="item.basic_category"
+ :label="item.basic_category"
+ :value="item.basic_category"/>
+ </vxe-select>
+ </template>
+ <template #returnProcess_default="{ row }">
+ <span>{{ row.returnProcess }}</span>
+ </template>
+
+ <!-- 璐ｄ换宸ュ簭-->
+ <template #responsibleProcess="{ row }">
+ <vxe-select v-model="row.responsibleProcess"
+ filterable
+ clearable
+ placeholder="" >
+ <vxe-option v-for="item in titleSelectJson.historyProcess"
+ :key="item.basic_category"
+ :label="item.basic_category"
+ :value="item.basic_category"/>
+ </vxe-select>
+ </template>
+ <template #responsibleProcess_default="{ row }">
+ <span>{{ row.responsibleProcess }}</span>
+ </template>
+ <!-- 鍒虹牬绫诲瀷breakageType -->
+ <template #breakageType="{ row }">
+ <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>
+ <template #breakageType_default="{ row }">
+ <span>{{ row.breakageType }}</span>
+ </template>
+
+ <!--娆＄牬鍘熷洜-->
+ <template #breakageReason="{ row }">
+ <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>
+ <template #breakageReason_default="{ row }">
+ <span>{{ row.breakageReason }}</span>
+ </template>
+
+
+
+ <!-- 璐ｄ换璁惧 -->
+ <template #reportingDeviceSort="{ row }">
+ <vxe-select v-model="row.responsibleEquipment"
+ filterable
+ clearable
+ placeholder="">
+ <vxe-option v-for="item in computedDevice(row.responsibleProcess)" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
+ </vxe-select>
+ </template>
+ <template #reportingDeviceSort_default="{ row }">
+ <span>{{ row.responsibleEquipment }}</span>
+ </template>
+
+ <!-- 璐ｄ换璁惧 -->
+ <template #responsibleTeam="{ row }">
+ <vxe-select v-model="row.responsibleTeam"
+ filterable
+ clearable
+ placeholder="">
+ <vxe-option v-for="item in computedResponsibleTeam(row.responsibleProcess)" :key="item.id" :label="item.basic_name" :value="item.basic_name"/>
+ </vxe-select>
+ </template>
+ <template #responsibleTeam_default="{ row }">
+ <span>{{ row.responsibleTeam }}</span>
+ </template>
+ <!-- 鍙埄鐢� -->
+ <template #available="{ row }">
+ <el-checkbox v-model="row.available" />
+ </template>
</vxe-grid>
</el-dialog>
@@ -768,5 +1526,12 @@
text-align: center;
border: #181818 1px solid;
}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0