From 844adb3a80b39f9a78dae89a6a27f19e58a931df Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 09 一月 2024 10:34:58 +0800
Subject: [PATCH] 1.图片预览地址配置
---
src/views/workOrder/workOrderList.vue | 222 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 148 insertions(+), 74 deletions(-)
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 1f3ad55..f0a327a 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -8,7 +8,7 @@
<el-button v-waves type="success" icon="el-icon-connection" @click="send">娲惧彂</el-button>
</div>
- <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>
+ <!-- <el-button v-waves icon="el-icon-switch-button" @click="orderClose">鍏抽棴宸ュ崟</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -20,6 +20,22 @@
style="display: flex;"
>
<div class="elForm">
+ <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-select
+ v-model="form.wkshopcode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
<el-select
v-model="form.mesorderstus"
@@ -43,7 +59,7 @@
<el-form-item label="婧愬崟鍗曞彿" style="display: flex;">
<el-input v-model="form.sourceorder" 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.saleordercode" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍗曟嵁绫诲瀷" style=" display: flex;">
@@ -269,6 +285,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="data_sources"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- label="鏁版嵁鏉ユ簮"-->
+ <!-- sortable="custom"-->
+ <!-- width="120"-->
+ <!-- />-->
<el-table-column
prop="lm_user"
@@ -295,12 +318,12 @@
<i
class="el-icon-edit-outline"
:style="{color:$store.state.settings.theme}"
- @click="edit('edit',row)"
+ @click.stop="edit('edit',row)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
+ <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ崟" placement="top">
@@ -313,7 +336,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click="handlePrint(row.wo_code)"
+ @click.stop="handlePrint(row.wo_code)"
/>
</el-tooltip>
@@ -322,7 +345,7 @@
class="el-icon-view"
style="cursor: pointer;"
:style="{color:$store.state.settings.theme}"
- @click="edit('view',row)"
+ @click.stop="edit('view',row)"
/>
</el-tooltip>
@@ -397,6 +420,11 @@
width="150"
/>
<el-table-column
+ label="宸ュ簭鍗曚环"
+ show-tooltip-when-overflow
+ prop="stepprice"
+ />
+ <el-table-column
label="宸茬敓浜ф暟閲�"
show-tooltip-when-overflow
prop="produceq_qty"
@@ -460,7 +488,7 @@
<!--鏂板娲惧彂瀵硅瘽妗�-->
<el-dialog
v-el-drag-dialog
- :title="operation==='add'?'鏂板':'娲惧彂'"
+ :title="operation==='add'?'鏂板':'淇敼'"
:visible.sync="dialogVisible"
width="1200px"
top="8vh"
@@ -627,6 +655,7 @@
placeholder="璇烽�夋嫨鐩稿搴斿伐搴�"
@change="stepSelectedValueChange"
>
+ <!-- :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
<el-option
v-for="item in stepSelectArr"
:key="item.stepcode"
@@ -713,7 +742,7 @@
<el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">棰勮</el-button>-->
<el-button
- v-if="operation!=='view'"
+ v-if="operation!=='view'&&(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"
v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
@@ -876,24 +905,40 @@
<!-- size="mini"-->
<!-- />-->
<!-- </el-form-item>-->
- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">
+ <!-- <el-form-item label="宸ュ崟鐘舵��" style=" display: flex;">-->
+ <!-- <el-select-->
+ <!-- v-model="sourceForm.mesordercode"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in erporderstusArr"-->
+ <!-- :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="sourceForm.mesordercode"
+ v-model="sourceForm.wkshopcode"
filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in erporderstusArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
+ v-for="item in wkshopcodeArr"
+ :key="item.torg_code"
+ :label="item.torg_name"
+ :value="item.torg_code"
/>
</el-select>
</el-form-item>
<el-form-item label="宸ュ崟缂栧彿" style=" display: flex;">
- <el-input v-model="sourceForm.sourceorder" placeholder="璇疯緭鍏�" style="width: 200px" />
+ <el-input v-model="sourceForm.mesordercode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="sourceForm.partcode" style="width: 200px" placeholder="璇疯緭鍏�" />
@@ -902,9 +947,9 @@
<el-form-item v-show="isExpandDialog" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="sourceForm.partname" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">
- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
+ <!-- <el-form-item v-show="isExpandDialog" label="浜у搧瑙勬牸" style=" display: flex;">-->
+ <!-- <el-input v-model="sourceForm.partspec" style="width: 200px" placeholder="璇疯緭鍏�" />-->
+ <!-- </el-form-item>-->
<el-form-item v-show="isExpandDialog" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="sourceForm.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
@@ -960,10 +1005,10 @@
<div class="elTableDiv">
<el-table
:data="sourceTableData"
- :height="isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px'"
+ :height="isExpandDialog?(tableHeight+100)+'px':(tableHeight+140)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:isExpandDialog?(tableHeight+60)+'px':(tableHeight+140)+'px',}"
+ :style="{width: 100+'%',height:isExpandDialog?(tableHeight+100)+'px':(tableHeight+140)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -988,7 +1033,7 @@
</template>
</el-table-column>
<el-table-column
- prop="RowNum"
+ prop="rowNum"
width="50"
fixed
label="搴忓彿"
@@ -1054,8 +1099,15 @@
/>
<el-table-column
- prop="bad_qty"
- label="鎶ュ簾鏁伴噺"
+ prop="laborbad_qty"
+ label="宸ュ簾鏁伴噺"
+ width="150"
+ show-tooltip-when-overflow
+ sortable="custom"
+ />
+ <el-table-column
+ prop="materielbad_qty"
+ label="鏂欏簾鏁伴噺"
width="150"
show-tooltip-when-overflow
sortable="custom"
@@ -1080,30 +1132,30 @@
<div v-else>/</div>
</template>
</el-table-column>
- <el-table-column
- prop="plan_startdate"
- label="棰勮寮�宸ユ椂闂�"
- show-tooltip-when-overflow
- sortable="custom"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="plan_enddate"
- label="棰勮瀹屽伐鏃堕棿"
- show-tooltip-when-overflow
- sortable="custom"
- width="130"
- >
- <template slot-scope="{row}">
- <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="plan_startdate"-->
+ <!-- label="棰勮寮�宸ユ椂闂�"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.plan_startdate">{{ row.plan_startdate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- prop="plan_enddate"-->
+ <!-- label="棰勮瀹屽伐鏃堕棿"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- sortable="custom"-->
+ <!-- width="130"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.plan_enddate">{{ row.plan_enddate.substring(0, 11) }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -1209,11 +1261,12 @@
<el-form-item label="宸ュ崟鏁伴噺:" class="formContent">
{{ formApprove.plan_qty }}
</el-form-item>
- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">
- {{ formApprove.routename }}
- </el-form-item>
+ <!-- <el-form-item label="宸ヨ壓璺嚎:" class="formContent">-->
+ <!-- {{ formApprove.routename }}-->
+ <!-- </el-form-item>-->
<el-form-item label="鎵撳嵃浜哄憳:" class="formContent">
- {{ username }}
+ <!-- {{ localStorage.getItem('username') }}-->
+ {{ formApprove.routename }}
</el-form-item>
<el-form-item label="鎵撳嵃鏃堕棿:" class="formContent">
{{ formApprove.lm_date }}
@@ -1920,9 +1973,10 @@
UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
-import { PrentOrganization, StepData } from '@/api/GeneralBasicData'
+import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
-import ElDragSelect from '@/components/DragSelect' // base on element-ui
+import ElDragSelect from '@/components/DragSelect'
+import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
export default {
name: 'WorkOrderList',
@@ -1940,6 +1994,7 @@
tableHeight: 0,
username: '',
form: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
mesorderstus: '', // 宸ュ崟鐘舵�佺爜
mesordercode: '', // 宸ュ崟缂栧彿
partcode: '', // 浜у搧缂栫爜
@@ -1961,10 +2016,11 @@
// { code: 'CREATED', name: '宸插叧闂�' }
{ code: 'ALLO', name: '宸叉淳鍙�' },
{ code: 'START', name: '寮�宸�' },
- { code: 'CLOSED', name: '瀹屽伐' },
- { code: 'NOSCHED', name: '寰呮帓绋�' },
- { code: 'SCHED', name: '宸叉帓绋�' }
+ { code: 'CLOSED', name: '瀹屽伐' }
+ // { code: 'NOSCHED', name: '寰呮帓绋�' },
+ // { code: 'SCHED', name: '宸叉帓绋�' }
],
+ wkshopcodeArr: [],
total: 10,
tableData: [],
dialogVisible: false,
@@ -1984,7 +2040,9 @@
wkshopname: '', // 鐢熶骇杞﹂棿鍚嶇О
deliverydate: '', // 浜や粯鏃堕棿
- data_sources: '' // 鏁版嵁鏉ユ簮
+ data_sources: '', // 鏁版嵁鏉ユ簮
+
+ mesmaxqty: 0// 宸ュ崟鐨勬渶澶у��
},
ordertypeArr: [// 宸ュ崟绫诲瀷
{ code: 'PO', name: '鏍囧噯宸ュ崟' },
@@ -2109,6 +2167,7 @@
dialogVisibleSource: false,
sourceTableData: [],
sourceForm: {
+ wkshopcode: '', // 杞﹂棿缂栫爜
mesordercode: '', // 宸ュ崟缂栧彿
sourceorder: '', // 璁㈠崟缂栧彿
saleordercode: '', // 閿�鍞鍗曞彿
@@ -2231,8 +2290,13 @@
this.getMesOrderSearch().then(res => {
if (res.code === '200') {
this.getSelect()
+ this.getPrentOrganizationNoCompany()
}
})
+ },
+ async getPrentOrganizationNoCompany() {
+ const { data: res } = await PrentOrganizationNoCompany()
+ this.wkshopcodeArr = res
},
async getMesOrderSearch() {
// let tempDate = this.form.createdate
@@ -2241,6 +2305,7 @@
// }
const data = {
+ wkshopcode: this.form.wkshopcode,
mesorderstus: this.form.mesorderstus, // 宸ュ崟鐘舵�佺爜
mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
@@ -2312,6 +2377,7 @@
// 閲嶇疆
reset(val) {
+ this.form.wkshopcode = ''
this.form.mesorderstus = ''
this.form.mesordercode = ''
this.form.partcode = ''
@@ -2355,15 +2421,14 @@
},
selected(row, index) {
- // && row.isstep === 'Y'
- if (row.status === 'NEW') {
- return true
- } else {
- return false
- }
+ return row.status === 'NEW' && row.isstep === 'Y'
},
// 娲惧彂
send() {
+ if (this.multipleSelection.length === 0) {
+ return this.$message.info('璇峰厛鍕鹃�夌浉瀵瑰簲鐨勫伐鍗曪紒')
+ }
+
this.$confirm('鏄惁纭娲惧彂?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -2372,9 +2437,6 @@
MesOrderDistribution(this.multipleSelection).then(res => {
if (res.code === '200') {
this.$notify.success('娲惧彂鎴愬姛!')
- if (this.form.page > 1 && this.tableData.length === 1) {
- this.form.page--
- }
this.getMesOrderSearch()
}
})
@@ -2427,6 +2489,7 @@
this.dialogForm.partspec = row.partspec
this.dialogForm.wkshopcode = row.wkshp_code
this.dialogForm.deliverydate = row.saleOrderDeliveryDate.substring(0, 11)
+ this.dialogForm.mesqty = row.plan_qty
const data = {
sourceid: this.dialogForm.sourceorderid,
@@ -2435,7 +2498,8 @@
data_sources: this.dialogForm.data_sources
}
const { data: res } = await UpdateMesOrderStepSearch(data)
- this.dialogForm.mesqty = res.canupdate_qty
+ this.dialogForm.mesmaxqty = res.canupdate_qty
+
res.stepdata.forEach(i => {
this.stepTableData.push(
{
@@ -2496,6 +2560,10 @@
return this.$message.info('婧愬崟鍗曞彿涓嶈兘涓虹┖锛�')
}
+ if (this.dialogForm.data_sources === 'ERP' && this.dialogForm.mesmaxqty < this.dialogForm.mesqty) {
+ return this.$message.info('姝ゅ伐鍗曠殑鏈�澶т慨鏀规暟鍊间负锛�' + this.dialogForm.mesmaxqty)
+ }
+
const workListSub = []
this.stepTableData.forEach((i, j) => {
workListSub.push(
@@ -2508,6 +2576,10 @@
}
)
})
+
+ if (workListSub.length === 0) {
+ return this.$message.info('宸ュ簭涓嶈兘涓虹┖锛�')
+ }
const data = {
wostatus: this.dialogForm.mesorderstus, // 宸ュ崟鐘舵��
@@ -2592,21 +2664,20 @@
// console.log(number)
const data2 = {
- username: getCookie('admin'),
mesordercode: wo_code || this.dialogForm.mesordercode
}
- MesOrderPrintSearch1(data2).then(res2 => {
+ MesOrderPrintSearch(data2).then(res2 => {
if (res2.code === '200') {
const res3 = res2.data.recordset
this.tableDataPrint = res3
this.formApprove.mesordercode = res3[0].wo_code
- this.formApprove.m_po = res3[0].m_po
+ this.formApprove.m_po = res3[0].m_po || '/'
this.formApprove.partcode = res3[0].partcode
this.formApprove.partname = res3[0].partname
- this.formApprove.partspec = res3[0].partspec
+ this.formApprove.partspec = res3[0].partspec || '/'
this.formApprove.plan_qty = res3[0].plan_qty
- this.formApprove.routename = res3[0].routename
+ this.formApprove.routename = localStorage.getItem('username') // 鎵撳嵃浜哄憳
this.formApprove.lm_date = res3[0].lm_date
this.$nextTick(() => {
@@ -2805,9 +2876,10 @@
}
const data = {
+ wkshopcode: this.form.wkshopcode, // 杞﹂棿缂栫爜
mesordercode: this.sourceForm.mesordercode, // 宸ュ崟缂栧彿
- sourceorder: this.sourceForm.sourceorder, // 璁㈠崟璁㈠崟鍙�
- saleordercode: this.sourceForm.sourceorder, // 璁㈠崟璁㈠崟鍙�
+ sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞崟鍙�
partcode: this.sourceForm.partcode, // 浜у搧缂栫爜
partname: this.sourceForm.partname, // 浜у搧鍚嶇О
partspec: this.sourceForm.partspec, // 浜у搧瑙勬牸
@@ -2840,6 +2912,7 @@
this.getMesBadOrderSearch()
},
sourceReset() {
+ this.sourceForm.wkshopcode = ''
this.sourceForm.mesordercode = ''
this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
@@ -2854,6 +2927,7 @@
dialogVisibleSourceClose() {
this.radioSelectedId = ''
+ this.sourceForm.wkshopcode = ''
this.sourceForm.mesordercode = ''
this.sourceForm.sourceorder = ''
this.sourceForm.partcode = ''
--
Gitblit v1.9.3