lx

2018-12-15 18:00:57 +08:00
parent 61589d5a8e
commit 413f14314d
5 changed files with 534 additions and 234 deletions
--- a/src/views/Inventory/PartsReplacement/index.vue
+++ b/src/views/Inventory/PartsReplacement/index.vue
@@ -38,7 +38,7 @@
        size="small"
        icon="el-icon-search"
        style="margin-left: 10px"
-        @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+        @click="pageCurrent=1;pageSize=10;total=0;getAlterRecord()">查询</el-button>
    </el-card>
    <el-card>
      <el-table
@@ -50,49 +50,39 @@
        size="mini"
        @selection-change="handleSelectionChange">
        <el-table-column type="selection" align="center" width="55"/>
-        <el-table-column label="物料名称" min-width="200" align="center">
+        <el-table-column label="项目名称" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.项目名称 }}
          </template>
        </el-table-column>
-        <el-table-column label="物料型号" min-width="200" align="center">
+        <el-table-column label="机床图号" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.机床图号 }}
          </template>
        </el-table-column>
-        <el-table-column label="物料规格" min-width="200" align="center">
+        <el-table-column label="组号" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.组号 }}
          </template>
        </el-table-column>
-        <el-table-column label="供货商" min-width="200" align="center">
+        <el-table-column label="数量" min-width="200" align="center">
          <template slot-scope="scope">
            {{ scope.row.供货商 }}
          </template>
        </el-table-column>
-        <el-table-column label="当前库存量" min-width="100" align="center">
+        <el-table-column label="修改原因" min-width="100" align="center">
          <template slot-scope="scope">
            {{ scope.row.当前库存量 }}
          </template>
        </el-table-column>
-        <el-table-column label="安全库存量" min-width="100" align="center">
+        <el-table-column label="姓名" min-width="100" align="center">
          <template slot-scope="scope">
-            <template v-if="scope.row.changeSafeValue">
-              <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
-              <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
-            </template>
-            <span v-else>{{ scope.row.安全库存量 }}</span>
+            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
-        <el-table-column label="设置" min-width="100" align="center">
+        <el-table-column label="修改日期" min-width="100" align="center">
          <template slot-scope="scope">
-            <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button
-              v-else
-              type="primary"
-              size="mini"
-              icon="el-icon-edit"
-              @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+            {{ scope.row.修改日期 }}
          </template>
        </el-table-column>
      </el-table>
@@ -104,8 +94,8 @@
          :total="total1"
          style="display:inline-block;width:50%"
          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
      </div>
      <el-table
        v-loading="loading1"
@@ -116,67 +106,52 @@
        size="mini"
        @selection-change="handleSelectionChange">
        <el-table-column type="selection" align="center" width="55"/>
-        <el-table-column label="物料名称" min-width="200" align="center">
+        <el-table-column label="项目名称" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.项目名称 }}
          </template>
        </el-table-column>
-        <el-table-column label="物料型号" min-width="200" align="center">
+        <el-table-column label="机床图号" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.机床图号 }}
          </template>
        </el-table-column>
-        <el-table-column label="物料规格" min-width="200" align="center">
+        <el-table-column label="组号" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.组号 }}
          </template>
        </el-table-column>
-        <el-table-column label="供货商" min-width="200" align="center">
+        <el-table-column label="异常数量" min-width="200" align="center">
          <template slot-scope="scope">
-            {{ scope.row.供货商 }}
+            {{ scope.row.异常数量 }}
          </template>
        </el-table-column>
-        <el-table-column label="当前库存量" min-width="100" align="center">
+        <el-table-column label="异常原因" min-width="100" align="center">
          <template slot-scope="scope">
-            {{ scope.row.当前库存量 }}
+            {{ scope.row.异常原因 }}
          </template>
        </el-table-column>
-        <el-table-column label="安全库存量" min-width="100" align="center">
+        <el-table-column label="货位流水号" min-width="100" align="center">
          <template slot-scope="scope">
