From d76bbaa8a9a70124045dc4c9753e5a868ac4e7d2 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 21 六月 2024 09:33:38 +0800
Subject: [PATCH] -
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 202 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 156 insertions(+), 46 deletions(-)
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 506292e..6d25ebd 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -28,6 +28,14 @@
/>
</el-select>
</el-form-item>
+ <div style="display: none">
+ <div id="printMe" style="width: 500px;">
+ <div ref="canvasWrapper" id="canvasWrapper" style="display: flex;justify-content: center;"></div>
+ <p style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;">{{packCode}}</p>
+ </div>
+ <el-button @click="print">鎵撳嵃</el-button>
+ <el-button @click="test1">鐢熸垚浜岀淮鐮�</el-button>
+ </div>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
@@ -94,15 +102,15 @@
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['om:productionOrde:remove']"
- >鍒犻櫎</el-button>
+<!-- <el-button-->
+<!-- type="danger"-->
+<!-- plain-->
+<!-- icon="el-icon-delete"-->
+<!-- size="mini"-->
+<!-- :disabled="multiple"-->
+<!-- @click="handleDelete"-->
+<!-- v-hasPermi="['om:productionOrde:remove']"-->
+<!-- >鍒犻櫎</el-button>-->
<el-button
type="info"
icon="el-icon-upload2"
@@ -126,9 +134,29 @@
plain
icon="el-icon-download"
size="mini"
- @click="receivingWorkOrders"
+ @click="getWorkOrders"
>鎺ユ敹</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ :disabled="single"
+ @click="patchwork"
+ >琛ユ墦</el-button>
+ </el-col>
+<!-- <el-col :span="1.5">-->
+<!-- <el-button-->
+<!-- type="warning"-->
+<!-- plain-->
+<!-- icon="el-icon-download"-->
+<!-- size="mini"-->
+<!-- :disabled="single"-->
+<!-- @click="jieBang"-->
+<!-- >瑙ｇ粦</el-button>-->
+<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -143,37 +171,39 @@
</el-table-column>
<!-- <el-table-column label="璁㈠崟缂栧彿" width="140" align="center" prop="salesOrderCode">-->
<!-- </el-table-column>-->
+ <el-table-column :show-overflow-tooltip='true' label="pack鐮�" width="220" align="center" prop="productNum">
+ </el-table-column>
+ <el-table-column :show-overflow-tooltip='true' label="灏忚溅鐮�" width="160" align="center" prop="trolleyYard">
+ </el-table-column>
<el-table-column label="浜у搧缂栧彿" width="110" align="center" prop="productCode">
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" width="120" align="center" prop="productName">
</el-table-column>
- <el-table-column label="浜у搧搴忓垪鍙�" width="110" align="center" prop="productNum">
- </el-table-column>
<el-table-column label="浜у搧鍨嬪彿" align="center" prop="productModel">
</el-table-column>
- <el-table-column label="宸ュ崟鐘舵��" width="100" align="center" prop="orderStatus">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
- </template>
- </el-table-column>
+<!-- <el-table-column label="宸ュ崟鐘舵��" width="100" align="center" prop="orderStatus">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<!-- <el-table-column label="宸ュ巶缂栧彿" align="center" prop="siteCode">-->
<!-- </el-table-column>-->
<el-table-column label="宸ョ珯缂栧彿" align="center" prop="stationCode">
</el-table-column>
- <el-table-column label="鎶ュ伐淇℃伅缁撴灉" width="110" align="center" prop="resultText">
- </el-table-column>
- <el-table-column label="鎶ュ伐缁撴灉浠ｇ爜" width="110" align="center" prop="resultCode">
- </el-table-column>
- <el-table-column label="鏄惁鎶ュ伐" width="80" align="center" prop="sfResult">
- </el-table-column>
- <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">
- </el-table-column>
- <el-table-column label="褰撳墠绔欑偣鎶ュ伐鏃堕棿" width="160" align="center" prop="actualEndTime">
- </el-table-column>
- <el-table-column label="鍒涘缓浜�" width="80" align="center" prop="createUser">
- </el-table-column>
- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">
- </el-table-column>
+<!-- <el-table-column label="鎶ュ伐淇℃伅缁撴灉" width="110" align="center" prop="resultText">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鎶ュ伐缁撴灉浠ｇ爜" width="110" align="center" prop="resultCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鏄惁鎶ュ伐" width="80" align="center" prop="sfResult">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="褰撳墠绔欑偣鎶ュ伐鏃堕棿" width="160" align="center" prop="actualEndTime">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="鍒涘缓浜�" width="80" align="center" prop="createUser">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">-->
+<!-- </el-table-column>-->
</el-table>
</el-card>
@@ -266,10 +296,20 @@
import { getToken } from "@/utils/auth";
import { listLineInfo } from "@/api/main/bs/lineInfo/lineInfo";
import { listWorkshop } from "@/api/main/bs/workshop/workshop";
-import { listProductBom } from "@/api/main/bs/ProductBom/ProductBom";
+import {getProductBom, listProductBom} from "@/api/main/bs/ProductBom/ProductBom";
import { listTechnologyRoute} from "@/api/main/bs/technologyRoute/technologyRoute";
import ItemSelect from "@/components/itemSelect/single.vue";
-import { importTemplate, upDownMove, listProductionOrde, getProductionOrde, delProductionOrde, addProductionOrde, updateProductionOrde } from "@/api/main/om/productionOrde/productionOrde";
+import {
+ importTemplate,
+ upDownMove,
+ listProductionOrde,
+ getProductionOrde,
+ delProductionOrde,
+ addProductionOrde,
+ updateProductionOrde,
+ receivingWorkOrders, jieBang
+} from "@/api/main/om/productionOrde/productionOrde";
+import QRCode from "qrcodejs2";
export default {
name: "ProductionOrde",
@@ -279,6 +319,8 @@
},
data() {
return {
+ // packCode: '0RSPB001139E3AE4X0000011',
+ packCode: 'test111',
titleName: '',
options: [],
lineOptions: [],
@@ -370,9 +412,71 @@
this.getList();
this.initWorkshop();
},
+ mounted() {
+ this.test1()
+ },
methods: {
- receivingWorkOrders(){
+ jieBang(row){
+ const id = row.id || this.ids
+ jieBang(id).then(response => {
+ this.getList()
+ this.$modal.msgSuccess("瑙ｇ粦鎴愬姛");
+ });
+ },
+ patchwork(row){
+ const id = row.id || this.ids
+ getProductionOrde(id).then(response => {
+ console.log(response.data)
+ this.packCode = response.data.productNum
+ console.log(this.packCode)
+ this.test1()
+ setTimeout(() => {
+ this.print()
+ },50)
+ });
+ },
+ async getWorkOrders(){
+ await receivingWorkOrders().then(response => {
+ this.getList()
+ this.packCode = response.msg;
+ this.test1()
+ });
+ setTimeout(() => {
+ this.print()
+ },50)
+ },
+ print() {
+ // 鏈〉闈㈢洿鎺ユ墦鍗帮紙鏈塨ug鍗曞瞾鍏堜笉瑕佸垹锛�
+ // let oldStr = window.document.body.innerHTML;
+ // let newStr = document.getElementById('printMe').innerHTML;
+ // document.body.innerHTML = newStr;
+ // window.print();
+ // document.body.innerHTML = oldStr;
+ // return false;
+ // 鏂板紑椤甸潰鎵撳嵃
+ // document.getElementById('canvasWrapper').innerHTML = '';
+ let newStr = document.getElementById('printMe').innerHTML;
+ let newWin = window.open('', '_blank');
+ newWin.document.body.innerHTML = newStr;
+ newWin.print();
+ return false;
+ },
+ test1(){
+ document.getElementById('canvasWrapper').innerHTML = ''
+ this.$nextTick(() => {
+ let qrCode = new QRCode('canvasWrapper',{
+ width: 80,
+ height: 80,
+ padding: 0,
+ margin: 0,
+ text: this.packCode,
+ colorDark: '#000',
+ colorLight: '#fff'
+ })
+ })
+ // console.log(this.packCode)
+ // this.print()
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
@@ -497,7 +601,7 @@
marketAreaCode: null,
softwareVersionCode: null,
productCompanyCode: null,
- spareField1: null,
+ trolleyYard: null,
spareField2: null,
spareField3: null,
spareField4: null,
@@ -521,19 +625,25 @@
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
+ // handleSelectionChange(selection) {
+ // this.ids = selection.map(item => item.id)
+ // this.move = selection.length!==1
+ // if(!selection.length){
+ // this.single = true
+ // this.multiple = true
+ // }else {
+ // if(selection[0].orderStatus === '1' && selection.length === 1){
+ // this.single = false
+ // this.multiple = false
+ // }
+ // }
+ //
+ // },
+ // 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.move = selection.length!==1
- if(!selection.length){
- this.single = true
- this.multiple = true
- }else {
- if(selection[0].orderStatus === '1' && selection.length === 1){
- this.single = false
- this.multiple = false
- }
- }
-
+ this.single = selection.length!==1
+ this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
--
Gitblit v1.9.3