From 30f564f745d03e862446554cb2412c57faa94451 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 19 Aug 2022 09:38:33 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/Home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue
index 67373e6..125f4f5 100644
--- a/src/pages/login/Home.vue
+++ b/src/pages/login/Home.vue
@@ -21,7 +21,7 @@
           <img src="../../images/xinrui/menu/password.png" alt="">
           <p class="fxcol">修改密码</p>
         </div>
-        <div class="menu-col fxrow" @click="goInner('/MaintainExecution')"><p class="fxcol">设备保养执行-维修工</p></div>
+        <!-- <div class="menu-col fxrow" @click="goInner('/MaintainExecution')"><p class="fxcol">设备保养执行-维修工</p></div>
         <div class="menu-col fxrow" @click="goInner('/MaintainConfirm')"><p class="fxcol">设备保养确认-生产员</p></div>
         <div class="menu-col fxrow" @click="goInner('/EquipRepair')"><p class="fxcol">设备报修</p></div>
         <div class="menu-col fxrow" @click="goInner('/EquipRepairExecute')"><p class="fxcol">设备维修执行</p></div>
@@ -29,7 +29,7 @@
         <div class="menu-col fxrow" @click="goInner('/SparePartInstore')"><p class="fxcol">备件入库</p></div>
         <div class="menu-col fxrow" @click="goInner('/SparePartOutstore')"><p class="fxcol">备件出库</p></div>
         <div class="menu-col fxrow" @click="goInner('/UseReturn')"><p class="fxcol">领用还回</p></div>
-        <div class="menu-col fxrow" @click="goInner('/RunLogFill')"><p class="fxcol">运行记录填报</p></div>
+        <div class="menu-col fxrow" @click="goInner('/RunLogFill')"><p class="fxcol">运行记录填报</p></div> -->
         <!-- <div class="menu-col fxrow" @click="goInner('/ProcessMakePowder')"><p class="fxcol">配粉工序</p></div>
         <div class="menu-col fxrow" @click="goInner('/ProcessGrindBall')"><p class="fxcol">球磨工序</p></div>
         <div class="menu-col fxrow" @click="goInner('/ProcessSpray')"><p class="fxcol">喷雾工序</p></div>

From 13f8395529db227867558f68cc7268a2e7fbef63 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 Aug 2022 13:25:52 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E6=A3=80=E6=B5=8B=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/inspection/ResultEntry.vue | 58 ++++++++++++++-------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/pages/xinrui/inspection/ResultEntry.vue b/src/pages/xinrui/inspection/ResultEntry.vue
index 196ebd0..6cb161f 100644
--- a/src/pages/xinrui/inspection/ResultEntry.vue
+++ b/src/pages/xinrui/inspection/ResultEntry.vue
@@ -88,7 +88,8 @@
             <tr v-for="e in dataList" :key="e.inspection_item_id">
               <td>{{e.inspection_item_name}}</td>
               <!-- <td><input-number :min="0 + ''"  v-model="e.testing_value"/></td> -->
-              <td><input type="number" class="sin_input" :class="{'bred': e.bred === true}" v-model="e.testing_value" @focus="handleFocus(e)" @blur="handleBlur(e)"></td>
+              <!-- <td><input type="number" class="sin_input" :class="{'bred': e.bred === true}" v-model="e.testing_value" @focus="handleFocus(e)" @blur="handleBlur(e)"></td> -->
+              <td><input type="number" class="sin_input" :class="{'bred': e.bred === true}" v-model="e.testing_value"></td>
               <td>{{e.up_limit_value | numeric(4)}}</td>
               <td>{{e.down_limit_value | numeric(4)}}</td>
             </tr>
@@ -100,6 +101,12 @@
       <button class="btn submit-button" :class="{'btn-disabled': dataList.length === 0}" @click="calculate">计算</button>
       <button class="btn submit-button" :disabled="disabled1" :class="{'btn-disabled': sure === false}" @click="toSure">保存</button>
     </section>
+    <modal
+    :mdShow="mdShow"
+    @closeModalCallback="closeModalCallback"
+    @comfirmCallback="comfirmCallback">
+      检测值全部为空，是否继续？
+    </modal>
   </section>
 </template>
 