-            <template v-if="scope.row.changeSafeValue">
-              <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
-              <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
-            </template>
-            <span v-else>{{ scope.row.安全库存量 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="设置" min-width="100" align="center">
-          <template slot-scope="scope">
-            <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button
-              v-else
-              type="primary"
-              size="mini"
-              icon="el-icon-edit"
-              @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
+            {{ scope.row.货位流水号 }}
          </template>
        </el-table-column>
      </el-table>
      <div class="block" style="margin-top: 10px;">
        <el-pagination
-          :current-page="pageCurrent1"
+          :current-page="pageCurrent2"
          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
+          :page-size="pageSize2"
+          :total="total2"
          style="display:inline-block;width:50%"
          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
      </div>
    </el-card>
    <el-card>
-      <span>请购单号:</span>
-      <el-input v-model="purchasecard" placeholder="请购单号" size="small" clearable style="width: 150px"/>
+      <span>补投单号:</span>
+      <el-input v-model="repleacecard" placeholder="补投单号" size="small" clearable style="width: 150px"/>
      <span>仓库:</span>
      <el-select v-model="HouseNumber" placeholder="请选择仓库" size="small" @change="searchDemo();payMethodChange()">
        <el-option
@@ -190,13 +165,13 @@
        size="small"
        icon="el-icon-search"
        style="margin-left: 10px"
-        @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
+        @click="pageCurrent3=1;pageSize3=10;total3=0;searchTable2()">查询</el-button>
      <el-button
        type="primary"
        size="small"
        icon="el-icon-plus"
        style="margin-left: 10px"
-        @click="addTableData">创建离线请购单</el-button>
+        @click="addTableData">创建补投单</el-button>
      <el-button
        type="primary"
        size="small"
@@ -206,30 +181,25 @@
    </el-card>
    <el-card>
      <el-table v-loading="" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="请购单状态" align="center" width="80" fixed="left">
+        <el-table-column label="补投单状态" align="center" width="80" fixed="left">
          <template slot-scope="scope">
            <el-tag v-if="parseInt(scope.row.是否传递)===0" type="warning" size="small">未传递</el-tag>
            <el-tag v-if="parseInt(scope.row.是否传递)===1" type="primary" size="small">已传递</el-tag>
          </template>
        </el-table-column>
-        <el-table-column label="请购单编号" align="center" min-width="150">
+        <el-table-column label="补投单编号" align="center" min-width="150">
          <template slot-scope="scope">
-            {{ scope.row.请购单编号 }}
+            {{ scope.row.补投单编号 }}
          </template>
        </el-table-column>
-        <el-table-column label="请购人" align="center" min-width="150">
+        <el-table-column label="姓名" align="center" min-width="150">
          <template slot-scope="scope">
            {{ scope.row.姓名 }}
          </template>
        </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="250">
+        <el-table-column label="补投时间" align="center" min-width="250">
          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请购时间" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.请购时间.split(' ')[0] }}
+            {{ scope.row.补投时间 }}
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="280" fixed="right">
@@ -240,14 +210,14 @@
      </el-table>
      <div class="block" style="margin: 10px 0;">
        <el-pagination
-          :current-page="pageCurrent2"
+          :current-page="pageCurrent3"
          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
+          :page-size="pageSize3"
+          :total="total3"
          style="display:inline-block;width:50%"
          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
+          @size-change="handleSizeChange3"
+          @current-change="handleCurrentChange3"/>
        <el-button style="margin-left:500px;" type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
      </div>
      <el-table v-loading="" :data="tableData4" border style="max-height: 300px;" height="300px" size="mini">
@@ -287,7 +257,7 @@
 </template>

 <script>
-import { initProject, searchmachine, searchTeam } from '@/api/Inventory/PartsReplacement'
+import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard } from '@/api/Inventory/PartsReplacement'
 import { mapGetters } from 'vuex'
 export default {
  data() {
@@ -298,7 +268,28 @@ export default {
      Machine: [],
      GroupNumValue: '',
      GroupNum: '',
-      tableData1: []
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
+      tableData4: [],
+      listLoading: false,
+      listLoading2: false,
+      listLoading3: false,
+      listLoading4: false,
+      PageCurrent: 1,
+      PageSize: 10,
+      total: 0,
+      PageCurrent2: 1,
+      PageSize2: 10,
+      total2: 0,
+      PageCurrent3: 1,
+      PageSize3: 10,
+      total3: 0,
+      ProjectValue_check: '',
+      MachineValue_check: '',
+      GroupNumValue_check: '',
+      repleacecard: '',
+      repleacecard_check: ''
    }
  },
  computed: {
@@ -341,6 +332,91 @@ export default {
          })
        }
      })
