刻字机

src/pages/modules/lettering/lettering-machine-select.vue

@@ -3,11 +3,17 @@
         <div class="search-confirm-wrap">
             <div class="search-wrap">
                 <div class="search-item">
-                    <div class="search-label">载具</div>
+                    <div class="search-label">货位</div>
                     <div class="filter_input_wraper">
                         <input type="text" class="filter-input" v-model="$route.query.code" disabled>
                     </div>
                 </div>
+                <div class="search-item">
+                    <div class="search-label">规格</div>
+                    <div class="filter_input_wraper">
+                        <input type="text" class="filter-input" v-model="$route.query.spec" disabled>
+                    </div>
+                </div>
                 <div class="search-item">
                     <div class="search-label">重量</div>
                     <div class="filter_input_wraper">
@@ -86,10 +92,15 @@ export default {
       }
     },
     distribute () {
-      let weight = accDiv(this.$route.query.weight, this.dataList.length)
+      if (this.checkArr.length === 0) {
+        return
+      }
+      let weight = accDiv(this.$route.query.weight, this.checkArr.length)
       weight = Number(weight).toFixed(3)
       this.dataList.map(el => {
-        this.$set(el, 'weight', weight)
+        if (el.checked === true) {
+          this.$set(el, 'weight', weight)
+        }
       })
     },
     toCancle () {
@@ -125,7 +136,7 @@ export default {
       try {
         let arr = []
         this.checkArr.map(el => {
-          arr.push({device_code: el.device_code, weight: el.weight})
+          arr.push({device_code: el.device_code, weight: el.weight, struct_code: this.$route.query.code})
         })
         let res = await kzSubmitkz(arr)
         if (res.code === 200) {
@@ -149,13 +160,6 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-.search-item
-  &:nth-child(1), &:nth-child(2)
-    width 24%
-  &:nth-child(3)
-    width 48%
-.search-label
-  width .55rem
-.filter_input_wraper
-  width calc(100% - .55rem)
+.grid_wraper
+  height calc(100% - 1.1rem)
 </style>

src/pages/modules/lettering/lettering-process.vue

@@ -106,7 +106,8 @@ export default {
         path: '/letteringmachineselect',
         query: {
           code: this.pkObj.struct_code,
-          weight: this.pkObj.canuse_qty
+          weight: this.pkObj.canuse_qty,
+          spec: this.pkObj.material_spec
         }
       })
     }