@@ -107,13 +114,15 @@
 import NavBar from '@components/NavBar.vue'
 import DropdownMenu from '@components/DropdownMenu.vue'
 import InputNumber from '@components/InputNumber.vue'
+import Modal from '@components/Modal.vue'
 import {queryWorkProducedure, queryInspection, inspectConfirm, updateWorkStatus} from '@config/getData2.js'
 export default {
   name: 'ResultEntry',
   components: {
     NavBar,
     DropdownMenu,
-    InputNumber
+    InputNumber,
+    Modal
   },
   data () {
     return {
@@ -136,7 +145,8 @@ export default {
       disabled: JSON.stringify(this.$store.getters.materObj1) !== '{}',
       disabled1: false,
       device_id: '',
-      sure: false
+      sure: false,
+      mdShow: false
     }
   },
   beforeRouteLeave (to, from, next) {
@@ -179,19 +189,19 @@ export default {
     }
   },
   methods: {
-    handleFocus (e) {
-      e.testing_value = ''
-    },
-    handleBlur (e) {
-      if (e.testing_value === '') {
-        e.testing_value = e.testing_value2
-      }
-      if (Number(e.testing_value) < Number(e.down_limit_value) || Number(e.testing_value) > Number(e.up_limit_value)) {
-        e.bred = true
-      } else {
-        e.testing_value2 = e.testing_value
-      }
-    },
+    // handleFocus (e) {
+    //   e.testing_value = ''
+    // },
+    // handleBlur (e) {
+    //   if (e.testing_value === '') {
+    //     e.testing_value = e.testing_value2
+    //   }
+    //   if (Number(e.testing_value) < Number(e.down_limit_value) || Number(e.testing_value) > Number(e.up_limit_value)) {
+    //     e.bred = true
+    //   } else {
+    //     e.testing_value2 = e.testing_value
+    //   }
+    // },
     goIn () {
       if (this.$route.query.url === 'ProcessGrindBall') {
         this.$router.push('/ProcessGrindBall')
@@ -317,9 +327,21 @@ export default {
         this.disabled1 = false
         return
       }
-      if (this.sure) {
-        this._inspectConfirm()
+      if (!this.sure) {
+        return
       }
+      let arr = this.dataList.filter(el => el.testing_value === '')
+      if (arr.length === this.dataList.length) {
+        this.mdShow = true
+        return
+      }
+      this._inspectConfirm()
+    },
+    closeModalCallback () {
+      this.mdShow = false
+    },
+    comfirmCallback () {
+      this._inspectConfirm()
     },
     calculate () {
       let flag = false

From 3c5f710f88dbaaa46ee74756b0377cf9eff1233c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 22 Aug 2022 13:44:51 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/inspection/ResultEntry.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/xinrui/inspection/ResultEntry.vue b/src/pages/xinrui/inspection/ResultEntry.vue
index 6cb161f..2ad5627 100644
--- a/src/pages/xinrui/inspection/ResultEntry.vue
+++ b/src/pages/xinrui/inspection/ResultEntry.vue
@@ -328,6 +328,7 @@ export default {
         return
       }
       if (!this.sure) {
+        this.disabled1 = false
         return
       }
       let arr = this.dataList.filter(el => el.testing_value === '')
@@ -338,6 +339,7 @@ export default {
       this._inspectConfirm()
     },
     closeModalCallback () {
+      this.disabled1 = false
       this.mdShow = false
     },
     comfirmCallback () {

From 9c1c8a4a56edf2ce80bf4690d16f8f02c0079f77 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 23 Aug 2022 09:40:27 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E7=A1=AE=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/inspection/ResultEntry.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/xinrui/inspection/ResultEntry.vue b/src/pages/xinrui/inspection/ResultEntry.vue
index 2ad5627..6e8fab9 100644
--- a/src/pages/xinrui/inspection/ResultEntry.vue
+++ b/src/pages/xinrui/inspection/ResultEntry.vue
@@ -297,6 +297,10 @@ export default {
     },
     toSure () {
       this.disabled1 = true
+      if (!this.sure) {
+        this.disabled1 = false
+        return
+      }
       if (this.val1 === '') {
         this.toast('请选择物料')
         this.disabled1 = false
@@ -327,12 +331,8 @@ export default {
         this.disabled1 = false
         return
       }
-      if (!this.sure) {
-        this.disabled1 = false
-        return
-      }
       let arr = this.dataList.filter(el => el.testing_value === '')
-      if (arr.length === this.dataList.length) {
+      if (arr.length > 0) {
         this.mdShow = true
         return
       }

From e4fc16e1f5f056832f0df73fce0edf94de80f16c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 23 Aug 2022 11:33:15 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js                         | 54 +++++++++++++++++++--
 src/pages/xinrui/inspection/ResultEntry.vue |  2 +-
 2 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/src/config/print.js b/src/config/print.js
index 1932424..097419e 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -24,11 +24,15 @@ export function toPrint (data) {
   LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
   LODOP.PRINT_INIT('')
   LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', store.getters.printName) // 指定打印机
-  LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
-  LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
-  LODOP.SET_PRINT_STYLE('FontSize', 12)
-  LODOP.SET_PRINT_STYLE('Bold', 1)
+  // LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+  // LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+  // LODOP.SET_PRINT_STYLE('FontSize', 12)
+  // LODOP.SET_PRINT_STYLE('Bold', 1)
   if (data.print_type === '05') {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bag_id + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -37,6 +41,10 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '还回人员：' + data.return_person)
   } else if (data.print_type === '04' && data.printWeight === undefined) {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -45,6 +53,10 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
   } else if (data.print_type === '04' && data.printWeight === true) {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -53,13 +65,21 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
   } else if (data.print_type === '04' && data.printWeight === false) {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
     LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique)
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
-  } else if (data.print_type === '02' || data.print_type === '03') {
+  } else if (data.print_type === '02') {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
@@ -68,7 +88,31 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
     LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
+  } else if (data.print_type === '03') {
+    LODOP.SET_PRINT_PAGESIZE(1, '150mm', '100mm', '')
+    LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 23)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
+    LODOP.ADD_PRINT_BARCODE('5mm', '5mm', '60mm', '60mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
+    LODOP.ADD_PRINT_TEXT('7mm', '65mm', '80mm', '27mm', '日期：' + data.input_time)
+    // LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
+    LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', pcsn)
+    // LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
+    LODOP.ADD_PRINT_TEXT('31mm', '65mm', '80mm', '27mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
+    // LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique)
+    LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + data.bucketunique + '')
+    // LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
+    LODOP.ADD_PRINT_TEXT('59mm', '6mm', '140mm', '27mm', '编码：' + data.material_code + '')
+    LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '牌号：' + data.old_mark + '')
+    // LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
+    LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '名称：' + data.material_name + '')
+    // LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
+    LODOP.ADD_PRINT_TEXT('85mm', '110mm', '60mm', '27mm', '序号：' + data.record_order + '')
   } else if (data.print_type === '01') {
+    LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
+    LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontSize', 12)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
     LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '33mm', '33mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '日期：' + data.input_time)
     LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
diff --git a/src/pages/xinrui/inspection/ResultEntry.vue b/src/pages/xinrui/inspection/ResultEntry.vue
index 6e8fab9..81df4db 100644
--- a/src/pages/xinrui/inspection/ResultEntry.vue
+++ b/src/pages/xinrui/inspection/ResultEntry.vue
@@ -105,7 +105,7 @@
     :mdShow="mdShow"
     @closeModalCallback="closeModalCallback"
     @comfirmCallback="comfirmCallback">
-      检测值全部为空，是否继续？
+      检测值有为空，是否继续？
     </modal>
   </section>
 </template>

From e443cdb983e18a86c1f3992d687ae9bdfb9cc750 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 23 Aug 2022 13:15:54 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/print.js b/src/config/print.js
index 097419e..8507e40 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -103,9 +103,9 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + data.bucketunique + '')
     // LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
     LODOP.ADD_PRINT_TEXT('59mm', '6mm', '140mm', '27mm', '编码：' + data.material_code + '')
-    LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '牌号：' + data.old_mark + '')
+    LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '牌号：' + data.old_mark + '')
     // LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
-    LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '名称：' + data.material_name + '')
+    LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '名称：' + data.material_name + '')
     // LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
     LODOP.ADD_PRINT_TEXT('85mm', '110mm', '60mm', '27mm', '序号：' + data.record_order + '')
   } else if (data.print_type === '01') {

From 542a4a31a2996c0410f9201c14929ec78857ff97 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 24 Aug 2022 10:27:37 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=85=8D=E5=90=88?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/equipment/MaintainResultFill.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/xinrui/equipment/MaintainResultFill.vue b/src/pages/xinrui/equipment/MaintainResultFill.vue
index 97c812b..161f50c 100644
--- a/src/pages/xinrui/equipment/MaintainResultFill.vue
+++ b/src/pages/xinrui/equipment/MaintainResultFill.vue
@@ -16,7 +16,7 @@
           </div>
         </div>
         <div class="bottom-filter-tip">
-          <div class="filter-label txtjustify">生产负责人</div>
+          <div class="filter-label txtjustify">生产配合人</div>
           <div class="fxcol mgl20">
             <input type="text" class="filter-input filter-scan-input" v-model="val3">
           </div>

From eebd96b4c41f329d071f72a61509fae11fb39354 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 24 Aug 2022 13:50:59 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/print.js b/src/config/print.js
index 8507e40..2064645 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -96,7 +96,7 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_BARCODE('5mm', '5mm', '60mm', '60mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
     LODOP.ADD_PRINT_TEXT('7mm', '65mm', '80mm', '27mm', '日期：' + data.input_time)
     // LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
-    LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', pcsn)
+    LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', '批次：' + pcsn)
     // LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
     LODOP.ADD_PRINT_TEXT('31mm', '65mm', '80mm', '27mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
     // LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique)

From 8f38bea866d038bfd0c5ddd034f14b02b3bf7cdc Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 25 Aug 2022 13:27:23 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/print.js b/src/config/print.js
index 2064645..52ca2b6 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -89,7 +89,7 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
     LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
   } else if (data.print_type === '03') {
-    LODOP.SET_PRINT_PAGESIZE(1, '150mm', '100mm', '')
+    LODOP.SET_PRINT_PAGESIZE(2, '150mm', '100mm', '')
     LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1)
     LODOP.SET_PRINT_STYLE('FontSize', 23)
     LODOP.SET_PRINT_STYLE('Bold', 1)

From 5e6ffa9eb5956f4bca61ebe07f30839145e9ddc2 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 26 Aug 2022 15:21:04 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js       | 2 +-
 src/pages/login/Print.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/config/print.js b/src/config/print.js
index 52ca2b6..c321b03 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -23,7 +23,7 @@ export function toPrint (data) {
   LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
   LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
   LODOP.PRINT_INIT('')
-  LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', store.getters.printName) // 指定打印机
+  LODOP.SET_PRINTER_INDEX(store.getters.printName) // 指定打印机
   // LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
   // LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)
   // LODOP.SET_PRINT_STYLE('FontSize', 12)
diff --git a/src/pages/login/Print.vue b/src/pages/login/Print.vue
index f955756..f26d832 100644
--- a/src/pages/login/Print.vue
+++ b/src/pages/login/Print.vue
@@ -45,7 +45,8 @@ export default {
         return
       }
       LODOP.PRINT_INIT('')
-      LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', this.$store.getters.printName) // 指定打印机
+      // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', this.$store.getters.printName) // 指定打印机
+      LODOP.SET_PRINTER_INDEX(this.$store.getters.printName) // 指定打印机
       LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
       LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
       LODOP.SET_PRINT_PAGESIZE(1, '100mm', '100mm', '')

From 1c36f84e6953c8ece9cc4ab097659f49a44a7c72 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Sat, 27 Aug 2022 10:58:35 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/print.js | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/config/print.js b/src/config/print.js
index c321b03..203bd50 100644
--- a/src/config/print.js
+++ b/src/config/print.js
@@ -89,25 +89,21 @@ export function toPrint (data) {
     LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
     LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
   } else if (data.print_type === '03') {
-    LODOP.SET_PRINT_PAGESIZE(2, '150mm', '100mm', '')
-    LODOP.ADD_PRINT_RECT('2mm', '2mm', '146mm', '96mm', 0, 1)
-    LODOP.SET_PRINT_STYLE('FontSize', 23)
+    LODOP.SET_PRINT_PAGESIZE(2, '100mm', '150mm', '')
+    LODOP.ADD_PRINT_RECT('2mm', '7mm', '140mm', '96mm', 0, 1)
+    LODOP.SET_PRINT_STYLE('FontName', '黑体')
+    LODOP.SET_PRINT_STYLE('FontSize', 33)
     LODOP.SET_PRINT_STYLE('Bold', 1)
-    LODOP.ADD_PRINT_BARCODE('5mm', '5mm', '60mm', '60mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
-    LODOP.ADD_PRINT_TEXT('7mm', '65mm', '80mm', '27mm', '日期：' + data.input_time)
-    // LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '批次：' + pcsn)
-    LODOP.ADD_PRINT_TEXT('19mm', '65mm', '80mm', '27mm', '批次：' + pcsn)
-    // LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
-    LODOP.ADD_PRINT_TEXT('31mm', '65mm', '80mm', '27mm', '重量：' + Number(data.storage_qty).toFixed(3) + 'kg')
-    // LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '桶号：' + data.bucketunique)
-    LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + data.bucketunique + '')
-    // LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '编码：' + data.material_code)
-    LODOP.ADD_PRINT_TEXT('59mm', '6mm', '140mm', '27mm', '编码：' + data.material_code + '')
-    LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '牌号：' + data.old_mark + '')
-    // LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '名称：' + data.material_name)
-    LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '名称：' + data.material_name + '')
-    // LODOP.ADD_PRINT_TEXT('48mm', '59mm', '80mm', '15mm', '序号：' + data.record_order)
-    LODOP.ADD_PRINT_TEXT('85mm', '110mm', '60mm', '27mm', '序号：' + data.record_order + '')
+    LODOP.ADD_PRINT_TEXT('7mm', '9mm', '150mm', '40mm', '编码:' + data.material_code + '')
+    LODOP.ADD_PRINT_TEXT('22mm', '9mm', '145mm', '40mm', '牌号:' + data.old_mark + '')
+    LODOP.ADD_PRINT_TEXT('37mm', '9mm', '145mm', '40mm', '批次：' + pcsn)
+    LODOP.SET_PRINT_STYLE('FontSize', 20)
+    LODOP.SET_PRINT_STYLE('Bold', 1)
+    LODOP.ADD_PRINT_BARCODE('60mm', '10mm', '40mm', '40mm', 'QRCode', data.bucketunique + '##' + data.ext_id + '##' + data.pcsn + '##' + Number(data.storage_qty).toFixed(3) + '##' + data.input_time + '##' + data.record_order + '##' + data.is_active)
+    LODOP.ADD_PRINT_TEXT('60mm', '45mm', '80mm', '27mm', '日期:' + data.input_time)
+    LODOP.ADD_PRINT_TEXT('72mm', '45mm', '80mm', '27mm', '桶号:' + data.bucketunique + '')
+    LODOP.ADD_PRINT_TEXT('84mm', '45mm', '80mm', '27mm', '重量:' + Number(data.storage_qty).toFixed(3) + 'kg')
+    LODOP.ADD_PRINT_TEXT('84mm', '108mm', '60mm', '27mm', '序号:' + data.record_order + '')
   } else if (data.print_type === '01') {
     LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '')
     LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1)

From 90ac6ba5e746cb2976b4955a4ea87a3aac26d574 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 2 Sep 2022 13:09:45 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/liku/GroupDiskOperate.vue        | 12 ++++++------
 src/pages/xinrui/production/GroupDiskOperateN.vue | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/xinrui/liku/GroupDiskOperate.vue b/src/pages/xinrui/liku/GroupDiskOperate.vue
index 1e96ac2..beef530 100644
--- a/src/pages/xinrui/liku/GroupDiskOperate.vue
+++ b/src/pages/xinrui/liku/GroupDiskOperate.vue
@@ -154,12 +154,12 @@ export default {
             this.val2 = ''
             return
           }
-          let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn })
-          if (!arr2.length) {
-            this.toast('物料编码和批次必须一致')
-            this.val2 = ''
-            return
-          }
+          // let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn })
+          // if (!arr2.length) {
+          //   this.toast('物料编码和批次必须一致')
+          //   this.val2 = ''
+          //   return
+          // }
           this.bucket_jo = res.bucket_jo
           this.val2 = this.bucket_jo.bucketunique
           this.dataList.push(this.bucket_jo)
