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 | 118 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 46 deletions(-)
diff --git a/src/views/produceManager/workOrder.vue b/src/views/produceManager/workOrder.vue
index fa235ca..def635c 100644
--- a/src/views/produceManager/workOrder.vue
+++ b/src/views/produceManager/workOrder.vue
@@ -176,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
@@ -224,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="浜у搧缂栫爜"
@@ -467,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>
@@ -1403,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>
@@ -2007,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'
@@ -2056,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: '',
@@ -2159,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 // 鍔ㄦ�佽缃〉鐪�
}
},
@@ -2192,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: {
@@ -2444,7 +2458,7 @@
}
},
// 鐢熶骇杞﹂棿鍊兼敼鍙樻椂
- async wkshopcodeChange(wkshopcode, partcode) {
+ async wkshopcodeChange(wkshopcode, partcode) {
const data = {
partcode,
wkshopcode
@@ -2567,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('鏄惁纭鍏抽棴宸ュ崟?', '鎻愮ず', {
@@ -2842,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
@@ -3128,7 +3151,10 @@
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