From c02a3ebf5b4338710c4f9ae231d72cf591dfb97f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期一, 02 十二月 2024 11:28:04 +0800
Subject: [PATCH] 1.修改 批量派发 没绑定工艺路线的单子，显示在最前面
---
src/views/reportManager/subcontractingOperation.vue | 160 ++++++++++++++++++++++-------------------------------
1 files changed, 66 insertions(+), 94 deletions(-)
diff --git a/src/views/reportManager/subcontractingOperation.vue b/src/views/reportManager/subcontractingOperation.vue
index 1c99156..cf09c68 100644
--- a/src/views/reportManager/subcontractingOperation.vue
+++ b/src/views/reportManager/subcontractingOperation.vue
@@ -14,34 +14,47 @@
style="display: flex;"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
- <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
- <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <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 v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
- <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="渚涙柟鍚嶇О" style=" display: flex;">
- <el-input v-model="form.suppername" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">
- <el-select v-model="form.type" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
+ <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in typeArr"
+ 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.saleordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
+ <el-input v-model="form.wocode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="浜у搧缂栫爜" style=" display: flex;">
+ <el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" 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 v-show="isExpandForm" label="宸ュ簭鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.stepname" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" label="渚涙柟鍚嶇О" style=" display: flex;">
+ <el-input v-model="form.suppername" style="width: 200px" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ <!-- <el-form-item v-show="isExpandForm" label="鎿嶄綔绫诲瀷" style=" display: flex;">-->
+ <!-- <el-select v-model="form.type" style="width: 200px" placeholder="璇烽�夋嫨">-->
+ <!-- <el-option-->
+ <!-- v-for="item in typeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
<el-form-item
v-show="isExpandForm"
style="display: flex;align-items: center"
@@ -112,6 +125,12 @@
label="搴忓彿"
/>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ width="160"
+ sortable="custom"
+ />
+ <el-table-column
prop="wo_code"
label="宸ュ崟缂栧彿"
width="160"
@@ -143,6 +162,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,9 +349,10 @@
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',
+ name: 'SubcontractingOperation',
components: {
Pagination, ImportPicker
},
@@ -337,6 +364,7 @@
mainHeight: 0,
tableHeight: 0,
form: {
+ saleordercode: '',
wocode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -345,6 +373,7 @@
suppername: '', // 渚涙柟鍚嶇О
type: '', // 鎿嶄綔绫诲瀷
receivdate: '', // 鏀舵枡鏃堕棿
+ wkshopcode: this.$store.state.settings.orgType === 'W' ? getCookie('stu_torgcode') : '', // 鎵�灞炶溅闂�
prop: 'out_time', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -377,6 +406,8 @@
},
+ WorkShopArr: [],
+
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
code: '4',
shows: false
@@ -392,12 +423,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) {
@@ -405,12 +442,14 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
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 +458,6 @@
rows: this.form.rows
}
- console.log(data, 1)
const res = await OutSourceReportSearch(data)
this.tableData = res.data
this.total = res.count
@@ -444,12 +482,14 @@
}
const data = {
+ saleordercode: this.form.saleordercode,
wocode: this.form.wocode,
partcode: this.form.partcode,
partname: this.form.partname,
partspec: this.form.partspec,
stepname: this.form.stepname,
suppername: this.form.suppername,
+ wkshopcode: this.form.wkshopcode,
type: this.form.type,
receivdate: tempDate
}
@@ -471,6 +511,7 @@
},
// 閲嶇疆
reset() {
+ this.form.saleordercode = ''
this.form.wocode = ''
this.form.partcode = ''
this.form.partname = ''
@@ -479,78 +520,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