操作屏优化

lms/nladmin-ui/src/views/wms/produceScreen/index.vue

@@ -14,10 +14,10 @@
         <div v-if="e.type === '0'" class="button" @click="showPop('BACK', e)">回库</div>
       </div>
     </div>
-    <div v-show="type === 'IN'" class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+    <div v-show="type === 'IN'" class="pop-wraper pop-wraper-2" :class="{'popshow': show, 'pophide': !show}">
       <div class="pop-grid">
         <el-row type="flex" justify="space-between">
-          <el-col :span="14">
+          <el-col :span="13">
             <el-table
               :data="popList"
               style="width: 100%; padding-right: 10px"
@@ -49,7 +49,7 @@
               />
             </el-table>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="11">
             <el-table
               :data="popSecList"
               style="width: 100%"
@@ -62,6 +62,10 @@
                 prop="due_date"
                 label="交期时间"
               />
+              <el-table-column
+                prop="material_code"
+                label="零件号"
+              />
               <el-table-column
                 prop="material_qty"
                 label="物料数量"
@@ -179,8 +183,9 @@
           <el-table-column
             label="操作"
           >
-            <template>
+            <template slot-scope="scope">
-              <el-button circle type="primary" icon="el-icon-plus" @click="addRow" />
+              <el-button circle type="primary" icon="el-icon-plus" @click.native.prevent="addRow(scope.$index, popList)" />
+              <el-button circle type="primary" icon="el-icon-minus" @click.native.prevent="delRow(scope.$index, popList)" />
             </template>
           </el-table-column>
         </el-table>
@@ -362,7 +367,7 @@ export default {
         }
         const arr = []
         this.popList.map(el => {
-          if (el.order_code !== '' && el.material_qty !== '') {
+          if (el.order_code !== '' && el.material_qty !== '' && el.material_code !== '') {
             arr.push(el)
           }
         })
@@ -381,8 +386,11 @@ export default {
       }
       this.show = false
     },
-    addRow() {
+    addRow(index, rows) {
-      this.popList.push({ order_code: '', material_qty: '' })
+      rows.splice(index, 0, { order_code: '', material_qty: '', material_code: '' })
+    },
+    delRow(index, rows) {
+      rows.splice(index, 1)
     }
   }
 }

lms/nladmin-ui/src/views/wms/produceScreen/style.scss

@@ -270,6 +270,11 @@
   height: auto;
   background: center / 100% 100% url('~@/assets/images/screen_4.png') no-repeat;
 }
+.pop-wraper-2 {
+  left: 3%;
+  width: 94%;
+  padding: 2% 1.5% 3% 1.5%;
+}
 .popshow {
 	transform: translateY(-50%);
 }