From 76a3c7dcf11171f515a395f9961f7d080e6dce27 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 28 六月 2023 15:25:00 +0800
Subject: [PATCH] 1.项目优化
---
src/views/deviceManager/checkStandard.vue | 4
src/views/deviceManager/maintainStandard.vue | 3
src/views/makeModel/processRoute.vue | 13 +-
src/views/reportManager/personSalaryList.vue | 6
src/views/makeModel/meterPrice.vue | 16 +-
src/views/produceManager/produceStartOrder.vue | 23 ++--
src/views/basicSettings/organizationList.vue | 12 +-
src/views/qualityManager/qualityPlaning.vue | 2
src/views/reportManager/groupSalaryList.vue | 6
src/views/produceManager/workOrder.vue | 191 +++++++++++++++++++++----------------
src/views/basicSettings/installationLampSetting.vue | 1
11 files changed, 155 insertions(+), 122 deletions(-)
diff --git a/src/views/basicSettings/installationLampSetting.vue b/src/views/basicSettings/installationLampSetting.vue
index 8ea7d78..9857e1d 100644
--- a/src/views/basicSettings/installationLampSetting.vue
+++ b/src/views/basicSettings/installationLampSetting.vue
@@ -414,6 +414,7 @@
dialogVisibleCancel() {
this.settingDialogVisible = false
this.getAnDengTypeSearch()
+ this.$forceUpdate()
},
// 鍏佽鍏抽棴鐐瑰嚮浜嬩欢
async allowCloseChange() {
diff --git a/src/views/basicSettings/organizationList.vue b/src/views/basicSettings/organizationList.vue
index 84577e2..095265b 100644
--- a/src/views/basicSettings/organizationList.vue
+++ b/src/views/basicSettings/organizationList.vue
@@ -168,7 +168,7 @@
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
<!-- <el-button type="primary" size="mini" />-->
<!-- <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
@@ -220,7 +220,7 @@
<el-form-item label="缁勭粐鍚嶇О" prop="OrgName">
<el-input v-model="dialogForm.OrgName" style="width: 200px" />
</el-form-item>
- <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'" prop="SupUnit" label="涓婄骇鍗曚綅">
+ <el-form-item v-if="dialogForm.OrgType!=='閮ㄩ棬'&&$store.state.settings.orgType===''" prop="SupUnit" label="涓婄骇鍗曚綅">
<el-select
v-model="dialogForm.SupUnit"
style="width: 200px"
@@ -533,11 +533,11 @@
// this.numvalue = res.numvalue
},
// 淇敼鎸夐挳
- edit(operation, row) {
+ async edit(operation, row) {
if (this.$store.state.settings.orgType === 'W') {
return this.$message.info('褰撳墠鐢ㄦ埛鏃犱慨鏀规潈闄愶紒')
}
-
+ await this.getPrentOrganization()
this.operation = operation
this.dialogVisible = true
// if (row.description === 'F') {
@@ -560,7 +560,7 @@
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
if (this.$store.state.settings.orgType === 'W') {
return this.$message.info('褰撳墠鐢ㄦ埛鏃犲垹闄ゆ潈闄愶紒')
}
@@ -570,7 +570,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteOrganization({ orgid: id }).then(res => {
+ DeleteOrganization({ orgid: row.id, orgcode: row.org_code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
diff --git a/src/views/deviceManager/checkStandard.vue b/src/views/deviceManager/checkStandard.vue
index 44cc831..f9caeb4 100644
--- a/src/views/deviceManager/checkStandard.vue
+++ b/src/views/deviceManager/checkStandard.vue
@@ -1136,13 +1136,15 @@
// this.dialogVisibleEqp = false
this.$store.state.app.buttonIsDisabled = true
const data = []
+ console.log(this.dialogFormEqp.eqpAll, 888)
this.dialogFormEqp.eqpAll.forEach((item, index) => {
if (item.children && item.children.length > 0) {
item.children.forEach(it => {
if (this.dialogFormEqp.eqpCodeSelectedArr.includes(it.code)) {
data.push({
name: it.name,
- code: it.code
+ code: it.code,
+ flag: item.code
})
}
})
diff --git a/src/views/deviceManager/maintainStandard.vue b/src/views/deviceManager/maintainStandard.vue
index 17efd92..2e16bf9 100644
--- a/src/views/deviceManager/maintainStandard.vue
+++ b/src/views/deviceManager/maintainStandard.vue
@@ -1090,7 +1090,8 @@
if (this.dialogFormEqp.eqpCodeSelectedArr.includes(it.code)) {
data.push({
name: it.name,
- code: it.code
+ code: it.code,
+ flag: item.code
})
}
})
diff --git a/src/views/makeModel/meterPrice.vue b/src/views/makeModel/meterPrice.vue
index 0530b7b..7b61071 100644
--- a/src/views/makeModel/meterPrice.vue
+++ b/src/views/makeModel/meterPrice.vue
@@ -638,7 +638,7 @@
sortable: true
}, {
minWidth: false,
- width: 110,
+ width: 150,
prop: 'route_name',
label: '宸ヨ壓璺嚎',
id: 9,
@@ -648,16 +648,16 @@
}, {
minWidth: false,
width: 130,
- prop: 'stepcode',
+ prop: 'eqp_code',
label: '鍔犲伐宸ュ簭缂栫爜',
id: 10,
show: false,
fixed: false,
sortable: true
}, {
- minWidth: false,
- width: 110,
- prop: 'stepname',
+ minWidth: 110,
+ width: false,
+ prop: 'eqp_name',
label: '鍔犲伐璁惧',
id: 11,
show: true,
@@ -665,8 +665,8 @@
sortable: true
}, {
minWidth: false,
- width: 130,
- prop: 'eqp_code',
+ width: 150,
+ prop: 'stepcode',
label: '鍔犲伐璁惧缂栫爜',
id: 12,
show: false,
@@ -675,7 +675,7 @@
}, {
minWidth: 110,
width: false,
- prop: 'eqp_name',
+ prop: 'stepname',
label: '鍔犲伐宸ュ簭',
id: 13,
show: true,
diff --git a/src/views/makeModel/processRoute.vue b/src/views/makeModel/processRoute.vue
index 61b0a5b..646808a 100644
--- a/src/views/makeModel/processRoute.vue
+++ b/src/views/makeModel/processRoute.vue
@@ -41,7 +41,7 @@
<el-form-item label="宸ヨ壓鎻忚堪" style=" display: flex;">
<el-input v-model="form.description" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-if="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
@@ -273,7 +273,7 @@
:popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
- @change="wkshopcodeChange"
+ @change="getStepSelectArr"
>
<el-option
v-for="item in WorkShopArr"
@@ -606,9 +606,6 @@
return (res.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
}
},
- wkshopcodeChange() {
- this.getStepSelectArr()
- },
// 宸ヨ壓璁剧疆 涓嬫媺鑾峰彇鎵�鏈�
async getStepSelectArr() {
const { data: res } = await StepSelect({ WorkShop: this.dialogForm.wkshopcode })
@@ -844,9 +841,9 @@
this.operation = operation
this.dialogVisible = true
- if (this.$store.state.settings.orgType === 'W') {
- this.getStepSelectArr()
- }
+ // if (this.$store.state.settings.orgType === 'W') {
+ this.getStepSelectArr()
+ // }
},
// 宸ヨ壓璺嚎棰勮
async edit(operation, row) {
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index 2b653b4..43ccf3e 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -520,7 +520,7 @@
:visible.sync="dialogVisible"
width="850px"
class="dialogVisible"
- :top="dialogTitle==='鑷埗鎶ュ伐'?'5vh':'15vh'"
+ :top="dialogTitle==='鑷埗鎶ュ伐'?'15vh':'15vh'"
:close-on-click-modal="false"
@close="handleClose"
@closed="handleClose"
@@ -1271,8 +1271,8 @@
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
- :disabled="$store.state.app.buttonIsDisabled"
- @click="badDialogVisibleConfirm "
+ :disabled="$store.state.app.buttonIsDisabled||badTableDataDialog.length===0||badTableDataDialog.find(i=>i.isVisible===1)"
+ @click="badDialogVisibleConfirm"
>淇� 瀛�/鎵� 鍗�</el-button>
</div>
</span>
@@ -1402,7 +1402,7 @@
startqtySum: '', // 涓嶈兘瓒呰繃鐨勬暟鍊�
- reckway: 'group', // 璁′欢鏂瑰紡
+ reckway: 'person', // 璁′欢鏂瑰紡
operation: getCookie('navTabId'), // 鎶ュ伐浜猴紙鏀舵枡浜猴級
remarks: '', // 澶囨敞
@@ -1773,6 +1773,10 @@
}
const res = await MesOrderStepStart(data)
if (res.code === '200' && res.count === 0) {
+ // console.log(res, 777)
+ // if (parseFloat(res.data.startqty) === 0) {
+ // return this.$message.error('')
+ // }
await this.ZZstart(res.data)
}
if (res.code === '200' && res.count === 1) {
@@ -2172,7 +2176,7 @@
// this.dialogForm.inbarcode = '' // 鍏ュ簱鐮�
- this.dialogForm.reckway = 'group'
+ this.dialogForm.reckway = 'person'
this.dialogForm.remarks = '' // 澶囨敞
this.dialogForm.operation = getCookie('navTabId') // 鎶ュ伐浜猴紙鏀舵枡浜猴級
@@ -2266,9 +2270,8 @@
this.dialogVisible = false
this.$message.success('鏀舵枡鎴愬姛锛�')
// if (this.dialogForm.nextstepcode === '') {
- // this.WXprint2(this.OperationArr.find(item => item.usercode === this.dialogForm.inuser).username)
- this.WXprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
- this.dialogVisible2 = true
+ // this.WXprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+ // this.dialogVisible2 = true
// }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
@@ -2386,8 +2389,8 @@
this.$message.success('鎶ュ伐鎴愬姛锛�')
// this.dialogForm.nextstepcode==='' //褰撲负绌虹殑鏃跺�� 浠ｈ〃鏄湯閬撳伐搴�
// if (this.dialogForm.nextstepcode !== '') {
- this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
- this.dialogVisible2 = true
+ // this.ZZprint2(this.OperationArr.find(item => item.usercode === getCookie('navTabId')).username)
+ // this.dialogVisible2 = true
// }
this.tabClick()
this.$store.state.app.buttonIsDisabled = false
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 2078b10..31e11ab 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -368,6 +368,22 @@
/>
<div class="elTableDiv">
+
+ <div
+ v-if="$store.state.settings.orgType === 'W'"
+ style="position:absolute;z-index: 1000;left: 20px;top: -50px"
+ >
+ <el-switch
+ v-model="switchButton"
+ style="display: block"
+ active-text="鎵�鏈夎溅闂�"
+ inactive-text="褰撳墠杞﹂棿"
+ @change="rowClick"
+ />
+ <!-- active-color="#13ce66"-->
+ <!-- inactive-color="#ff4949"-->
+ </div>
+
<el-table
:data="tableDataDetail"
border
@@ -510,43 +526,49 @@
<!-- <el-input v-model="dialogForm.mesordercode" :disabled="operation!=='add'" style="width: 200px" />-->
<el-input v-model="dialogForm.mesordercode" disabled style="width: 200px" />
</el-form-item>
- <div style="display: flex">
- <el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
- <el-select
- v-model="dialogForm.ordertype"
- :popper-append-to-body="false"
- style="width: 200px"
- :disabled="operation!=='add'"
- placeholder="璇烽�夋嫨"
- @change="mesordertypeChange"
- >
-
- <el-option
- v-for="item in ordertypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- <div style="display: flex;flex-wrap: nowrap">
- <el-form-item label="婧愬崟鍗曞彿">
- <el-input
- v-model="dialogForm.sourceorder"
- :disabled="dialogForm.ordertype==='PO'"
- style="width: 172px"
- />
- </el-form-item>
+ <!-- <div style="display: flex">-->
+ <el-form-item label="宸ュ崟绫诲瀷" prop="mesorderstus">
+ <el-select
+ v-model="dialogForm.ordertype"
+ :popper-append-to-body="false"
+ style="width: 200px"
+ :disabled="operation!=='add'"
+ placeholder="璇烽�夋嫨"
+ @change="mesordertypeChange"
+ >
+ <el-option
+ v-for="item in ordertypeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <!-- <div style="display: flex;flex-wrap: nowrap">-->
+ <el-form-item label="婧愬崟鍗曞彿">
+ <el-input
+ v-model="dialogForm.sourceorder"
+ :disabled="dialogForm.ordertype==='PO'"
+ style="width: 200px"
+ >
<el-button
- v-waves
- type="primary"
- style="padding: 0 10px;margin-left: -8px;margin-top: 3px"
- class="el-icon-search"
+ slot="append"
+ icon="el-icon-search"
:disabled="operation!=='add'||dialogForm.ordertype==='PO'"
@click="mesordertsourcesearchclick"
/>
- </div>
- </div>
+ </el-input>
+ </el-form-item>
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="primary"-->
+ <!-- style="padding: 0 10px;margin-left: -8px;margin-top: 3px"-->
+ <!-- class="el-icon-search"-->
+ <!-- :disabled="operation!=='add'||dialogForm.ordertype==='PO'"-->
+ <!-- @click="mesordertsourcesearchclick"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- </div>-->
<el-form-item label="宸ュ崟鏁伴噺" prop="mesqty">
<el-input
v-model="dialogForm.mesqty"
@@ -586,55 +608,56 @@
<el-form-item label="浜у搧瑙勬牸" prop="partspec">
<el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
</el-form-item>
- <div style="display: flex">
- <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
- <el-select
- v-model="dialogForm.wkshopcode"
- filterable
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- :disabled="dialogForm.partcode===''"
- @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
- >
- <el-option
- v-for="item in wkshopArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
- />
- </el-select>
- </el-form-item>
- <div style="display: flex;flex-wrap: nowrap">
- <el-form-item label="宸ヨ壓璺嚎" prop="routecode">
- <el-select
- v-model="dialogForm.routecode"
- filterable
- :popper-append-to-body="false"
- style="width: 172px"
- placeholder="璇烽�夋嫨"
- :disabled="dialogForm.wkshopcode===''"
- @change="routecodeChange"
- >
- <el-option
- v-for="item in routeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- <el-button
- v-waves
- type="primary"
- style="padding: 0 10px;margin-left: -8px;margin-top:3px"
- class="el-icon-search"
- @click="searchClick"
+ <!-- <div style="display: flex">-->
+ <el-form-item label="鐢熶骇杞﹂棿" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px;"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.partcode===''"
+ @change="val=>wkshopcodeChange(val,dialogForm.partcode)"
+ >
+ <el-option
+ v-for="item in wkshopArr"
+ :key="item.org_code"
+ :label="item.org_name"
+ :value="item.org_code"
/>
- <!-- :disabled="dialogForm.routecode===''"-->
+ </el-select>
+ </el-form-item>
- </div>
- </div>
+ <!-- <div style="display: flex;flex-wrap: nowrap">-->
+ <el-form-item label="宸ヨ壓璺嚎" prop="routecode">
+ <el-select
+ v-model="dialogForm.routecode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ :disabled="dialogForm.wkshopcode===''"
+ @change="routecodeChange"
+ >
+ <el-option
+ v-for="item in routeArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <!-- <el-button-->
+ <!-- v-waves-->
+ <!-- type="primary"-->
+ <!-- style="padding: 0 10px;margin-left: -8px;margin-top:3px"-->
+ <!-- class="el-icon-search"-->
+ <!-- @click="searchClick"-->
+ <!-- />-->
+ <!-- :disabled="dialogForm.routecode===''"-->
+
+ <!-- </div>-->
+ <!-- </div>-->
<el-form-item label="鏄惁鎺掔▼" prop="isAps">
<el-radio-group v-model="dialogForm.isAps" style="width:200px" @change="changeIsAps">
<el-radio key="Y" label="Y" value="Y">鏄�</el-radio>
@@ -2217,7 +2240,9 @@
isLastPrint: false, // 鏄惁鏄湯閬撴墦鍗�
lastPrintArr: [], // 鏈亾鎵撳嵃鐨勬暟缁�(鎵�鏈�)
- lastPrintArrSelected: []// 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
+ lastPrintArrSelected: [], // 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
+
+ switchButton: false
}
},
created() {
@@ -3062,8 +3087,8 @@
},
// 琛岀偣鍑讳簨浠�
async rowClick(row, event, column) {
- this.radioSelected = row.wo_code
- const { data: res } = await SearchWorkStep({ wo_code: row.wo_code })
+ this.radioSelected = row.wo_code ? row.wo_code : this.radioSelected
+ const { data: res } = await SearchWorkStep({ wo_code: this.radioSelected, storg_code: this.$store.state.settings.orgType === 'W' ? (this.switchButton ? '' : getCookie('stu_torgcode')) : '' })
this.tableDataDetail = res
},
// 鎵撳嵃宸ュ崟
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
index c8865e1..a46b970 100644
--- a/src/views/qualityManager/qualityPlaning.vue
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -362,7 +362,7 @@
v-for="item in PartSelectArr"
v-if="dialogForm.suitobject==='P'"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partname+'/'+item.partcode"
:value="item.partcode"
/>
<el-option
diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index 4798232..edab877 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -558,7 +558,8 @@
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
- operdate: '', // 鎿嶄綔鏃堕棿
+ operdate: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)], // 鎿嶄綔鏃堕棿
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡 閫愰亾宸ュ簭锛歝ontin 鏈亾宸ュ簭锛歭ast
prop: 'lm_date', // 鎺掑簭瀛楁
@@ -773,7 +774,8 @@
this.form.stepname = ''
this.form.groupcode = ''
this.form.username = ''
- this.form.operdate = ''
+ this.form.operdate = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)]
this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getGroupSalaryReportSearch()
},
diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index afc05ac..60d6db9 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -532,7 +532,8 @@
stepname: '', // 宸ュ簭鍚嶇О
groupcode: '', // 鐢熶骇鐝粍
reportname: '', // 鎿嶄綔浜哄憳
- reportdate: '', // 鎿嶄綔鏃堕棿
+ reportdate: [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)], // 鎿嶄綔鏃堕棿
wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡
@@ -754,7 +755,8 @@
this.form.stepname = ''
this.form.groupcode = ''
this.form.reportname = ''
- this.form.reportdate = ''
+ this.form.reportdate = [new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(
+ 2, '0') + '-01', new Date().toISOString().slice(0, 10)]
this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getPeopleSalaryReportSearch()
},
--
Gitblit v1.9.3