From a7f1016f4cb963be3e67ff8c26bdeae37686b2fc Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 十二月 2023 10:54:44 +0800
Subject: [PATCH] modified: src/views/plan/manufacturingorder/index.vue modified: vue.config.js
---
src/views/plan/manufacturingorder/index.vue | 117 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 25 deletions(-)
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 7ba7935..0b601e1 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -48,7 +48,7 @@
</el-dropdown-menu>
</el-dropdown>
- <el-dropdown
+ <!-- <el-dropdown
v-if="permissions.manufacturingorder_issue_material"
@command="issueMaterialHandleCommand"
style="margin-left:10px;"
@@ -64,8 +64,8 @@
>{{ item.label }}</el-dropdown-item
>
</el-dropdown-menu>
- </el-dropdown>
- <el-button
+ </el-dropdown> -->
+ <!-- <el-button
v-if="permissions.manufacturingorder_orderto_ifs"
@click="commitOrderIfs()"
type="primary"
@@ -88,15 +88,15 @@
style="margin-left:10px;"
:loading="loadingStructIfs"
>鐗╂枡鍚屾ERP
- </el-button>
- <el-button
+ </el-button> -->
+ <!-- <el-button
v-if="permissions.manufacturingorder_refresh_ifsorder"
@click="refreshIfsorder()"
type="primary"
style="margin-left:10px;"
:loading="refreshIfsorderLoading"
>鍒锋柊ifs杞﹂棿璁㈠崟鍙�
- </el-button>
+ </el-button> -->
<el-button
@click="exportExcel"
@@ -106,12 +106,18 @@
>瀵煎嚭
</el-button>
<el-button
+ @click="labelPrint"
+ type="primary"
+ style="margin-left:10px;"
+ >鎵撳嵃鏍囩
+ </el-button>
+ <!-- <el-button
v-if="permissions.manufacturingorder_update_orderno"
@click="updateOrderNo"
type="primary"
style="margin-left:10px;"
>鏇存柊璁㈠崟鍙�
- </el-button>
+ </el-button>-->
</template>
</ttable>
<customerorder
@@ -189,6 +195,37 @@
</div>
</span>
</el-dialog>
+ <!-- 鏍囩鎵撳嵃 -->
+ <el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="30%">
+ <div class="dia_body" style="height: 400px;overflow-y: auto;padding: 0 10px;">
+ <el-card class="box-card" v-for="(tem, i) in orderDatalist" :key="i" style="margin-bottom: 15px;">
+ <!-- <el-row>
+ <el-col :span="10" :offset="3">搴忓彿锛�</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
+ </el-row> -->
+ <!-- <el-row>
+ <el-col :span="10" :offset="3">瀹㈡埛璁㈠崟鍙凤細</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ tem.customerOrderNo }}</el-col>
+ </el-row> -->
+ <el-row style="font-size: 18px;">
+ <!-- <el-col :span="10" :offset="3">闆朵欢鍚嶇О锛�</el-col> -->
+ <el-col :span="10" :offset="6" style="font-weight: bold;" >{{ tem.partNo }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" style="padding-left: 20px;">
+ <vueQr :text="tem.moNo" :size="150" :margin="1"></vueQr>
+ </el-col>
+ <el-col :span="10" :offset="3" style="font-weight: bold;" >鎵规鍙�: {{ tem.moNo }}</el-col>
+ <!-- <el-col :span="10" :offset="4" style="font-weight: bold;" ></el-col> -->
+ <!-- <el-col :span="10" :offset="4" style="font-weight: bold;" >{{ tem.partName }}</el-col> -->
+ </el-row>
+ </el-card>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="diaPrintTab = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="diaPrintTab = false">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</basic-container>
</div>
</template>
@@ -218,9 +255,12 @@
import DelMatUnIssueVue from './DelMatUnIssue.vue'
import { getStore } from '@/util/store.js'
import { getObj as getSysParam } from '@/api/admin/sys-public-param'
+import vueQr from 'vue-qr'
export default {
data() {
return {
+ orderDatalist:[],
+ diaPrintTab:false,
showCustomerorder: false,
paramObj: { customerList: null },
customerOrder: null,
@@ -324,7 +364,7 @@
sort: true,
isTrue: true,
formatter: this.formatState,
- propVal: '01planned',
+ propVal: '',
isSearch: true,
searchInfoType: 'select',
optList: () => {
@@ -428,8 +468,8 @@
},
{
minWidth: '120',
- prop: 'orderRemark',
- label: '閿�鍞鍗曞娉�',
+ prop: 'remark',
+ label: '澶囨敞',
sort: true,
isTrue: true,
isSearch: true,
@@ -823,14 +863,7 @@
}
],
toolbar: [],
- operator: [
- {
- text: '鏌ョ湅搴撳瓨',
- type: 'text',
- size: 'small',
- fun: this.searchStock
- }
- ],
+ operator: null,
operatorConfig: {
fixed: 'right',
label: '鎿嶄綔',
@@ -902,7 +935,8 @@
AutoOperationtask,
IssueMaterialForm,
OrderMergeForm,
- DelMatUnIssueVue
+ DelMatUnIssueVue,
+ vueQr
},
created() {
this.getManufactureAttrs()
@@ -934,12 +968,12 @@
fun: this.getOperationTaskByCustomer
})
}
- if (this.permissions.manufacturingorder_order_merge) {
- this.table.toolbar.push({
- text: '璁㈠崟鍚堝苟',
- fun: this.openOrderMerge
- })
- }
+ // if (this.permissions.manufacturingorder_order_merge) {
+ // this.table.toolbar.push({
+ // text: '璁㈠崟鍚堝苟',
+ // fun: this.openOrderMerge
+ // })
+ // }
/**
* {
@@ -1130,6 +1164,7 @@
getByMoIds([this.orderPlan.id]).then((repsonse) => {
const resData = repsonse.data.data
const resCode = repsonse.data.code
+ console.log("resData-----",repsonse);
if (resCode === 0) {
const _that = this
for (const key in resData) {
@@ -1363,6 +1398,26 @@
},
// table鑷甫浜嬩欢
handleSelectionChange(val) {
+ console.log(val,"涓�琛�");
+ let orderData = []
+ orderData =val.map( el =>{
+ return{
+ moNo:el.moNo,
+ workShop:el.workShop,
+ operationNames:el.operationNames,
+ customerOrderNo:el.customerOrderNo,
+ customerName:el.customerName,
+ mpsNo:el.mpsNo,
+ remark:el.remark,
+ partNo:el.partNo,
+ partName:el.partName,
+ unit:el.unit,
+ requiredDate:el.requiredDate,
+ id:el.id,
+ }
+ })
+ this.orderDatalist = orderData
+ console.log(orderData,"浜岀淮鐮侀渶瑕佺殑");
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
var stateArr = val.map(function(value, index) {
@@ -1654,7 +1709,19 @@
} else {
this.$message.error('涓婁紶澶辫触')
}
+ },
+ labelPrint(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ this.diaPrintTab = true
}
}
}
</script>
+<style lang="scss">
+.gantt-info {
+ display: none !important;
+}
+</style>
--
Gitblit v1.9.3