lx

2018-12-24 19:47:38 +08:00
parent cd052f438f
commit f10c1b1cd3
13 changed files with 562 additions and 61 deletions
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -280,7 +280,7 @@
            </el-table-column>
            <el-table-column label="入库人员" align="center" min-width="80">
              <template slot-scope="scope">
-                {{ scope.row.入库人员 }}
+                {{ scope.row.姓名 }}
              </template>
            </el-table-column>
            <el-table-column label="到货时间" align="center" min-width="80">
@@ -343,7 +343,8 @@
            style="margin: 10px;"
            @change="GeneralShow()">
            <el-radio v-model="radio2" :label="3">外购件</el-radio>
-            <el-radio v-model="radio2" :label="4" style="margin-left: 2px">标准件</el-radio>
+            <el-radio v-model="radio2" :label="4" style="margin-left: 20px">标准件</el-radio>
+            <el-radio v-model="radio2" :label="5" style="margin-left: 20px">基本件</el-radio>
          </el-radio-group>
          <span>项目名称:</span>
          <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -452,7 +453,7 @@
            </el-table-column>
            <el-table-column label="入库人员" align="center" min-width="80">
              <template slot-scope="scope">
-                {{ scope.row.入库人员 }}
+                {{ scope.row.姓名 }}
              </template>
            </el-table-column>
            <el-table-column label="到货时间" align="center" min-width="80">
@@ -497,7 +498,8 @@
            style="margin: 10px;"
            @change="GeneralShow()">
            <el-radio v-model="radio2" :label="3">外购件</el-radio>
-            <el-radio v-model="radio2" :label="4" style="margin-left: 2px">标准件</el-radio>
+            <el-radio v-model="radio2" :label="4" style="margin-left: 20px">标准件</el-radio>
+            <el-radio v-model="radio2" :label="5" style="margin-left: 20px">基本件</el-radio>
          </el-radio-group>
          <span>项目名称:</span>
          <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -604,6 +606,161 @@
            <el-button type="primary" @click="edeitsafeAmount()">确 定</el-button>
          </div>
        </el-dialog>