diff --git a/src/pages/xinrui/production/GroupDiskOperateN.vue b/src/pages/xinrui/production/GroupDiskOperateN.vue
index 07f46e9..0fbea9c 100644
--- a/src/pages/xinrui/production/GroupDiskOperateN.vue
+++ b/src/pages/xinrui/production/GroupDiskOperateN.vue
@@ -156,12 +156,12 @@ export default {
             this.val2 = ''
             return
           }
-          let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn })
-          if (!arr2.length) {
-            this.toast('物料编码和批次必须一致')
-            this.val2 = ''
-            return
-          }
+          // let arr2 = this.dataList.filter(el => { return el.material_code === res.bucket_jo.material_code && el.pcsn === res.bucket_jo.pcsn })
+          // if (!arr2.length) {
+          //   this.toast('物料编码和批次必须一致')
+          //   this.val2 = ''
+          //   return
+          // }
           this.bucket_jo = res.bucket_jo
           this.val2 = this.bucket_jo.bucketunique
           this.dataList.push(this.bucket_jo)

From 0b8654f6abcbdda3c7a8a84d392dd04ebada8715 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 16 Sep 2022 10:23:52 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData2.js                       |   8 +
 src/pages/xinrui/common/SearchRepairTask.vue | 162 +++++++++++++++++++
 src/router/index.js                          |   5 +
 3 files changed, 175 insertions(+)
 create mode 100644 src/pages/xinrui/common/SearchRepairTask.vue

