更新

src/views/Inventory/Inboundscanning/index.vue

@@ -1,20 +1,30 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span style="margin: 5px">零件图号</span>
-      <el-input v-model="Partpaint" clearable size="small" style="width:200px" />
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
-      <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" @click="Empty()">清空</el-button>
-      <el-button type="primary" size="small" class="el-icon-success" style="margin: 0 0 0 10px" @click="Innumber">入库</el-button>
+      <el-row>
+        <span style="margin-left: 10px">零件图号</span>
+        <el-input v-model="Partpaint" clearable size="small" style="width:200px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
+        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
+        <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
+        <el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
+      </el-row>
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading" :data="tableDataNum" border size="mini" style="width: 100%" height="650px">
+      <el-table
+        v-loading="listLoading"
+        :data="tableDataNum"
+        stripe="true"
+        highlight-current-row
+        border
+        size="mini"
+        style="width: 100%;margin: 3px 0px"
+        height="650px">
         <el-table-column
           label="序号"
           align="center"
           type="index"
-          width="50"/>
+          width="55"/>
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -73,6 +83,7 @@
               :disabled="scope.row.是否禁用"
               size="mini"
               type="danger"
+              plain
               class="el-icon-delete"
               @click="handleDelete(scope.$index, scope.row)">移除</el-button>
           </template>
@@ -310,6 +321,6 @@ export default {
 
 <style scoped>
   .el-card {
-    margin-bottom: 15px;
+    margin-bottom: 3px;
   }
 </style>

src/views/Inventory/MaterialOut/index.vue

@@ -85,21 +85,26 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="总数量" align="center" min-width="70">
+        <el-table-column label="总数量" align="center" min-width="40">
           <template slot-scope="scope">
             {{ scope.row.总数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="备件数量" align="center" min-width="70">
+        <el-table-column label="备件数量" align="center" min-width="50">
           <template slot-scope="scope">
             {{ scope.row.备件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已领数量" align="center" min-width="70">
+        <el-table-column label="已领数量" align="center" min-width="50">
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" min-width="140">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.备注" size="mini" @change="UpdateRemark(scope.row)"/>
+          </template>
+        </el-table-column>
         <el-table-column v-if="true" label="备料确认" align="center" width="100">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已确认</el-tag>
@@ -294,7 +299,7 @@
 </template>
 
 <script>
-import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut'
+import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, updateRemark, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut'
 import { mapGetters } from 'vuex'
 import request from '@/utils/request'
 export default {
@@ -460,6 +465,15 @@ export default {
         }
       })
     },
+    UpdateRemark(row) {
+      updateRemark(row.领料单明细流水号, row.备注).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('编辑成功')
+        } else {
+          this.$message.error('编辑失败')
+        }
+      })
+    },
     // 多选
     handleSelectionChange(val) {
       this.multipleSelection = []
@@ -609,6 +623,7 @@ export default {
       row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
       row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName
       searchListDetail(this.pickingListNum).then(res => {
+        console.log(res.data)
         this.pickListTable2 = res.data
       })
     },

src/views/Inventory/OutPartSelect/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>机床号:</span>
-      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
+      <span style="margin-left: 10px">机床号:</span>
+      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
         <el-option
           v-for="item in Machines"
           :key="item.value"
@@ -26,11 +26,19 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading1" :data="tableData1" class="table" border height="650">
+      <el-table
+        v-loading="listLoading1"
+        :data="tableData1"
+        class="table"
+        stripe="true"
+        size="mini"
+        highlight-current-row
+        border
+        height="380">
         <el-table-column
           label="序号"
           align="center"
-          width="50"
+          width="55"
           type="index"/>
         <el-table-column align="center" label="零件名称" width="150px">
           <template slot-scope="scope">

src/views/Inventory/StockInquiry/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>机床号:</span>
-      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
+      <span style="margin-left: 10px">机床号:</span>
+      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
         <el-option
           v-for="item in Machines"
           :key="item.value"
@@ -26,11 +26,19 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading1" :data="tableData1" class="table" border height="650">
+      <el-table
+        v-loading="listLoading1"
+        :data="tableData1"
+        stripe="true"
+        size="mini"
+        highlight-current-row
+        class="table"
+        border
+        height="380">
         <el-table-column
           label="序号"
           align="center"
-          width="50"
+          width="55"
           type="index"/>
         <el-table-column align="center" label="零件名称" width="150px">
           <template slot-scope="scope">