From 7eeeadfd5a4c13923db680b99a4a23339a214da4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 十二月 2023 17:28:52 +0800
Subject: [PATCH] modified: src/page/index/logo.vue modified: src/views/equipment/equipment/index.vue modified: src/views/plan/customerorder/sample-customerorder-form.vue modified: src/views/plan/manufacturingorder/index.vue modified: src/views/quality/Packaging_ledger/index.vue
---
src/views/equipment/equipment/index.vue | 1
src/views/plan/manufacturingorder/index.vue | 174 +++++++++++++++++++++++++++++--------------
src/views/plan/customerorder/sample-customerorder-form.vue | 2
src/views/quality/Packaging_ledger/index.vue | 3
src/page/index/logo.vue | 4
5 files changed, 122 insertions(+), 62 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index c9c78f0..8e02347 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -120,7 +120,7 @@
width: 220px;
height: 64px;
line-height: 64px;
- background-color: #006eff;
+ background-color: #875a7b;
font-size: 20px;
overflow: hidden;
box-sizing: border-box;
@@ -151,7 +151,7 @@
width: 220px;
height: 64px;
line-height: 64px;
- background-color: #006eff;
+ background-color: #875a7b;
font-size: 20px;
overflow: hidden;
box-sizing: border-box;
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 3d83470..f19e542 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -343,7 +343,6 @@
},
handleSelectionChange(val) {
this.multipleSelection = val
- console.log(this.multipleSelection);
},
// 鏂板 / 淇敼
addOrUpdateHandle(row) {
diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index b1d326d..8a89e4c 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -68,7 +68,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="salesMan">
- <el-select @change="selsctionSales" filterable v-model="salesSelectData" style="width:100%">
+ <el-select @change="selsctionSales" clearable filterable v-model="salesSelectData" style="width:100%">
<el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staffNo+','+item.staffName" :label="item.staffName"/>
</el-select>
</el-form-item>
diff --git a/src/views/plan/manufacturingorder/index.vue b/src/views/plan/manufacturingorder/index.vue
index 0966fcf..f1276ae 100644
--- a/src/views/plan/manufacturingorder/index.vue
+++ b/src/views/plan/manufacturingorder/index.vue
@@ -22,8 +22,9 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="index"
:command="item.command"
- v-for="item in taskTypeArr"
+ v-for="(item,index) in taskTypeArr"
:disabled="canCreateTask"
>{{ item.label }}</el-dropdown-item
>
@@ -40,8 +41,9 @@
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item
+ :key="i"
:command="item.command"
- v-for="item in stateTagArr"
+ v-for="(item,i) in stateTagArr"
:disabled="item.disabled"
>{{ item.label }}</el-dropdown-item
>
@@ -199,23 +201,31 @@
<!-- 鏍囩鎵撳嵃 -->
<el-dialog title="鏍囩鍒楄〃" :visible.sync="diaPrintTab" width="500px" top="5vh">
<div style="width:100%;height: 400px;overflow-y: auto;">
- <div class="dia_body" id="printMOrder">
- <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
- <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;">{{ item.moNo2 }}</el-col>
- </el-row>
- <el-row>
- <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
- <el-col :span="10">
- <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
- </el-col>
- </el-row>
+ <div class="dia_body">
+ <el-checkbox
+ style="margin: 10px 5px;"
+ :indeterminate="isIndeterminate"
+ v-model="checkAll"
+ @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+ <el-checkbox-group @change="changePrintCode()" v-model="checkIndexList">
+ <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 15px; font-size: 16px !important;">
+ <el-checkbox :label="i" :key="i" style="position: relative;top:-20px;left:5px"><br></el-checkbox>
+ <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;">{{ item.moNo2 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item)" :size="80" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
</el-card>
+ </el-checkbox-group>
</div>
</div>
<span slot="footer" class="dialog-footer">
@@ -223,6 +233,26 @@
<el-button type="primary" @click="printFun">鎵� 鍗�</el-button>
</span>
</el-dialog>
+ <div class="el-dialog__body" style="width:448.8px;overflow-y: auto;position: absolute;top:9999px;padding: 0;">
+ <div id="printMOrder">
+ <el-card class="box-card" v-for="(item, i) in checkDataList" :key="i" style="margin-bottom:10px;font-size: 16px !important;">
+ <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;">{{ item.moNo2 }}</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="10" :offset="3">璁㈠崟浜岀淮鐮侊細</el-col>
+ <el-col :span="10">
+ <vueQr :text="JSON.stringify(item)" :size="110" :margin="2"></vueQr>
+ </el-col>
+ </el-row>
+ </el-card>
+ </div>
+ </div>
</div>
</template>
@@ -256,9 +286,11 @@
export default {
data() {
return {
- checkList: [],
+ checkAll: false,
+ isIndeterminate: true,
+ checkDataList: [],
+ checkIndexList: [],
qrData: [],
- orderDatalist:[],
diaPrintTab:false,
showCustomerorder: false,
paramObj: { customerList: null },
@@ -1054,8 +1086,45 @@
mounted() {
// this.initQueryParams()
},
+ watch:{
+ diaPrintTab(newVal){
+ if(!newVal){
+ this.qrData = []
+ this.checkIndexList = []
+ this.checkDataList = []
+ this.isIndeterminate = true;
+ }
+ }
+ },
methods: {
+ //鍏ㄩ��
+ handleCheckAllChange(val) {
+ if(val){
+ for(var i=0;i<this.qrData.length;i++){
+ this.checkIndexList.push(i)
+ }
+ this.checkDataList = this.qrData
+ }else{
+ this.checkIndexList = []
+ this.checkDataList = []
+ }
+ this.isIndeterminate = false;
+ },
+ //閫夋嫨瑕佹墦鍗扮殑浜岀淮鐮�
+ changePrintCode(){
+ let indexList = this.checkIndexList
+ let arr = []
+ indexList.forEach(i=>{
+ arr.push(this.qrData[i])
+ })
+ this.checkDataList = arr
+ },
+ //鎵撳嵃鏂规硶
printFun() {
+ if(this.checkDataList.length < 1){
+ this.$message.warning("璇烽�夋嫨瑕佹墦鍗扮殑浜岀淮鐮�")
+ return
+ }
this.diaPrintTab = false;
PrintJS({
printable: 'printMOrder',//椤甸潰
@@ -1078,6 +1147,35 @@
targetStyles: ["*"], // 浣跨敤dom鐨勬墍鏈夋牱寮忥紝寰堥噸瑕�
font_size: '',
});
+ },
+ //鍒濆鍖栦簩缁寸爜鏍囩鏁版嵁
+ initQrData(data){
+ this.qrData = []
+ if(data){
+ let index = Number(data.qtyRequired) + Number(data.scrapQty)
+ if(index>0){
+ for(var i=1;i<= index;i++){
+ let obj = {
+ moNo: data.moNo,
+ moNo2: null,
+ }
+ let no = (i+"").padStart(3,'0')
+ obj.moNo2 = data.moNo + no
+ this.qrData.push(obj)
+ }
+ }
+ }
+ },
+ //鏍囩鎵撳嵃鎸夐挳
+ labelPrint(){
+ if(this.multipleSelection.length==0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ return
+ }
+ let selection = this.multipleSelection
+ let lastRow = selection[ selection.length - 1 ]
+ this.initQrData(lastRow)
+ this.diaPrintTab = true
},
getManufactureAttr(row, column, cellValue) {
this.manufactureAttrs.forEach((obj) => {
@@ -1195,7 +1293,6 @@
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) {
@@ -1427,36 +1524,8 @@
}
}
},
- //鍒濆鍖栦簩缁寸爜鏍囩鏁版嵁
- initQrData(data){
- if(data){
- let index = Number(data.qtyRequired) + Number(data.scrapQty)
- if(index>0){
- for(var i=1;i<= index;i++){
- let obj = {
- moNo: data.moNo,
- moNo2: null,
- }
- let no = (i+"").padStart(3,'0')
- obj.moNo2 = data.moNo + no
- this.qrData.push(obj)
- }
- }
- }
- },
// table鑷甫浜嬩欢
handleSelectionChange(val) {
- console.log(val,"涓�琛�");
- let orderData = []
- orderData =val.map( el =>{
- return{
- moNo:el.moNo,
- qtyRequired: el.qtyRequired,
- scrapQty: el.scrapQty
- }
- })
- this.orderDatalist = orderData
- this.initQrData(orderData[0])
// 鏍规嵁鐘舵�侊紝绂佺敤琛ㄥご鎸夐挳
// 绛涢�夊嚭閫変腑璁板綍鐨勭姸鎬�
var stateArr = val.map(function(value, index) {
@@ -1749,13 +1818,6 @@
this.$message.error('涓婁紶澶辫触')
}
},
- labelPrint(){
- if(this.multipleSelection.length==0){
- this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
- return
- }
- this.diaPrintTab = true
- }
}
}
</script>
diff --git a/src/views/quality/Packaging_ledger/index.vue b/src/views/quality/Packaging_ledger/index.vue
index 4852053..542ea79 100644
--- a/src/views/quality/Packaging_ledger/index.vue
+++ b/src/views/quality/Packaging_ledger/index.vue
@@ -140,7 +140,7 @@
<el-col :span="10" style="font-weight: bold;">{{ item.packageNo }}</el-col>
</el-row>
<el-row>
- <el-col :span="10" :offset="3">浜岀淮鐮侊細</el-col>
+ <el-col :span="10" :offset="3">鍖呰鍙拌处浜岀淮鐮侊細</el-col>
<el-col :span="10">
<vueQr :text="JSON.stringify(item)" :size="110" :margin="1"></vueQr>
</el-col>
@@ -349,7 +349,6 @@
return
}
this.diaPrintTab = true
- console.log(this.multipleSelection);
this.multipleSelection.forEach(item=>{
let obj = {
packageNo: item.packageNo,
--
Gitblit v1.9.3