+    },
+    // 查询修改记录
+    getAlterRecord() {
+      this.listLoading = true
+      this.tableData1 = []
+      if (this.ProjectValue === '') {
+        this.ProjectValue_check = 0
+      } else {
+        this.ProjectValue_check = 1
+      }
+      if (this.MachineValue === '') {
+        this.MachineValue_check = 0
+      } else {
+        this.MachineValue_check = 1
+      }
+      if (this.GroupNumValue === '') {
+        this.GroupNumValue_check = 0
+      } else {
+        this.GroupNumValue_check = 1
+      }
+      searchAlterRecord(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        this.tableData1 = response.data.rows
+        this.total = response.data.total
+        this.listLoading = false
+      })
+      this.getErrorRecord()
+    },
+    // 查询异常记录
+    getErrorRecord() {
+      this.listLoading2 = true
+      this.tableData2 = []
+      if (this.ProjectValue === '') {
+        this.ProjectValue_check = 0
+      } else {
+        this.ProjectValue_check = 1
+      }
+      if (this.MachineValue === '') {
+        this.MachineValue_check = 0
+      } else {
+        this.MachineValue_check = 1
+      }
+      if (this.GroupNumValue === '') {
+        this.GroupNumValue_check = 0
+      } else {
+        this.GroupNumValue_check = 1
+      }
+      searchErrorRecord(this.PageCurrent2, this.PageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+        this.listLoading2 = false
+      })
+    },
+    handleSizeChange(val) {
+      this.PageCurrent = 1
+      this.PageSize = val
+      this.searchPartinfo()
+    },
+    handleCurrentChange(val) {
+      this.PageCurrent = val
+      this.searchPartinfo()
+    },
+    handleSizeChange2(val) {
+      this.PageCurrent2 = 1
+      this.PageSize2 = val
+      this.searchPartinfo()
+    },
+    handleCurrentChange2(val) {
+      this.PageCurrent2 = val
+      this.searchPartinfo()
+    },
+    // 查询补投单
+    getReplacement() {
+      this.listLoading3 = true
+      this.tableData3 = []
+      if (this.repleacecard === '') {
+        this.repleacecard_check = 0
+      } else {
+        this.repleacecard_check = 1
+      }
+      searchReplacementCard(this.PageCurrent3, this.PageSize3, this.repleacecard_check, this.repleacecard).then(response => {
+        this.tableData3 = response.data.rows
+        this.total3 = response.data.total
+        this.listLoading3 = false
+      })
+      this.getErrorRecord()
    }
  }
 }
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -11,6 +11,7 @@
        :data="tableData1"
        border
        style="width: 100%;"
+        size="mini"
        height="200"
        @row-click = "searchListDetailt()">
        <el-table-column
@@ -55,6 +56,7 @@
        :data="tableDataPicking"
        border
        style="width: 100%;"
+        size="mini"
        height="200">
        <el-table-column
          label="序号"
@@ -152,6 +154,7 @@
        :data="tableDataBasic"
        border
        style="width: 100%;"
+        size="mini"
        height="200">
        <el-table-column
          label="序号"
@@ -234,6 +237,7 @@
        :data="tableDataPurchase"
        border
        style="width: 100%;"
+        size="mini"
        height="200">
        <el-table-column
          label="序号"