From facfd6f11cb9023f88da4d02a87305b564dabd6f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 02 四月 2024 10:10:25 +0800
Subject: [PATCH] 1.看板文字微调
---
src/views/produceManager/workOrder.vue | 334 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 200 insertions(+), 134 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index 31e11ab..def635c 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -43,7 +43,10 @@
<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 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;">
<el-select
v-model="form.ordertype"
:popper-append-to-body="false"
@@ -173,8 +176,8 @@
<div v-if="row.status==='ALLO'">宸叉淳鍙�</div>
<div v-if="row.status==='START'">寮�宸�</div>
<div v-if="row.status==='CLOSED'">瀹屽伐</div>
- <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>
- <div v-if="row.status==='SCHED'">宸叉帓绋�</div>
+ <!-- <div v-if="row.status==='NOSCHED'">寰呮帓绋�</div>-->
+ <!-- <div v-if="row.status==='SCHED'">宸叉帓绋�</div>-->
</template>
</el-table-column>
<el-table-column
@@ -197,6 +200,18 @@
</template>
</el-table-column>
<el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞鍗�"
+ sortable="custom"
+ show-tooltip-when-overflow
+ min-width="160"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="wotype"
label="鍗曟嵁绫诲瀷"
sortable="custom"
@@ -209,6 +224,13 @@
<div v-else>/</div>
</template>
</el-table-column>
+ <el-table-column
+ prop="printcount"
+ label="鎵撳嵃娆℃暟"
+ show-tooltip-when-overflow
+ sortable="custom"
+ min-width="120"
+ />
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
@@ -345,7 +367,7 @@
:style="{color:$store.state.settings.theme}"
class="el-icon-printer"
style="cursor: pointer;margin-right: 15px"
- @click="handlePrint(row.wo_code)"
+ @click="handlePrint(row.wo_code,row.saleOrderCode)"
/>
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
@@ -452,34 +474,34 @@
show-tooltip-when-overflow
prop="ng_qty"
/>
- <el-table-column
- label="鎿嶄綔"
- width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">
- <i
- v-if="tableDataDetail.length!==row.seq"
- class="el-icon-printer"
- :style="{color:$store.state.settings.theme}"
- style="cursor: pointer;margin-right: 15px"
- @click="supplementSmallClick(row)"
- />
- </el-tooltip>
- <el-tooltip class="item" effect="dark" content="琛ユ墦鐢熶骇鍏ュ簱鏉＄爜" placement="top">
- <i
- v-if="tableDataDetail.length===row.seq"
- class=" el-icon-camera"
- :style="{color:$store.state.settings.theme}"
- style="cursor: pointer;margin-right: 15px"
- @click="getProductInHouseLabCode(row.wo_code)"
- />
- </el-tooltip>
- </div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- label="鎿嶄綔"-->
+ <!-- width="120"-->
+ <!-- fixed="right"-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div class="operationClass">-->
+ <!-- <el-tooltip class="item" effect="dark" content="鎵撳嵃宸ュ簭" placement="top">-->
+ <!-- <i-->
+ <!-- v-if="tableDataDetail.length!==row.seq"-->
+ <!-- class="el-icon-printer"-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- style="cursor: pointer;margin-right: 15px"-->
+ <!-- @click="supplementSmallClick(row)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
+ <!-- <el-tooltip class="item" effect="dark" content="琛ユ墦鐢熶骇鍏ュ簱鏉＄爜" placement="top">-->
+ <!-- <i-->
+ <!-- v-if="tableDataDetail.length===row.seq"-->
+ <!-- class=" el-icon-camera"-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- style="cursor: pointer;margin-right: 15px"-->
+ <!-- @click="getProductInHouseLabCode(row.wo_code)"-->
+ <!-- />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
</el-table>
</div>
</div>
@@ -647,80 +669,80 @@
/>
</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>
- <el-radio key="N" label="N" value="N">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">
- <el-select
- v-model="dialogForm.bomId"
- filterable
- :disabled="dialogForm.isAps==='N'"
- :popper-append-to-body="false"
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in bomIdArr"
- :key="item.id"
- :label="item.version"
- :value="item.id"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">
- <el-date-picker
- v-model="dialogForm.planstartdate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- :picker-options="pickerOptions"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
+ <el-form-item label="宸ヤ环绠℃帶" required>
+ <el-switch
+ v-model="dialogForm.is_steprice"
+ active-color="#13ce66"
+ inactive-color="#eee"
+ @change="routecodeChange"
/>
</el-form-item>
- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">
- <el-date-picker
- v-model="dialogForm.planenddate"
- type="date"
- :clearable="false"
- value-format="yyyy-MM-dd"
- style="width: 200px"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="pickerOptions"
- />
- </el-form-item>
- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">
- <el-select
- v-model="dialogForm.orderlev"
- filterable
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in orderlevArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
+ <!-- <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>-->
+ <!-- <el-radio key="N" label="N" value="N">鍚�</el-radio>-->
+ <!-- </el-radio-group>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鐗╂枡娓呭崟" :prop="dialogForm.isAps==='Y'?'bomId':''">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.bomId"-->
+ <!-- filterable-->
+ <!-- :disabled="dialogForm.isAps==='N'"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in bomIdArr"-->
+ <!-- :key="item.id"-->
+ <!-- :label="item.version"-->
+ <!-- :value="item.id"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝寮�濮嬫椂闂�" prop="planstartdate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planstartdate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="璁″垝瀹屾垚鏃堕棿" prop="planenddate">-->
+ <!-- <el-date-picker-->
+ <!-- v-model="dialogForm.planenddate"-->
+ <!-- type="date"-->
+ <!-- :clearable="false"-->
+ <!-- value-format="yyyy-MM-dd"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="閫夋嫨鏃ユ湡"-->
+ <!-- :picker-options="pickerOptions"-->
+ <!-- />-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="宸ュ崟绛夌骇" prop="orderlev">-->
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.orderlev"-->
+ <!-- filterable-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in orderlevArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </el-form-item>-->
</el-form>
+ <div style="display: flex;justify-content: flex-end;margin-top: -50px;">
+ {{ routeStepArr }}
+ </div>
<!-- 宸ヨ壓璺嚎鏀惧ぇ闀滃璇濇-->
<el-dialog
@@ -1269,11 +1291,14 @@
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
- {{ formApprove.mesordercode }}
+ <el-form-item label="閿�鍞崟鍙�:" class="formContent">
+ {{ formApprove.saleOrderCode }}
</el-form-item>
<el-form-item label="婧愬崟鍗曞彿:" class="formContent">
{{ formApprove.m_po }}
+ </el-form-item>
+ <el-form-item label="宸ュ崟缂栧彿:" class="formContent">
+ {{ formApprove.mesordercode }}
</el-form-item>
<el-form-item label="浜у搧缂栫爜:" class="formContent">
{{ formApprove.partcode }}
@@ -1385,7 +1410,7 @@
<el-button v-waves @click="dialogVisibleBackPreview">杩� 鍥�</el-button>
<!-- <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>-->
<!-- <el-button v-waves type="primary" @click="dialogVisibleConfirm">纭� 瀹�/鎵� 鍗�</el-button>-->
- <el-button v-waves v-print="printObj" type="primary">鎵� 鍗�</el-button>
+ <el-button v-waves v-print="printObj" type="primary" @click="printObjGetApi">鎵� 鍗�</el-button>
</div>
</span>
</el-dialog>
@@ -1989,7 +2014,7 @@
ClosedMesOrder,
DeleteMesOrder, MesBadOrderSearch, JobCreationSonAddVison,
MesOrderSearch, PartSelectRoute, RouteSelectWkshop, SearchWorkStep, SelectRouteOrWkshop,
- SelectRouteStep, AddMesOrderCodeSearch, ProductInHouseLabCode
+ SelectRouteStep, AddMesOrderCodeSearch, ProductInHouseLabCode, UpdateMesOrderPrintCount
} from '@/api/produceManager'
import { InventoryFileAssociationRoute, PartSelect, SaveInventoryFile } from '@/api/makeModel'
import { handleDatetime, handleDatetime2, validateCode } from '@/utils/global'
@@ -2022,6 +2047,7 @@
partcode: '', // 浜у搧缂栫爜
ordertype: '', // ordertype
sourceorder: '', // 婧愬崟鍗曞彿
+ saleordercode: '', // 閿�鍞鍗�
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
creatuser: '', // 鍒涘缓浜哄憳
@@ -2037,9 +2063,9 @@
// { 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: '宸叉帓绋�' }
],
total: 10,
radioSelected: '',
@@ -2060,6 +2086,9 @@
mesqty: '', // 宸ュ崟鏁伴噺
routecode: '', // 宸ヨ壓璺嚎缂栫爜
+
+ is_steprice: false, // 鏄惁宸ヤ环绠＄悊
+
wkshopcode: '', // 鐢熶骇杞﹂棿缂栫爜
planstartdate: '', // 璁″垝寮�濮嬫椂闂�
planenddate: '', // 璁″垝瀹屾垚鏃堕棿
@@ -2137,12 +2166,15 @@
},
beforeOpenCallback(vue) {
vue.printLoading = true
- console.log('鎵撳紑涔嬪墠')
- console.log()
+ console.log('鎵撳紑涔嬪墠8888')
},
openCallback(vue) {
vue.printLoading = false
- console.log('鎵ц浜嗘墦鍗�')
+ console.log('鎵ц浜嗘墦鍗�9999')
+ },
+ clickMounted(vue) {
+ console.log('鐐瑰嚮浜嗘墦鍗版寜閽�1223451')
+ // vue.printContent.popTitle = vue.tableHead // 鍔ㄦ�佽缃〉鐪�
}
},
@@ -2170,13 +2202,17 @@
// vue.dialogVisible = false
},
beforeOpenCallback(vue) {
+ // window.print()
vue.printLoading = true
- console.log('鎵撳紑涔嬪墠')
- console.log()
+ console.log('鎵撳紑涔嬪墠000')
},
openCallback(vue) {
vue.printLoading = false
- console.log('鎵ц浜嗘墦鍗�')
+ console.log('鎵ц浜嗘墦鍗癳ee')
+ },
+ clickMounted(vue) {
+ console.log('鐐瑰嚮浜嗘墦鍗版寜閽�1111')
+ // vue.printContent.popTitle = vue.tableHead // 鍔ㄦ�佽缃〉鐪�
}
},
qrForm: {
@@ -2242,7 +2278,9 @@
lastPrintArr: [], // 鏈亾鎵撳嵃鐨勬暟缁�(鎵�鏈�)
lastPrintArrSelected: [], // 鏈亾鎵撳嵃鐨勬暟缁�(閫変腑)
- switchButton: false
+ switchButton: false,
+
+ routeStepArr: ''
}
},
created() {
@@ -2280,6 +2318,7 @@
partspec: this.form.partspec, // 浜у搧瑙勬牸
creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
sourceorder: this.form.sourceorder, // 婧愬崟鍗曞彿
+ saleordercode: this.form.saleordercode, // 閿�鍞鍗�
ordertype: this.form.ordertype, // 鍗曟嵁绫诲瀷
createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
prop: this.form.prop, // 鎺掑簭瀛楁
@@ -2343,6 +2382,7 @@
this.form.paydate = ''
this.form.creatuser = ''
this.form.sourceorder = ''
+ this.form.saleordercode = ''
this.form.creatuser = ''
this.form.ordertype = ''
this.getMesOrderSearch()
@@ -2395,21 +2435,30 @@
},
// 宸ヨ壓璺嚎鍊兼敼鍙�
async routecodeChange() {
- const data = {
- partcode: this.dialogForm.partcode,
- routecode: this.dialogForm.routecode,
- wkshopcode: this.dialogForm.wkshopcode
+ if (this.dialogForm.routecode) {
+ const data = {
+ partcode: this.dialogForm.partcode,
+ routecode: this.dialogForm.routecode,
+ wkshopcode: this.dialogForm.wkshopcode,
+ is_steprice: this.dialogForm.is_steprice ? 'Y' : 'N'
+ }
+ await SelectRouteOrWkshop(data).then((res) => {
+ console.log(res, 1)
+
+ SelectRouteStep({ routecode: this.dialogForm.routecode }).then(res2 => {
+ console.log(res2)
+ this.routeStepArr = res2.data.map(i => i.stepname).join('锛�')
+ })
+
+ this.submitButtonIsDisabled = false
+ }).catch(err => {
+ // console.log(err, 2)
+ this.submitButtonIsDisabled = true
+ })
}
- await SelectRouteOrWkshop(data).then((res) => {
- // console.log(res, 1)
- this.submitButtonIsDisabled = false
- }).catch(err => {
- // console.log(err, 2)
- this.submitButtonIsDisabled = true
- })
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
- async wkshopcodeChange(wkshopcode, partcode) {
+ async wkshopcodeChange(wkshopcode, partcode) {
const data = {
partcode,
wkshopcode
@@ -2532,9 +2581,10 @@
console.log('宸ュ崟鍏抽棴浜嬩欢')
this.tableData.forEach(item => {
if (item.wo_code === this.radioSelected) {
- if (item.status === 'START') {
- return this.$message.info('褰撳墠宸ュ崟鏈畬宸ワ紝鏃犳硶鍏抽棴锛�')
- } else if (item.status === 'CLOSED') {
+ // if (item.status === 'START') {
+ // return this.$message.info('褰撳墠宸ュ崟鏈畬宸ワ紝鏃犳硶鍏抽棴锛�')
+ // } else
+ if (item.status === 'CLOSED') {
return this.$message.info('宸ュ崟宸插叧闂紝鏃犻渶鍐嶅叧闂紒')
} else {
this.$confirm('鏄惁纭鍏抽棴宸ュ崟?', '鎻愮ず', {
@@ -2575,6 +2625,7 @@
},
// 瀵硅瘽妗嗗叧闂簨浠�
handleClose() {
+ this.routeStepArr = ''
this.dialogForm.partname = '' // 浜у搧鍚嶇О
this.dialogForm.partspec = '' // 浜у搧瑙勬牸
this.dialogForm.wkshopname = '' // 鐢熶骇杞﹂棿鍚嶇О
@@ -2590,6 +2641,7 @@
this.dialogForm.routecode = '' // 宸ヨ壓璺嚎缂栫爜
this.dialogForm.wkshopcode = '' // 鐢熶骇杞﹂棿缂栫爜
+ this.dialogForm.is_steprice = false// 鏄惁宸ヤ环绠＄悊
this.dialogForm.planstartdate = '' // 璁″垝寮�濮嬫椂闂�
this.dialogForm.planenddate = '' // 璁″垝瀹屾垚鏃堕棿
this.dialogForm.orderlev = '' // 宸ュ崟绛夌骇
@@ -2698,11 +2750,12 @@
this.dialogVisibleSearch = false
},
// 澶勭悊鎵撳嵃
- handlePrint(wo_code) {
+ handlePrint(wo_code, saleOrderCode) {
// const number = Math.random() * Math.random()
// this.number = number === 0 ? (10 + Math.random()) : number
// console.log(number)
-
+ console.log(this.formApprove.saleOrderCode, 321)
+ this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
const data2 = {
username: getCookie('admin'),
mesordercode: wo_code || this.dialogForm.mesordercode
@@ -2790,6 +2843,7 @@
dialogVisibleConfirmClose() {
// this.dialogForm.mesordercode = ''
+ this.formApprove.saleOrderCode = ''
this.formApprove.mesordercode = ''
this.formApprove.m_po = ''
this.formApprove.partcode = ''
@@ -2803,6 +2857,14 @@
this.tableDataPrint = []
},
+
+ async printObjGetApi() {
+ const res = await UpdateMesOrderPrintCount({ wo_code: this.formApprove.mesordercode })
+ if (res.code === '200') {
+ this.getMesOrderSearch()
+ }
+ },
+
// 琛ユ墦鎸夐挳
supplementClick() {
this.dialogVisibleTask = false
@@ -3087,8 +3149,12 @@
},
// 琛岀偣鍑讳簨浠�
async rowClick(row, event, column) {
+ this.formApprove.saleOrderCode = row.saleOrderCode
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')) : '' })
+ 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
},
// 鎵撳嵃宸ュ崟
--
Gitblit v1.9.3