From ff76b3ed3494474e9301c49cf635f1553d49ecc5 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 17 六月 2023 14:58:03 +0800
Subject: [PATCH] 1.生产管理、报表管理引入分车间概念
---
src/views/reportManager/subcontractingOperation.vue | 109 ++----
src/views/reportManager/installationLampList.vue | 29 +
src/views/basicSettings/userList.vue | 9
src/api/qualityManager.js | 5
src/views/reportManager/produceSchedule.vue | 41 ++
src/views/qualityManager/processCheckItem.vue | 56 +++
src/views/reportManager/defectDetailList.vue | 114 ++----
src/views/reportManager/personSalaryList.vue | 129 +++----
src/views/produceManager/produceStartOrder.vue | 105 +++++-
src/views/reportManager/repairDetailList.vue | 109 ++----
src/api/produceManager.js | 5
src/views/qualityManager/qualityPlaning.vue | 91 ++++
src/views/reportManager/groupSalaryList.vue | 131 +++----
13 files changed, 483 insertions(+), 450 deletions(-)
diff --git a/src/api/produceManager.js b/src/api/produceManager.js
index 93aec61..d921925 100644
--- a/src/api/produceManager.js
+++ b/src/api/produceManager.js
@@ -118,10 +118,11 @@
}
// 鐢熶骇寮�鎶ュ伐锛氭姤宸ユ椂鑾峰彇鐢熶骇鐝粍涓嬫媺妗�
-export function MesOrderStepReportSelectUserGroup() {
+export function MesOrderStepReportSelectUserGroup(data) {
return request({
url: 'ProductionManagement/MesOrderStepReportSelectUserGroup',
- method: 'get'
+ method: 'get',
+ params: data
})
}
diff --git a/src/api/qualityManager.js b/src/api/qualityManager.js
index 09cd13a..6a52227 100644
--- a/src/api/qualityManager.js
+++ b/src/api/qualityManager.js
@@ -46,10 +46,11 @@
}
// 宸ュ簭妫�楠屾爣鍑嗘柊澧炪�佺紪杈戣幏鍙栨楠岄」鐩笅鎷夊垪琛�
-export function StepCheckItemSelect() {
+export function StepCheckItemSelect(data) {
return request({
url: 'QualityManagement/StepCheckItemSelect',
- method: 'get'
+ method: 'get',
+ params: data
})
}
diff --git a/src/views/basicSettings/userList.vue b/src/views/basicSettings/userList.vue
index 550b62d..ceb85b1 100644
--- a/src/views/basicSettings/userList.vue
+++ b/src/views/basicSettings/userList.vue
@@ -323,7 +323,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>
</div>
</template>
@@ -1146,13 +1146,16 @@
this.getUserOrganization2()
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
+ if (getCookie('admin') === row.usercode) {
+ return this.$message.info('鏃犳硶鍒犻櫎鐢ㄦ埛鏈韩锛�')
+ }
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteUser({ Userid: id }).then(res => {
+ DeleteUser({ Userid: row.id }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
diff --git a/src/views/produceManager/produceStartOrder.vue b/src/views/produceManager/produceStartOrder.vue
index b552629..01ff435 100644
--- a/src/views/produceManager/produceStartOrder.vue
+++ b/src/views/produceManager/produceStartOrder.vue
@@ -542,7 +542,7 @@
<div style="width: 200px">{{ dialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�" style="margin: 0 10px 0 0">
- <div style="width: 200px">{{ dialogForm.partspec }}</div>
+ <div style="width: 200px">{{ dialogForm.partspec?dialogForm.partspec:'/' }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�" style="margin: 0 10px 0 0">
<div style="width: 200px">{{ dialogForm.stepname }}</div>
@@ -594,6 +594,14 @@
<div style="width: 200px">{{ dialogForm.nextstepname }}</div>
</el-form-item>
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="杞﹂棿鍚嶇О锛�">
+ <div style="width: 200px">{{ dialogForm.wkshopname }}</div>
+ </el-form-item>
+
+ <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" style="margin: 0 10px 0 0">
+ <div style="width: 200px">{{ dialogForm.eqpname }}</div>
+ </el-form-item>
+
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" prop="reckway" label="璁′欢鏂瑰紡锛�">
<el-radio-group v-model="dialogForm.reckway" style="width: 200px;" @change="reckwayChange">
@@ -634,20 +642,20 @@
</el-select>
</el-form-item>
- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">
- <el-select
- v-model="dialogForm.eqpcode"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in ZZeqpArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="璁惧鍚嶇О锛�" prop="eqpcode">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.eqpcode"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in ZZeqpArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item v-if="dialogTitle==='鑷埗鎶ュ伐'" label="鍚堟牸鏁伴噺锛�" prop="startqty">
<el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />
<!-- <el-input v-model="dialogForm.noreportqty" oninput="value=value.replace(/[^0-9.]/g,'')" style="width: 200px;" />-->
@@ -784,7 +792,7 @@
:page.sync="Userform.page"
:limit.sync="Userform.rows"
align="right"
- layout="total,prev, pager, next,sizes,jumper"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -851,12 +859,13 @@
v-model="dialogForm.wxcode"
style="width: 200px;"
placeholder="璇烽�夋嫨"
+ @change="wxCodeChange"
>
<el-option
- v-for="item in WXouterprovide"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in WXouterprovide2"
+ :key="item.Name"
+ :label="item.tp"
+ :value="item.Name"
/>
</el-select>
</el-form-item>
@@ -939,6 +948,32 @@
<el-input v-model="dialogForm.remarks" type="textarea" style="width: 200px;" />
</el-form-item>
</el-form>
+ <div v-if="dialogTitle==='澶栧崗鏀舵枡'" style="display: flex;flex-direction: column">
+ <!--鏄庡ぉ鎺ョ潃鍐欏鍗忔敹鏂欙紝渚涘簲鍟嗗搴旂殑宸叉敹鏈敹璇︽儏-->
+ <div style="height: 30px;margin-left:30px;">
+ 鍙敹鏂欎緵搴斿晢锛�
+ </div>
+
+ <div
+ v-for="(item,index) in dialogForm.list"
+ v-if="item.acceptQty>0"
+ :key="item.Name"
+ style="display: flex;line-height: 26px;height: 26px;margin-left:30px;align-items: center"
+ >
+ <div
+ style="color: #fff;width: 22px;height: 22px;display: flex;justify-content: center;align-items: center;border-radius: 50%"
+ :style="{backgroundColor:$store.state.settings.theme}"
+ >{{ index+1 }}</div>
+ <div style="margin-left:30px;width: 160px;" class="ellipsis">
+ {{ item.tp }}
+ </div>
+ <div style="margin-left:30px;">
+ 鍙敹鏁伴噺锛歿{ item.acceptQty }}
+ </div>
+ </div>
+
+ </div>
+
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
@@ -1098,7 +1133,7 @@
<div style="width: 200px">{{ badDialogForm.partname }}</div>
</el-form-item>
<el-form-item label="浜у搧瑙勬牸锛�">
- <div style="width: 200px">{{ badDialogForm.partspec }}</div>
+ <div style="width: 200px">{{ badDialogForm.partspec?badDialogForm.partspec:'/' }}</div>
</el-form-item>
<el-form-item label="褰撳墠宸ュ簭锛�">
<div style="width: 200px">{{ badDialogForm.stepname }}</div>
@@ -1380,6 +1415,7 @@
ZZeqpArr: [], // 鑷埗璁惧鍚嶇О
badArr: [], // 涓嶈壇鍘熷洜鏁扮粍
WXouterprovide: [], // 澶栧崗渚涙柟鏁扮粍
+ WXouterprovide2: [], // 澶栧崗渚涙柟鏀舵枡鏁扮粍
WXoutuser: [], // 鍙戞枡浜哄憳鏁扮粍
userTableData: [], // 浜哄憳鍒楄〃
UserTotal: 0,
@@ -1821,6 +1857,12 @@
this.dialogForm.startqtySum = obj.noreportqty
+ this.dialogForm.eqpname = obj.eqpname
+ this.dialogForm.eqpcode = obj.eqpcode
+
+ this.dialogForm.wkshopcode = obj.wkshopcode
+ this.dialogForm.wkshopname = obj.wkshopname
+
this.$refs.userTableDataRef.doLayout()
})
@@ -1859,11 +1901,24 @@
await this.getMesOrderStepSelectWX()
await this.getMesOrderSelectUser()
},
+ wxCodeChange(val) {
+ this.dialogForm.sqty = this.WXouterprovide2.find(i => i.Name === val).acceptQty
+ },
// 澶栧崗鏀舵枡
async WXback(obj) {
// if (this.WXform.orderstepqrcode === '') {
// return this.$message.info('璇峰厛杈撳叆宸ュ簭锛�')
// }
+ this.WXouterprovide2 = []
+ obj.list.forEach(i => {
+ i.acceptQty = parseFloat(i.fqty) - parseFloat(i.sqty) - parseFloat(i.ng_qty) - parseFloat(i.bad_qty)
+ if (i.acceptQty > 0) {
+ this.WXouterprovide2.push(i)
+ }
+ })
+
+ console.log(this.WXouterprovide2, 2)
+
this.dialogTitle = '澶栧崗鏀舵枡'
this.dialogVisible = true
@@ -1887,6 +1942,8 @@
this.dialogForm.sqty = obj.startqty
this.dialogForm.startqtySum = obj.startqty
+
+ this.dialogForm.list = obj.list
})
await this.getMesOrderStepSelectWX()
await this.getMesOrderSelectUser()
@@ -1899,7 +1956,7 @@
},
// 鑾峰彇鑷埗鎶ュ伐鐢熶骇鐝粍涓嬫媺鍒楄〃
async getMesOrderStepReportSelectUserGroup() {
- const { data: res } = await MesOrderStepReportSelectUserGroup()
+ const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.dialogForm.wkshopcode })
this.ZZtreams = res
},
// 鑾峰彇鑷埗鎶ュ伐琛ㄦ牸user鎵�鏈�
@@ -2160,6 +2217,10 @@
return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈敹鏁伴噺!')
}
+ if (this.WXouterprovide2.find(i => i.Name === this.dialogForm.wxcode).acceptQty < parseFloat(this.dialogForm.sqty) + parseFloat(this.dialogForm.noputqty)) {
+ return this.$message.info('鏀舵枡鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庤渚涘簲鍟嗗彲鏀舵暟閲�!')
+ }
+
if (parseFloat(this.dialogForm.noputqty) > 0) {
if (this.dialogForm.badcode.length < 1) {
return this.$message.info('璇烽�夋嫨涓嶈壇鍘熷洜锛�')
diff --git a/src/views/qualityManager/processCheckItem.vue b/src/views/qualityManager/processCheckItem.vue
index b85c0cd..b65b5a0 100644
--- a/src/views/qualityManager/processCheckItem.vue
+++ b/src/views/qualityManager/processCheckItem.vue
@@ -119,6 +119,21 @@
<el-form-item label="椤圭洰鍚嶇О" prop="checkitemname">
<el-input v-model="dialogForm.checkitemname" style="width: 200px" />
</el-form-item>
+ <el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
+ <el-select
+ v-model="dialogForm.workshopcode"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="椤圭洰鎻忚堪" prop="checkitemdescr">
<el-input v-model="dialogForm.checkitemdescr" type="textarea" style="width: 200px" />
</el-form-item>
@@ -146,6 +161,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Xxxx',
@@ -192,11 +208,30 @@
sortable: true
},
{
+ minWidth: 110,
+ width: false,
+ prop: 'org_code',
+ label: '鎵�灞炶溅闂寸紪鐮�',
+ id: 5,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: 110,
+ width: false,
+ prop: 'org_name',
+ label: '鎵�灞炶溅闂�',
+ id: 6,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+ {
minWidth: 330,
width: false,
prop: 'descr',
label: '鏍囧噯鎻忚堪',
- id: 5,
+ id: 7,
show: true,
fixed: false,
sortable: true
@@ -206,7 +241,7 @@
width: false,
prop: 'lm_user',
label: '鍒涘缓浜哄憳',
- id: 6,
+ id: 8,
show: true,
fixed: false,
sortable: true
@@ -216,7 +251,7 @@
width: false,
prop: 'lm_date',
label: '鍒涘缓鏃堕棿',
- id: 7,
+ id: 9,
show: true,
fixed: false,
sortable: true
@@ -237,18 +272,28 @@
],
checkitemname: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
+ ],
+ workshopcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
]
- }
+ },
+ WorkShopArr: [] // 鎵�灞炶溅闂存暟缁�
}
},
created() {
this.getStepCheckItemSearch()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
tableColumnUpdate(val, isCopyTrue) {
if (isCopyTrue) {
this.tableColumnSettingsArray = val
@@ -302,6 +347,7 @@
this.$nextTick(() => {
this.dialogForm.checkitemcode = row.code
this.dialogForm.checkitemname = row.name
+ this.dialogForm.workshopcode = row.org_code
this.dialogForm.checkitemdescr = row.descr
})
},
@@ -330,6 +376,7 @@
this.dialogForm.checkitemcode = ''
this.dialogForm.checkitemname = ''
this.dialogForm.checkitemdescr = ''
+ this.dialogForm.workshopcode = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -345,6 +392,7 @@
checkitemcode: this.dialogForm.checkitemcode,
checkitemname: this.dialogForm.checkitemname,
checkitemdescr: this.dialogForm.checkitemdescr,
+ wkshopcode: this.dialogForm.workshopcode,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
AddUpdateStepCheckItem(data).then(res => {
diff --git a/src/views/qualityManager/qualityPlaning.vue b/src/views/qualityManager/qualityPlaning.vue
index b7b1a58..c8865e1 100644
--- a/src/views/qualityManager/qualityPlaning.vue
+++ b/src/views/qualityManager/qualityPlaning.vue
@@ -296,6 +296,24 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="鎵�灞炶溅闂�" prop="wkshopcode">
+ <el-select
+ v-model="dialogForm.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ @change="getStepSelect"
+ >
+
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<br>
<el-form-item prop="checktype" label="璐ㄦ绫诲瀷">
<el-radio-group v-model="dialogForm.checktype">
@@ -336,7 +354,6 @@
style="width: 200px"
multiple
filterable
-
collapse-tags
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
@@ -378,10 +395,10 @@
/>
</el-select>
</el-form-item>
-
<el-form-item label="妫�楠屾柟妗堟弿杩�">
<el-input v-model="dialogForm.descr" type="textarea" :autosize="{ minRows: 2 }" />
</el-form-item>
+
</el-form>
<div style="display: flex;align-items: center;margin-bottom: 10px;">
@@ -712,6 +729,7 @@
StepCheckItemSelect
} from '@/api/qualityManager'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Zzjg',
@@ -816,12 +834,33 @@
fixed: false,
sortable: true
},
+
+ {
+ minWidth: false,
+ width: 110,
+ prop: 'org_code',
+ label: '鎵�灞炶溅闂寸紪鐮�',
+ id: 9,
+ show: false,
+ fixed: false,
+ sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'org_name',
+ label: '鎵�灞炶溅闂�',
+ id: 10,
+ show: true,
+ fixed: false,
+ sortable: true
+ },
+
{
minWidth: false,
width: 110,
prop: 'stepcode',
label: '宸ュ簭缂栫爜',
- id: 9,
+ id: 11,
show: false,
fixed: false,
sortable: true
@@ -830,7 +869,7 @@
width: false,
prop: 'stepname',
label: '宸ュ簭鍚嶇О',
- id: 10,
+ id: 12,
show: true,
fixed: false,
sortable: true
@@ -840,7 +879,7 @@
width: 110,
prop: 'username',
label: '鍒涘缓浜哄憳',
- id: 11,
+ id: 13,
show: true,
fixed: false,
sortable: true
@@ -850,7 +889,7 @@
width: 160,
prop: 'lm_date',
label: '鍒涘缓鏃堕棿',
- id: 12,
+ id: 14,
show: true,
fixed: false,
sortable: true
@@ -869,6 +908,7 @@
suitobject: 'P', // 閫傜敤瀵硅薄
suitpart: [], // 閫傜敤鐗╂枡
stepcode: '', // 宸ュ簭
+ wkshopcode: '', // 鎵�灞炶溅闂�
descr: '' // /鎻忚堪
},
operation: '',
@@ -902,6 +942,9 @@
],
stepcode: [
{ required: true, message: '璇烽�夋嫨宸ュ簭鍚嶇О', trigger: ['blur', 'change'] }
+ ],
+ wkshopcode: [
+ { required: true, message: '璇烽�夋嫨鎵�灞炶溅闂�', trigger: ['blur', 'change'] }
]
},
checkitem: [],
@@ -918,6 +961,7 @@
CheckItemSelectArr: [], // 妫�楠岄」鐩�
StepSelectArr: [], // 宸ュ簭鍚嶇О涓嬫媺鎵�鏈�
+ WorkShopArr: [], // 鎵�灞炶溅闂存暟缁�
isCancel: true// 鏄惁鍙彇娑�
}
@@ -942,16 +986,25 @@
this.getQualityInspectionSearch().then(res => {
if (res.code === '200') {
// this.getUomSelect()
- this.getStepCheckItemSelect()
+ // this.getStepCheckItemSelect()
this.getPartSelect()
this.getStockTypeSelect()
- this.getStepSelect()
+
+ this.getWorkShopSelect()
}
})
},
- async getStepSelect() {
- const { data: res } = await StepSelect()
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
+ async getStepSelect(val) {
+ this.dialogForm.stepcode = ''
+ const { data: res } = await StepSelect({ WorkShop: val })
this.StepSelectArr = res
+
+ await this.getStepCheckItemSelect(val)
},
async getQualityInspectionSearch() {
const res = await QualityInspectionSearch(this.form)
@@ -1017,6 +1070,7 @@
this.dialogForm.suitobject = row.suitobject
this.dialogForm.suitpart = row.suitpart.split(',')
this.dialogForm.descr = row.descr
+ this.dialogForm.wkshopcode = row.org_code
this.checkitem = res
this.$refs.tableDataRef2.doLayout()
@@ -1060,6 +1114,7 @@
this.dialogForm.suitobject = row.suitobject
this.dialogForm.suitpart = row.suitpart.split(',')
this.dialogForm.descr = row.descr
+ this.dialogForm.wkshopcode = row.org_code
this.checkitem = res
// console.log(this.checkitem, 2)
this.$refs.tableDataRef2.doLayout()
@@ -1105,9 +1160,9 @@
this.dialogForm.suitpart = []
},
// 鑾峰彇妫�楠岄」鐩笅鎷夋帴鍙�
- async getStepCheckItemSelect() {
- const { data: res } = await StepCheckItemSelect()
-
+ async getStepCheckItemSelect(val) {
+ const { data: res } = await StepCheckItemSelect({ WorkShop: val })
+ this.CheckItemSelectArr = []
res.forEach(i => {
this.CheckItemSelectArr.push({
code: i.code,
@@ -1210,7 +1265,8 @@
sampscale: '',
suitobject: 'P',
suitpart: [],
- descr: ''
+ descr: '',
+ wkshopcode: ''
}
this.isCancel = true
@@ -1228,6 +1284,12 @@
if (valid) {
if (this.checkitem.length < 1) {
return this.$message.info('璐ㄦ鍒楄〃涓嶈兘涓虹┖锛�')
+ }
+ if (this.checkitem.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨璐ㄦ鍒楄〃锛�')
+ }
+ if (this.dialogForm.checktype === 'InCheck' || this.dialogForm.checktype === 'OutCheck') {
+ this.dialogForm.stepcode = ''
}
const checkitem = []
@@ -1257,6 +1319,7 @@
suitpart: this.dialogForm.suitpart.join(','),
type: this.operation === 'add' ? 'Add' : 'Update',
descr: this.dialogForm.descr,
+ wkshopcode: this.dialogForm.wkshopcode,
checkitem
}
diff --git a/src/views/reportManager/defectDetailList.vue b/src/views/reportManager/defectDetailList.vue
index 4a51f16..cf9de0c 100644
--- a/src/views/reportManager/defectDetailList.vue
+++ b/src/views/reportManager/defectDetailList.vue
@@ -14,6 +14,16 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style="display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -23,7 +33,7 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
@@ -131,6 +141,18 @@
>
<template slot-scope="{row}">
<div v-if="row.partspec">{{ row.partspec }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -265,6 +287,7 @@
import { MesOrderStepReportSelectUserGroup } from '@/api/produceManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Zzjg',
@@ -279,6 +302,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -293,6 +317,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ WorkShopArr: [],
// groupArr: [],
total: 10,
tableData: [],
@@ -341,10 +366,16 @@
methods: {
handleRequest() {
this.getDefectDetailsReportSearch().then(res => {
- // if (res.code === '200') {
+ if (res.code === '200') {
// this.getMesOrderStepReportSelectUserGroup()
- // }
+ this.getWorkShopSelect()
+ }
})
+ },
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
async getDefectDetailsReportSearch() {
let tempDate = this.form.reportdate
@@ -360,6 +391,7 @@
defectcode: this.form.defectcode,
defectname: this.form.defectname,
reportname: this.form.reportname,
+ wkshopcode: this.form.wkshopcode,
reportdate: tempDate,
prop: this.form.prop,
order: this.form.order,
@@ -406,6 +438,7 @@
defectcode: this.form.defectcode,
defectname: this.form.defectname,
reportname: this.form.reportname,
+ wkshopcode: this.form.wkshopcode,
reportdate: tempDate
}
@@ -435,81 +468,8 @@
this.form.defectname = ''
this.form.reportname = ''
this.form.reportdate = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getDefectDetailsReportSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- async edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- const res = await GroupSalaryReportSearchUser({ id: row.id })
- this.tagArr = res.data.map(r => r.reportname)
- // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
- // this.$nextTick(() => {
- // this.dialogForm.OrgCode = row.org_code
- // this.dialogForm.OrgName = row.org_name
- // this.dialogForm.SupUnit = row.parent_id
- // })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getDefectDetailsReportSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getDefectDetailsReportSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
diff --git a/src/views/reportManager/groupSalaryList.vue b/src/views/reportManager/groupSalaryList.vue
index 2efeb32..59757e9 100644
--- a/src/views/reportManager/groupSalaryList.vue
+++ b/src/views/reportManager/groupSalaryList.vue
@@ -40,6 +40,16 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -49,9 +59,9 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
+ <!-- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style="display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -190,6 +200,18 @@
show-tooltip-when-overflow
sortable="custom"
/>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
@@ -355,6 +377,18 @@
sortable="custom"
/>
<el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
width="110"
@@ -502,6 +536,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { StepSelect } from '@/api/makeModel'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Zzjg',
@@ -524,6 +559,7 @@
stepname: '', // 宸ュ簭鍚嶇О
groupcode: '', // 鐢熶骇鐝粍
username: '', // 鎿嶄綔浜哄憳
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
operdate: '', // 鎿嶄綔鏃堕棿
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡 閫愰亾宸ュ簭锛歝ontin 鏈亾宸ュ簭锛歭ast
@@ -558,6 +594,8 @@
},
+ WorkShopArr: [], // 鎵�灞炶溅闂存暟缁�
+
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
code: '4',
shows: false
@@ -589,9 +627,15 @@
this.getGroupSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
- this.getStepSelect()
+ this.getWorkShopSelect()
+ // this.getStepSelect()
}
})
+ },
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
async getStepSelect() {
@@ -643,6 +687,7 @@
stepname: this.form.stepname,
groupcode: this.form.groupcode,
username: this.form.username,
+ wkshopcode: this.form.wkshopcode,
operdate: tempDate,
rejectstepcode: this.form.rejectstepcode.join(','),
compute: this.form.compute,
@@ -666,7 +711,7 @@
},
async getMesOrderStepReportSelectUserGroup() {
- const { data: res } = await MesOrderStepReportSelectUserGroup()
+ const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.form.wkshopcode })
this.groupArr = res
},
tabClick(val) {
@@ -701,6 +746,7 @@
stepname: this.form.stepname,
groupcode: this.form.groupcode,
username: this.form.username,
+ wkshopcode: this.form.wkshopcode,
operdate: tempDate,
compute: this.form.compute
}
@@ -730,81 +776,8 @@
this.form.groupcode = ''
this.form.username = ''
this.form.operdate = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getGroupSalaryReportSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- async edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- const res = await GroupSalaryReportSearchUser({ id: row.id })
- this.tagArr = res.data.map(r => r.username)
- // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
- // this.$nextTick(() => {
- // this.dialogForm.OrgCode = row.org_code
- // this.dialogForm.OrgName = row.org_name
- // this.dialogForm.SupUnit = row.parent_id
- // })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getGroupSalaryReportSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getGroupSalaryReportSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
diff --git a/src/views/reportManager/installationLampList.vue b/src/views/reportManager/installationLampList.vue
index b1aee76..4e28365 100644
--- a/src/views/reportManager/installationLampList.vue
+++ b/src/views/reportManager/installationLampList.vue
@@ -18,9 +18,9 @@
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
@@ -109,7 +109,7 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style="display: flex;">
<el-select
v-model="formSum.wkshopcode"
style="width: 200px"
@@ -118,13 +118,13 @@
>
<el-option
v-for="item in wkshopSelectArr"
- :key="item.org_code"
- :label="item.org_name"
- :value="item.org_code"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
/>
</el-select>
</el-form-item>
- <el-form-item label="鐢熶骇璁惧" style=" display: flex;">
+ <el-form-item label="鐢熶骇璁惧" style="display: flex;">
<el-select
v-model="formSum.eqpcode"
:disabled="formSum.wkshopcode===''"
@@ -348,9 +348,10 @@
AnDonReportSumExcelSearch,
AnDonReportSumSearch
} from '@/api/reportManager'
-import { ShopSearch } from '@/api/kanbanManager'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import { WorkShopSelect } from '@/api/deviceManager'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -365,7 +366,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
calltypecode: '', // 鍛煎彨绫诲瀷缂栫爜
calluser: '', // 鍛煎彨浜哄憳
calldate: '', // 鍛煎彨鏃堕棿
@@ -493,7 +494,7 @@
currentTabPositionName: '瀹夌伅鏄庣粏', // Tab鏍囩浣嶄簬鐨勪綅缃� 榛樿绗��0鈥欎釜
formSum: {
- wkshopcode: '', // 杞﹂棿缂栫爜
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
calltypecode: '', // 鍛煎彨绫诲瀷缂栫爜
calldate: '', // 鍛煎彨鏃堕棿
eqpcode: '', // 璁惧缂栫爜
@@ -608,6 +609,10 @@
if (res.code === '200') {
this.getShopSearch()
this.getAnDengTypeSearch()
+
+ if (this.$store.state.settings.orgType === 'W') {
+ this.getWhkspIsEqpSearch(getCookie('stu_torgcode'))
+ }
}
})
},
@@ -669,7 +674,7 @@
},
// 鑾峰彇鐢熶骇杞﹂棿
async getShopSearch() {
- const { data: res } = await ShopSearch()
+ const { data: res } = await WorkShopSelect()
this.wkshopSelectArr = res
},
// 鑾峰彇鍛煎彨绫诲瀷
diff --git a/src/views/reportManager/personSalaryList.vue b/src/views/reportManager/personSalaryList.vue
index 5ea0ea2..afc05ac 100644
--- a/src/views/reportManager/personSalaryList.vue
+++ b/src/views/reportManager/personSalaryList.vue
@@ -40,6 +40,16 @@
style="display: flex; "
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style="display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -49,9 +59,9 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
+ <!-- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -189,6 +199,18 @@
show-tooltip-when-overflow
sortable="custom"
/>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
@@ -348,6 +370,18 @@
sortable="custom"
/>
<el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.wkshp_name">{{ row.wkshp_name }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
width="110"
@@ -475,6 +509,7 @@
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { StepSelect } from '@/api/makeModel'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Zzjg',
@@ -498,6 +533,7 @@
groupcode: '', // 鐢熶骇鐝粍
reportname: '', // 鎿嶄綔浜哄憳
reportdate: '', // 鎿嶄綔鏃堕棿
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
rejectstepcode: [], // 鍓旈櫎宸ュ簭(鍥哄畾钖祫宸ュ簭涓嶅弬涓庤绠�
compute: 'last', // 璁′欢鏂瑰紡
prop: 'partcode', // 鎺掑簭瀛楁
@@ -505,6 +541,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ WorkShopArr: [],
groupArr: [],
total: 10,
tableData: [],
@@ -562,9 +599,15 @@
this.getPeopleSalaryReportSearch().then(res => {
if (res.code === '200') {
this.getMesOrderStepReportSelectUserGroup()
- this.getStepSelect()
+ this.getWorkShopSelect()
+ // this.getStepSelect()
}
})
+ },
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
// 鑾峰彇宸ュ簭涓嬫媺鎺ュ彛
async getStepSelect() {
@@ -624,6 +667,7 @@
stepname: this.form.stepname,
groupcode: this.form.groupcode,
compute: this.form.compute,
+ wkshopcode: this.form.wkshopcode,
reportname: this.form.reportname,
rejectstepcode: this.form.rejectstepcode.join(','),
reportdate: tempDate,
@@ -647,7 +691,7 @@
},
async getMesOrderStepReportSelectUserGroup() {
- const { data: res } = await MesOrderStepReportSelectUserGroup()
+ const { data: res } = await MesOrderStepReportSelectUserGroup({ wkshopcode: this.form.wkshopcode })
this.groupArr = res
},
tabClick(val) {
@@ -682,6 +726,7 @@
groupcode: this.form.groupcode,
compute: this.form.compute,
reportname: this.form.reportname,
+ wkshopcode: this.form.wkshopcode,
reportdate: tempDate
}
@@ -710,82 +755,10 @@
this.form.groupcode = ''
this.form.reportname = ''
this.form.reportdate = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '' // 鎵�灞炶溅闂�
this.getPeopleSalaryReportSearch()
},
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- async edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- const res = await GroupSalaryReportSearchUser({ id: row.id })
- this.tagArr = res.data.map(r => r.reportname)
- // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
- // this.$nextTick(() => {
- // this.dialogForm.OrgCode = row.org_code
- // this.dialogForm.OrgName = row.org_name
- // this.dialogForm.SupUnit = row.parent_id
- // })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getPeopleSalaryReportSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getPeopleSalaryReportSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
- },
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
diff --git a/src/views/reportManager/produceSchedule.vue b/src/views/reportManager/produceSchedule.vue
index 6687144..01014fa 100644
--- a/src/views/reportManager/produceSchedule.vue
+++ b/src/views/reportManager/produceSchedule.vue
@@ -15,6 +15,16 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select v-model="form.status" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
@@ -31,7 +41,7 @@
<el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
<el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="宸ヨ壓璺嚎鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="宸ヨ壓璺嚎鍚嶇О" style=" display: flex;">
<el-input v-model="form.routename" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
@@ -40,9 +50,9 @@
<el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
+ <!-- <el-input v-model="form.partspec" placeholder="璇疯緭鍏�" style="width: 200px" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="鍗曟嵁鏃ユ湡" style="display: flex;align-items: center">
<el-date-picker
v-model="form.lm_date"
@@ -139,6 +149,13 @@
prop="partname"
label="浜у搧鍚嶇О"
width="155"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="105"
show-tooltip-when-overflow
sortable="custom"
/>
@@ -254,6 +271,8 @@
ProductionScheduleReportExcelSearch,
ProductionScheduleReportSearch
} from '@/api/reportManager'
+import { WorkShopSelect } from '@/api/deviceManager'
+import { getCookie } from '@/utils/auth'
export default {
name: 'Zzjg',
@@ -275,6 +294,7 @@
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 瑙勬牸鍨嬪彿
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
lm_date: '', // 鍗曟嵁鏃ユ湡
prop: 'lm_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
@@ -288,19 +308,27 @@
],
total: 10,
- tableData: []
+ tableData: [],
+
+ WorkShopArr: [] // 鎵�灞炶溅闂存暟缁�
}
},
created() {
this.getProductionScheduleReportSearch()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
async getProductionScheduleReportSearch() {
let tempDate = this.form.lm_date
if (tempDate.length > 0) {
@@ -314,6 +342,7 @@
partcode: this.form.partcode,
partname: this.form.partname,
partspec: this.form.partspec,
+ wkshopcode: this.form.wkshopcode,
lm_date: tempDate,
prop: this.form.prop,
order: this.form.order,
@@ -340,6 +369,7 @@
partcode: this.form.partcode,
partname: this.form.partname,
partspec: this.form.partspec,
+ wkshopcode: this.form.wkshopcode,
lm_date: tempDate
}
@@ -373,6 +403,7 @@
this.form.partname = ''
this.form.partspec = ''
this.form.lm_date = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : ''// 鎵�灞炶溅闂�
this.getProductionScheduleReportSearch()
},
diff --git a/src/views/reportManager/repairDetailList.vue b/src/views/reportManager/repairDetailList.vue
index 8f9be8d..15e1346 100644
--- a/src/views/reportManager/repairDetailList.vue
+++ b/src/views/reportManager/repairDetailList.vue
@@ -14,6 +14,16 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -23,7 +33,7 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="瑙勬牸鍨嬪彿" style=" display: flex;">
<el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
@@ -142,6 +152,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="110"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
@@ -273,6 +290,7 @@
} from '@/api/reportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Zzjg',
@@ -287,6 +305,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -301,6 +320,7 @@
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
+ WorkShopArr: [],
styleArr: [
{ code: 'B', name: '鎶ュ伐' },
{ code: 'S', name: '鏀舵枡' }
@@ -353,10 +373,16 @@
methods: {
handleRequest() {
this.getMaintenanceDetailsReportSearch().then(res => {
- // if (res.code === '200') {
+ if (res.code === '200') {
// this.getMesOrderStepReportSelectUserGroup()
- // }
+ this.getWorkShopSelect()
+ }
})
+ },
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
},
async getMaintenanceDetailsReportSearch() {
let tempDate = this.form.repairdate
@@ -369,6 +395,7 @@
partname: this.form.partname,
partspec: this.form.partspec,
stepname: this.form.stepname,
+ wkshopcode: this.form.wkshopcode,
style: this.form.style,
defectname: this.form.defectname,
repairname: this.form.repairname,
@@ -418,6 +445,7 @@
style: this.form.style,
defectname: this.form.defectname,
repairname: this.form.repairname,
+ wkshopcode: this.form.wkshopcode,
repairdate: tempDate
}
@@ -447,81 +475,8 @@
this.form.defectname = ''
this.form.repairname = ''
this.form.repairdate = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : ''// 鎵�灞炶溅闂�
this.getMaintenanceDetailsReportSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- async edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- const res = await GroupSalaryReportSearchUser({ id: row.id })
- this.tagArr = res.data.map(r => r.repairname)
- // this.tagArr = ['妤兼潕淇�', '寮犱笁', '鏉庡洓']
- // this.$nextTick(() => {
- // this.dialogForm.OrgCode = row.org_code
- // this.dialogForm.OrgName = row.org_name
- // this.dialogForm.SupUnit = row.parent_id
- // })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getMaintenanceDetailsReportSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getMaintenanceDetailsReportSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
diff --git a/src/views/reportManager/subcontractingOperation.vue b/src/views/reportManager/subcontractingOperation.vue
index 1c99156..cedb9d7 100644
--- a/src/views/reportManager/subcontractingOperation.vue
+++ b/src/views/reportManager/subcontractingOperation.vue
@@ -14,6 +14,16 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="item in WorkShopArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
<el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -23,9 +33,9 @@
<el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">
- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item label="瑙勬牸鍨嬪彿" style=" display: flex;">-->
+ <!-- <el-input v-model="form.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
<el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -143,6 +153,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="wkshp_name"
+ label="鐢熶骇杞﹂棿"
+ width="105"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
<el-table-column
prop="stepcode"
label="宸ュ簭缂栫爜"
@@ -323,6 +340,7 @@
import { OutSourceReportExcelSearch, OutSourceReportSearch } from '@/api/reportManager'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
+import { WorkShopSelect } from '@/api/deviceManager'
export default {
name: 'Zzjg',
@@ -345,6 +363,7 @@
suppername: '', // 渚涙柟鍚嶇О
type: '', // 鎿嶄綔绫诲瀷
receivdate: '', // 鏀舵枡鏃堕棿
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
prop: 'out_time', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -377,6 +396,8 @@
},
+ WorkShopArr: [],
+
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
code: '4',
shows: false
@@ -392,12 +413,18 @@
},
created() {
this.getOutSourceReportSearch()
+ this.getWorkShopSelect()
},
mounted() {
window.addEventListener('resize', this.getHeight)
this.getHeight()
},
methods: {
+ // 鑾峰彇鎵�灞炶溅闂翠笅鎷�
+ async getWorkShopSelect() {
+ const { data: res } = await WorkShopSelect()
+ this.WorkShopArr = res
+ },
async getOutSourceReportSearch() {
let tempDate = this.form.receivdate
if (tempDate.length > 0) {
@@ -411,6 +438,7 @@
partspec: this.form.partspec,
stepname: this.form.stepname,
suppername: this.form.suppername,
+ wkshopcode: this.form.wkshopcode,
type: this.form.type,
receivdate: tempDate,
prop: this.form.prop,
@@ -419,7 +447,6 @@
rows: this.form.rows
}
- console.log(data, 1)
const res = await OutSourceReportSearch(data)
this.tableData = res.data
this.total = res.count
@@ -450,6 +477,7 @@
partspec: this.form.partspec,
stepname: this.form.stepname,
suppername: this.form.suppername,
+ wkshopcode: this.form.wkshopcode,
type: this.form.type,
receivdate: tempDate
}
@@ -479,78 +507,9 @@
this.form.suppername = ''
this.form.type = ''
this.form.receivdate = ''
+ this.form.wkshopcode = this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : ''// 鎵�灞炶溅闂�
+
this.getOutSourceReportSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- },
- // 淇敼鎸夐挳
- edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- this.$nextTick(() => {
- this.dialogForm.OrgCode = row.org_code
- this.dialogForm.OrgName = row.org_name
- this.dialogForm.SupUnit = row.parent_id
- })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- // confirmButtonText: '纭畾',
- // cancelButtonText: '鍙栨秷',
- // type: 'warning'
- // }).then(() => {
- // DeleteOrganization({ orgid: row.code }).then(res => {
- // if (res.code === '200') {
- // this.$message.success('鍒犻櫎鎴愬姛!')
- // if (this.form.page > 1 && this.tableData.length === 1) {
- // this.form.page--
- // }
- // this.getOutSourceReportSearch()
- // }
- // })
- // }).catch(() => {
- // this.$message.info('宸插彇娑堝垹闄�')
- // })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.OrgType = ''
- this.dialogForm.OrgCode = ''
- this.dialogForm.OrgName = ''
- this.dialogForm.SupUnit = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- OrganCode: this.dialogForm.OrgCode,
- OrganName: this.dialogForm.OrgName,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- // AddUpdateOrganization(data).then(res => {
- // if (res.code === '200') {
- // this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- // this.dialogVisible = false
- // this.getOutSourceReportSearch()
- // } else {
- // this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- // }
- // })
- }
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
--
Gitblit v1.9.3