diff --git a/src/config/getData2.js b/src/config/getData2.js
index 276d249..0e0c47d 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -505,3 +505,11 @@ export const repaireDtlConfirm = (form, row, pname) => post('api/pda/sb/repaireD
   rows: row,
   product_person_name: pname
 })
+
+/** 报修任务查询 */
+// 1.12部门下拉框
+export const deptList = () => post('api/pda/sb/deptList', {})
+// 1.13报修单查询
+export const repairRequest = (id) => post('api/pda/sb/repairRequest', {
+  dept_id: id
+})
diff --git a/src/pages/xinrui/common/SearchRepairTask.vue b/src/pages/xinrui/common/SearchRepairTask.vue
new file mode 100644
index 0000000..5b624e1
--- /dev/null
+++ b/src/pages/xinrui/common/SearchRepairTask.vue
@@ -0,0 +1,162 @@
+<template>
+  <section>
+    <nav-bar title="报修任务查询"></nav-bar>
+    <section class="content mgt186" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="0" infinite-scroll-immediate-check="false">
+      <div class="filter-wraper">
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">部门</div>
+          <div class="fxcol mgl20 visible" >
+            <dropdown-menu
+              :option="option"
+              :active="active"
+              :open="open"
+              @toggleItem="toggleItem"
+              @dropdownMenu="dropdownMenu">
+            </dropdown-menu>
+          </div>
+        </div>
+      </div>
+      <div class="grid-wraper">
+        <div class="left_fixed">
+          <table class="layout-t left_layout_t">
+            <tr>
+              <th>生成时间</th>
+            </tr>
+            <tr v-for="(e, i) in dataList" :key="i">
+              <td>{{e.device_code}}</td>
+            </tr>
+          </table>
+        </div>
+        <div class="slide">
+          <table class="layout-t">
+            <tr>
+              <th>设备名称</th>
+              <th>设备编号</th>
+              <th>所属部门</th>
+              <th>保修内容</th>
+              <th>开始时间</th>
+            </tr>
+            <tr v-for="(e, i) in dataList" :key="i">
+              <td>{{e.device_name}}</td>
+              <td>{{e.device_code}}</td>
+              <td>{{e.name}}</td>
+              <td>{{e.fault_desc}}</td>
+              <td>{{e.process_time}}</td>
+            </tr>
+          </table>
+        </div>
+      </div>
+      <div class="loading-tips">{{desc}}</div>
+    </section>
+    <section class="submit-bar">
+      <button class="btn submit-button" @click="_repairRequest">查询</button>
+    </section>
+  </section>
+</template>
+
+<script>
+import NavBar from '@components/NavBar.vue'
+import DropdownMenu from '@components/DropdownMenu.vue'
+import {deptList, repairRequest} from '@config/getData2.js'
+export default {
+  name: 'SearchRepairTask',
+  components: {
+    NavBar,
+    DropdownMenu
+  },
+  data () {
+    return {
+      dataList: [],
+      option: [],
+      active: '',
+      open: false,
+      page: 1,
+      size: '10',
+      busy: false,
+      desc: '',
+      pkId: '',
+      pkObj: {}
+    }
+  },
+  created () {
+    this._deptList()
+  },
+  methods: {
+    toggleItem () {
+      if (!this.open) {
+        this.open = true
+      } else {
+        this.open = false
+      }
+    },
+    dropdownMenu (i) {
+      this.active = i + ''
+      this.open = false
+    },
+    async _deptList () {
+      let res = await deptList()
+      if (res.code === '1') {
+        this.option = [...res.rows]
+      } else {
+        this.Dialog(res.desc)
+      }
+    },
+    async _repairRequest () {
+      let id = ''
+      if (this.active) {
+        id = this.option[this.active].value
+      }
+      this.page = 1
+      this.busy = false
+      this.desc = ''
+      let res = await repairRequest(id)
+      if (res.code === '1') {
+        this.dataList = []
+        this.checkArr = []
+        this.allcheckActive = false
+        // res.rows.map(el => {
+        //   this.$set(el, 'checked', false)
+        // })
+        this.dataList = [...res.rows]
+        if (res.rows.length < 10) {
+          this.busy = true
+          this.desc = '已加载全部数据'
+        }
+      } else {
+        this.Dialog(res.desc)
+        this.desc = res.desc
+      }
+    },
+    async loadMore () {
+      this.busy = true
+      this.page++
+      let id = ''
+      if (this.active) {
+        id = this.option[this.active].value
+      }
+      let res = await repairRequest(id)
+      if (res.code === '1') {
+        // res.rows.map(el => {
+        //   this.$set(el, 'checked', false)
+        // })
+        this.dataList = [...this.dataList, ...res.rows]
+        if (res.rows.length < 10) {
+          this.busy = true
+          this.desc = '已加载全部数据'
+        } else {
+          this.busy = false
+        }
+      } else {
+        this.Dialog(res.desc)
+        this.desc = res.desc
+      }
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+>>>.content
+  height calc(100% - 1.96rem)
+  overflow-y auto
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index 2371c23..9f6c9c6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -111,6 +111,7 @@ const MaterInfoSearchCheckBox = r => require.ensure([], () => r(require('../page
 const UploadPict = r => require.ensure([], () => r(require('../pages/xinrui/common/UploadPict')), 'common')
 const Password = r => require.ensure([], () => r(require('../pages/xinrui/common/Password')), 'common')
 const UploadPicts = r => require.ensure([], () => r(require('../pages/xinrui/common/UploadPicts')), 'common')
+const SearchRepairTask = r => require.ensure([], () => r(require('../pages/xinrui/common/SearchRepairTask')), 'common')
 
 Vue.use(Router)
 
@@ -508,6 +509,10 @@ export default new Router({
     {
       path: '/UploadPicts', // 上传多张图片
       component: UploadPicts
+    },
+    {
+      path: '/SearchRepairTask', // 报修任务查询
+      component: SearchRepairTask
     }
   ],
   scrollBehavior (to, from, savedPosition) {