From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 582 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 432 insertions(+), 150 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..ee7099a 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,32 @@
<script setup>
-import {reactive, ref} from "vue";
+import {computed, nextTick, onMounted, reactive, ref, toRefs} from "vue";
import {useRouter} 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"
let brokenVisible = ref(false)
const xGrid = ref()
+const brokenGrid =ref()
let router = useRouter()
-
+const user=userInfo()
//瀹氫箟琛ㄥご鏁版嵁
const titleUploadData = ref({
+ //娴佺▼鍗″彿
+ processId: 'NG24030501A01/2',
//閿�鍞崟鍙�
orderId: '',
//鐢熶骇鍗曞彿
productionId: '',
//璁惧绫诲瀷
- deviceType: '',
- //鐝粍绫诲瀷
- teamsType: '',
+ deviceName: '',
+ //鐝粍鍚嶇О
+ teamsGroupsName: '',
//鐢熶骇鏃ユ湡
- reportingWorkDate: '',
+ reportingWorkTime: '',
//鎶ュ伐宸ュ簭
thisProcess: '',
//涓婂伐搴�
@@ -53,6 +58,7 @@
})
+let detail = ref([])
//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
const titleSelectJson = ref({
@@ -61,6 +67,12 @@
processType: [],
thisProcessType: [],
mateProcessType: [],
+ historyDevice:[],
+ historyTeams:[],
+ historyProcess:[],
+ breakageType:[],
+ breakageReason:[]
+
})
//琛ㄥ熬姹傚拰
@@ -72,9 +84,7 @@
return count.toFixed(2)
}
-const form = reactive({
- processId: 'NG24022302A01/1'
-})
+
const optionVal = ref('')
const options = [
@@ -106,7 +116,6 @@
]
-//瀛愮粍浠舵帴鏀跺弬鏁�
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -206,52 +215,31 @@
},
{
- field: 'breakageNumber', title: '娆＄牬鏁伴噺',
-
+ field: 'breakageQuantity', title: '娆＄牬鏁伴噺',
},
- // {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: '宸叉鐮�',},
],
//琛ㄥ崟楠岃瘉
- 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('璇疯緭鍏ユ暣鏁帮紝骞朵笖澶т簬-1')
+ }else if(row.completedQuantity+brokenNum>row.quantity){
+ return new Error((`${row.completedQuantity}+$(brokenNum)>${row.quantity}`))
+ }
+
+ }
+ }
+ ]
+ },
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
// {code: 'empty', name: '娓呯┖鎶ュ伐鏁伴噺'},
@@ -259,7 +247,7 @@
// {code: 'sameDamage', name: '娆＄牬鐩稿悓'},
// {code: 'sameOneCompletion', name: '瀹屽伐涓�鍒楃浉鍚�'},
// {code: 'sameOneDamage', name: '娆＄牬涓�鍒楃浉鍚�'},
- {code: 'print_lck', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'saveReportingWork', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
{code: 'print_lck', name: '淇濆瓨骞跺鏍�', status: 'primary', icon: 'vxe-icon-save'},
],
// import: false,
@@ -268,39 +256,69 @@
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}) {//椤佃剼鍑芥暟
+ let footList = ['', '', '', '', '']
+ return [
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return '鍚堣:'
+ }
+ return ''
+ })
+ ]
+ }
})
let brokenRow = ref()
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
+ }
+ const device = titleUploadData.value.deviceName
+ if(device === null || device === undefined || device === ''){
+ ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
+ return
+ }
+ const teamsGroupsName = titleUploadData.value.teamsGroupsName
+ if(teamsGroupsName === null || teamsGroupsName === undefined || teamsGroupsName === ''){
+ ElMessage.error('璇烽�夋嫨鎶ュ伐璁惧锛�')
+ return
+ }
+ const errMap = await $grid.validate(true)
+ if (errMap) {
+ ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ return
+ }
+ saveReportingWork()
+ 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锛堬級鏂规硶
+ brokenVisible.value = true
+ //console.log(brokenGrid.value)
+
}
-
-
}
-const brokenGrid =ref()
+
+
const brokenGridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -308,11 +326,11 @@
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
- showFooter: true,//鏄剧ず鑴�
+ //showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ //scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
showOverflow: true,
columnConfig: {
resizable: true,
@@ -330,35 +348,39 @@
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: '鑷簭', 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: '娆＄牬鏁伴噺',
editRender: {name: 'input', attrs: {placeholder: ''}}
+ },
+ {field: 'available',
+ title: '鍙埄鐢�',
+ slots: {default: 'available'}
+ },
+ {field: 'returnProcess', title: '閫�鍥炲伐搴�',
+ editRender: {},
+ slots: {default: 'returnProcess_default', edit: 'returnProcess'}
+ },
+ {
+ field: 'breakageType', title: '娆＄牬绫诲瀷',
+ editRender: {},
+ slots: {default: 'breakageType_default', edit: 'breakageType'}
+ },
+ {
+ field: 'breakageReason', title: '娆＄牬鍘熷洜',
+ editRender: {},
+ slots: {default: 'breakageReason_default', edit: 'breakageReason'}
},
{
field: 'responsibleProcess', title: '璐ｄ换宸ュ簭',
editRender: {},
- slots: {default: 'reportingWordSort_default', edit: 'reportingWordSort'}
- //editRender: {name: 'input', attrs: {placeholder: '',type: 'selected'}},
-
+ slots: {default: 'responsibleProcess_default', edit: 'responsibleProcess'}
},
{
field: 'responsibleEquipment',
@@ -370,10 +392,11 @@
{
field: 'responsibleTeam', title: '璐ｄ换鐝粍',
- editRender: {name: 'input', attrs: {placeholder: ''}}
+ editRender: {},
+ slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}
},
{
- field: 'responsibilityPersonnel',
+ field: 'responsiblePersonnel',
title: '璐ｄ换浜哄憳',
editRender: {name: 'input', attrs: {placeholder: ''}}
@@ -381,10 +404,47 @@
],
//琛ㄥ崟楠岃瘉
- editRules: {},
+ editRules: {
+ breakageQuantity: [
+ {
+ validator ({ cellValue }) {
+ const regex = /^[1-9]\d*$/
+ if (!regex.test(cellValue)) {
+ return new Error('杈撳叆澶т簬0鐨勬暣鏁�')
+ }
+ }
+ }
+ ],
+ returnProcess:[
+ {
+ validator ({ row }) {
+ const regex = /^\s*$/i
+ if(row.available===true && (regex.test(row.returnProcess)==='' || row.returnProcess===null)){
+ return new Error('鍙埄鐢ㄥ凡閫夋嫨锛岃閫夋嫨杩斿洖宸ュ簭')
+ }
+ }
+ }
+ ],
+ breakageType: [
+ { required: true, message: '璇烽�夋嫨娆＄牬绫诲瀷' }
+ ],
+ breakageReason: [
+ { required: true, message: '璇烽�夋嫨娆＄牬鍘熷洜' }
+ ],
+ responsibleProcess: [
+ { required: true, message: '璇烽�夋嫨璐ｄ换宸ュ簭' }
+ ],
+ responsibleEquipment: [
+ { required: true, message: '璇烽�夋嫨璐ｄ换璁惧' }
+ ],
+ responsibleTeam: [
+ { required: true, message: '璐ｄ换鐝粍' }
+ ],
+ },
toolbarConfig: {//琛ㄥご鎸夐挳
buttons: [
- {code: 'print_lck', name: '娣诲姞', status: 'primary', icon: 'vxe-icon-save'},
+ {code: 'addRow', name: '娣诲姞', status: 'primary', icon: 'vxe-icon-square-plus'},
+ {code: 'removeRow', name: '鍒犻櫎', status: 'primary', icon: 'vxe-icon-delete'},
],
// import: false,
// export: true,
@@ -393,45 +453,154 @@
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)
+ //console.log(brokenRow.value)
+}
+
+
+const checkClose = async (done) => {
+ const errMap = await brokenGrid.value.validate(true)
+ if (errMap) {
+ ElMessage.error(`鏍￠獙涓嶉�氳繃锛乣)
+ 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+reportingWorkNum>brokenRow.value.quantity*1){
+ ElMessage.warning(`鎹熻�楁暟:'${breakageQuantityCount}'
+ 瀹屽伐鏁�:'${reportingWorkNum}'涔嬪拰${breakageQuantityCount+reportingWorkNum}
+ 涓嶈兘澶т簬${brokenRow.value.quantity*1}`)
+ return false
+ }
+
+ breakageQuantityCount = breakageQuantityCount === 0 ? null : breakageQuantityCount
+ brokenRow.value.breakageQuantity = breakageQuantityCount
+ brokenRow.value.damageDetails=brokenGrid.value.getTableData().fullData
+ 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 saveReportingWork = () => {
+
+ 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 !== '')
+ const b = (row.breakageQuantity !== undefined && row.breakageQuantity !== null && row.breakageQuantity !== '')
+ return (a || b)
+ })
+ if(requestDetailData.length === 0){
+ ElMessage.warning('璇峰～鍐欒嚦灏戜竴鏉℃崯鑰楁暟鍜屽畬宸ユ暟')
+ return false
+ }
+
+ const requestData = {
+ title:titleUploadData.value,
+ detail:xGrid.value.getTableData().fullData
+ }
+ console.log(xGrid.value.getTableData().fullData)
+ request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
+ if (res.code == 200){
+ ElMessage.success("鎶ュ伐鎴愬姛")
+ router.push({path:'/main/reportingWorks/AddReportingWork',query:{random:Math.random()}})
+ }
+ }).catch(err =>{
+ ElMessage.error(err.message)
+ })
+}
+
+
+//鏌ヨ璐ｄ换璁惧
+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
+ }
+ }
+})
+
+
//涓嬫媺娆鹃�夋嫨宸ュ簭鏃舵煡璇�
const getWork = () => {
- let processId = form.processId
+ let processId = titleUploadData.value.processId
if (processId.indexOf("/") < 0) {
- ElMessage.success("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
+ ElMessage.warning("璇疯緭鍏ユ纭牸寮忔祦绋嬪崱")
return
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
if (leftString.length != 13) {
- ElMessage.success("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
+ ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
return
}
//宸ュ簭
let process = titleUploadData.value.thisProcess
if (process == "" || process == null) {
- ElMessage.success("璇烽�夋嫨宸ュ簭")
+ ElMessage.warning("璇烽�夋嫨宸ュ簭")
return
}
if (titleSelectJson.value.thisProcessType.indexOf(process) == -1 && process != "鍒囧壊" && titleSelectJson.value.thisProcessType != "") {
- ElMessage.success("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
+ ElMessage.warning("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
return
}
//娴佺▼鍗″彿
@@ -443,20 +612,31 @@
if (res.code == 200) {
//琛ㄥご璧嬪��
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
+ //console.log(res.data)
+ titleUploadData.value.classes='鏃╃彮'
+
+
+ titleUploadData.value.reportingWorkTime = formatCurrentTime()
//缁戝畾涓嬫柟琛ㄦ牸
- xGrid.value.reloadData(res.data.Detail)
+ detail.value = res.data.Detail
+ xGrid.value.reloadData(detail.value)
} else {
ElMessage.warning(res.msg)
}
@@ -467,34 +647,45 @@
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 + "鐨勬暟閲忎笉鑳藉ぇ浜庝笂宸ュ簭鏁伴噺")
- } else if (item.breakageNumber * 1 + item.completedQuantity * 1 > item.quantity * 1) {
+ } else if (item.breakageQuantity * 1 + item.completedQuantity * 1 > item.quantity * 1) {
ElMessage.success("璇疯緭鍏ュ簭鍙�" + item.order_number + "姝ｇ‘鐨勫畬宸ユ垨娆＄牬鏁伴噺")
}
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
}
+//鑾峰彇褰撳墠鏃堕棿
+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)titleUploadData.value.classes='鏅氱彮'
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; // 杩斿洖鏍煎紡鍖栧悗鐨勬椂闂村瓧绗︿覆
+}
const ptypeChangeEvent = (row) => {
// for (let i = 0; i < row.length; i++){
@@ -507,7 +698,7 @@
<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 v-model="titleUploadData.processId" placeholder="娴佺▼鍗″彿" style="width: 200px" @keyup.enter.native="getWork"/>
<el-select v-model="titleUploadData.thisProcess" clearable placeholder="璇烽�夋嫨宸ュ簭" style="width: 120px"
@change="getWork">
@@ -548,8 +739,7 @@
<el-text>瀹㈡埛鍚嶇О锛�</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>
@@ -564,7 +754,7 @@
<el-text>鎶ュ伐璁惧锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.deviceType" clearable placeholder="璇烽�夋嫨璁惧">
+ <el-select v-model="titleUploadData.deviceName" clearable placeholder="璇烽�夋嫨璁惧">
<el-option
v-for="item in titleSelectJson['deviceType']"
:key="item.id"
@@ -606,7 +796,7 @@
<el-text>鎶ュ伐鐝粍锛�</el-text>
</el-col>
<el-col :span="3">
- <el-select v-model="titleUploadData.teamsType" clearable placeholder="璇烽�夋嫨鐝粍">
+ <el-select v-model="titleUploadData.teamsGroupsName" clearable placeholder="璇烽�夋嫨鐝粍">
<el-option
v-for="item in titleSelectJson['teamsType']"
:key="item.id"
@@ -619,7 +809,7 @@
<el-text>鐝锛�</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="">
<el-option
v-for="item in classesOption"
:key="item.value"
@@ -640,17 +830,19 @@
</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-col>
<el-col :span="3">
-
+ <el-input v-model="titleUploadData.notes" placeholder="" />
</el-col>
</el-row>
@@ -664,27 +856,9 @@
v-bind="gridOptions"
v-on="gridEvents"
@filter-change="filterChanged"
- @edit-closed="verifyNum"
>
- <!-- 璐ｄ换宸ュ簭-->
- <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 +870,109 @@
</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="鐮存崯鍒楄〃"
+ 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 "
+ filterable
+ clearable
+ placeholder="">
+ <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 "
+ filterable
+ clearable
+ placeholder="">
+ <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 +1043,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