+        <el-card v-show="purchaseBasicShow">
+          <el-radio-group
+            v-model="radio"
+            size="mini"
+            style="margin: 10px;"
+            @change="GeneralShow()">
+            <el-radio v-model="radio2" :label="3">外购件</el-radio>
+            <el-radio v-model="radio2" :label="4" style="margin-left: 20px">标准件</el-radio>
+            <el-radio v-model="radio2" :label="7" style="margin-left: 20px">基本件</el-radio>
+          </el-radio-group>
+          <span>项目名称:</span>
+          <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
+            <el-option
+              v-for="item in Project"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>机床图号:</span>
+          <el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+            <el-option
+              v-for="item in Machine"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>组号:</span>
+          <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px">
+            <el-option
+              v-for="item in GroupNum"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="total7 = 0;pageSize7 = 10;pageList7 = 1;searchPurchaseBasciinfo()">基本件查询</el-button><br>
+        </el-card>
+        <el-card v-show="purchaseBasicShow">
+          <el-table
+            v-loading="listLoading6"
+            :data="tablePurchaseBasic"
+            border
+            size="mini"
+            style="width: 100%;"
+            height="200">
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column label="项目名称" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.基本件项目名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="机床图号" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.基本件机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="组号" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.基本件组号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件名称" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件数量" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.货位存量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件类型" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.类型名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" min-width="120">
+              <template slot-scope="scope" align="center">
+                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="PageCurrent7"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="10"
+              :total="total7"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange7"
+              @current-change="handleCurrentChange7"/>
+          </div>
+        </el-card>
+        <el-card v-show="purchaseBasicShow">
+          <el-table
+            v-loading="listLoading7"
+            :data="PurchasePartIn"
+            size="mini"
+            border
+            style="width: 100%;"
+            height="200">
+            <el-table-column
+              label="序号"
+              size="mini"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column label="实际到货数量" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.实际到货数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="入库人员" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="到货时间" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table
+            v-loading="listLoading8"
+            :data="PurchasePartOut"
+            border
+            size="mini"
+            style="width: 100%;"
+            height="200">
+            <el-table-column
+              label="序号"
+              align="center"
+              type="index"
+              width="50"/>
+            <el-table-column label="出库数量" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.出库数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="出库时间" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="领用者" align="center" min-width="80">
+              <template slot-scope="scope">
+                {{ scope.row.领用者 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
        <el-card v-show="standardshow">
          <el-table
            v-loading="listLoading10"
@@ -624,7 +781,7 @@
            </el-table-column>
            <el-table-column label="入库人员" align="center" min-width="80">
              <template slot-scope="scope">
-                {{ scope.row.入库人员 }}
+                {{ scope.row.姓名 }}
              </template>
            </el-table-column>
            <el-table-column label="到货时间" align="center" min-width="80">
@@ -784,7 +941,7 @@
            </el-table-column>
            <el-table-column label="入库人员" align="center" min-width="80">
              <template slot-scope="scope">
-                {{ scope.row.入库人员 }}
+                {{ scope.row.姓名 }}
              </template>
            </el-table-column>
            <el-table-column label="到货时间" align="center" min-width="80">
@@ -947,7 +1104,7 @@
            </el-table-column>
            <el-table-column label="入库人员" align="center" min-width="80">
              <template slot-scope="scope">
-                {{ scope.row.入库人员 }}
+                {{ scope.row.姓名 }}
              </template>
            </el-table-column>
            <el-table-column label="到货时间" align="center" min-width="80">
@@ -992,7 +1149,7 @@

 <script>
 import { mapGetters } from 'vuex'
-import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter } from '@/api/Inventory/InventoryCheck'
+import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter, searchPurchaseBasicPart } from '@/api/Inventory/InventoryCheck'
 export default {
  data() {
    return {
@@ -1061,6 +1218,9 @@ export default {
      PageCurrent6: 1,
      PageSize6: 10,
      total6: null,
+      PageCurrent7: 1,
+      PageSize7: 10,
+      total7: null,
      radio: 1,
      radio2: 1,
      radio3: 1,
@@ -1070,12 +1230,14 @@ export default {
      standardshow: false,
      housebasicshow: true,
      housepurchaseshow: false,
+      purchaseBasicShow: false,
      HouseDataBasic: [],
      HouseDataBasicOut: [],
      HouseDataBasicIn: [],
      HouseDataPurchase: [],
      HouseDataPurchaseOut: [],
      HouseDataPurchaseIn: [],
+      tablePurchaseBasic: [],
      rules2: { // 表单验证规则
        Number: [{ required: true, message: '请输入安全库存量', trigger: 'blur' }],
        AlterReason: [{ required: true, message: '请输入安全库存量', trigger: 'blur' }]
@@ -1117,11 +1279,17 @@ export default {
    },
    GeneralShow() {
      if (this.radio === 3) {
+        this.purchaseBasicShow = false
        this.purchaseshow = true
        this.standardshow = false
-      } else {
+      } else if (this.radio === 4) {
+        this.purchaseBasicShow = false
        this.purchaseshow = false
        this.standardshow = true
+      } else {
+        this.purchaseBasicShow = true
+        this.purchaseshow = false
+        this.standardshow = false
      }
    },
    HouseShow() {
@@ -1278,6 +1446,31 @@ export default {
        this.listLoading3 = false
      })
    },
+    // 查询外购基本件
+    searchPurchaseBasciinfo() {
+      this.listLoading = true
+      this.tablePurchaseBasic = []
+      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
+      }
+      searchPurchaseBasicPart(this.PageCurrent7, this.PageSize7, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        this.tablePurchaseBasic = response.data.rows
+        this.listLoading = false
+        this.total7 = response.data.total
+      })
+    },
    // 查询基本件
    searchBasciPartinfo() {
      this.listLoading = true
@@ -1429,6 +1622,15 @@ export default {
      this.PageCurrent6 = val
      this.searchHousePurchase()
    },
+    handleSizeChange7(val) {
+      this.PageCurrent7 = 1
+      this.PageSize7 = val
+      this.searchPurchaseBasciinfo()
+    },
+    handleCurrentChange7(val) {
+      this.PageCurrent7 = val
+      this.searchPurchaseBasciinfo()
+    },
    // 查询车间采购基本件
    searchHouseBasci() {
      this.listLoadingx1 = true