Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

2018-12-30 11:15:19 +08:00
parent 77ebe95beb ca18e98e91
commit 624ed4e6ce
6 changed files with 123 additions and 34 deletions
--- a/src/api/Inventory/InventoryCheck.js
+++ b/src/api/Inventory/InventoryCheck.js
@@ -105,7 +105,7 @@ export function searchStandardPartOut(data1) {
    data: {
      type: '1',
      name: '库存管理_库存盘点_标准件出库记录',
-      param: '组件零件流水号=' + data1
+      param: '采购合同明细流水号=' + data1
    }
  })
 }
@@ -211,6 +211,30 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p
    }
  })
 }
+// 车间采购外购件出库记录查询
+export function searchShopPurchasePartOut(teampart) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_库存盘点_车间外购件出库记录',
+      param: '请购单明细流水号=' + teampart
+    }
+  })
+}
+// 车间采购外购件入库记录查询
+export function searchShopPurchasePartIn(teampart) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_库存盘点_车间外购件入库记录',
+      param: '请购单明细流水号=' + teampart
+    }
+  })
+}
 // 车间采购库存盘点修改
 export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, craftnumber, materialType, materiallocate, name, mode, picture, type, material) {
  return request({
--- a/src/api/Inventory/SubstitutePart.js
+++ b/src/api/Inventory/SubstitutePart.js
@@ -36,26 +36,26 @@ export function searchTeam(machineNumber) {
  })
 }
 // 外购件、标准件查询
-export function searchPurchasePart(project_check, project, machine_check, machine, group_check, group) {
+export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '库存管理_外购件出库_零件查询',
-      param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group
+      param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
+      Pagination: pageCurrent + '&' + pageSize
    }
  })
 }
 // 被替换件查询
-export function searchSubstituted(material_check, material) {
+export function searchSubstituted() {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: '库存管理_替换件_被替换件查询',
-      param: '物料名称_check=' + material_check + '&物料名称=' + material
+      name: '库存管理_离线外购件_出库查询'
    }
  })
 }
--- a/src/views/Inventory/DirectPart/index.vue
+++ b/src/views/Inventory/DirectPart/index.vue
@@ -334,12 +334,6 @@ export default {
        this.listLoading = false
      })
    },
-    // 查询采购合同明细
-    // searchContractDetailinfo() {
-    //   searchContractDetail(this.ContractValue).then(response => {
-    //     this.tableDataPurchase = response.data
-    //   })
-    // },
    // 查询直达件记录
    searchDirect(row) {
      this.purchaseContractNumber = row.采购合同明细流水号
--- a/src/views/Inventory/ExchangePart/index.vue
+++ b/src/views/Inventory/ExchangePart/index.vue
@@ -67,7 +67,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="120">
@@ -160,7 +160,7 @@
                  {{ scope.row.组号 }}
                </template>
              </el-table-column>
-              <el-table-column label="物料名称" align="center" min-width="80">
+              <el-table-column label="名称" align="center" min-width="80">
                <template slot-scope="scope">
                  {{ scope.row.物料名称 }}
                </template>
@@ -410,7 +410,23 @@ export default {
      searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
        this.total = response.data.total
        const data = response.data.rows
-        console.log(data)
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].组件零件基本件流水号 === '0') {
+            response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
+            response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
+          }
+        }
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].组件零件流水号 === '0') {
+            response.data.rows[i].物料名称 = response.data.rows[i].零件名称
+            response.data.rows[i].项目名称 = response.data.rows[i].基本件项目名称
+            response.data.rows[i].机床图号 = response.data.rows[i].基本件机床图号
+            response.data.rows[i].组号 = response.data.rows[i].基本件组号
+            response.data.rows[i].项目流水号 = response.data.rows[i].基本件项目流水号
+            response.data.rows[i].机床流水号 = response.data.rows[i].基本件机床流水号
+            response.data.rows[i].组件流水号 = response.data.rows[i].基本件组件流水号
+          }
+        }
        for (let i = 0; i < data.length; i++) {
          data[i].是否交换 === '1' || data[i].是否交换 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
        }
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -43,7 +43,8 @@
            size="mini"
            border
            style="width: 100%;"
-            height="200">
+            height="200"
+            @row-click="searchBasicPartRecord">
            <el-table-column
              label="序号"
              align="center"
@@ -812,12 +813,12 @@
            </el-table-column>
            <el-table-column label="出库时间" align="center" min-width="80">
              <template slot-scope="scope">
-                {{ scope.row.出库时间 ? scope.row.到货时间.split(' ')[0] : '' }}
+                {{ 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.领用者 }}
+                {{ scope.row.姓名 }}
              </template>
            </el-table-column>
          </el-table>
@@ -1026,7 +1027,7 @@
            size="mini"
            style="width: 100%;"
            height="200"
-            @row-click="HousePurchaseRecord">
+            @row-click="searchShopBasicPartRecord">
            <el-table-column
              label="序号"
              align="center"
@@ -1142,7 +1143,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>
@@ -1154,7 +1155,7 @@

 <script>
 import { mapGetters } from 'vuex'
-import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter, searchPurchaseBasicPart } from '@/api/Inventory/InventoryCheck'
+import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchStandardPart, searchGeneralPart, searchPurchasePartIn, searchPurchasePartOut, searchBasicPartIn, searchBasicPartOut, safeAmount, searchStandardPartIn, searchStandardPartOut, searchHourseBasicPart, searchHoursePurchasePart, CheckAlter, searchPurchaseBasicPart, searchShopPurchasePartOut, searchShopPurchasePartIn } from '@/api/Inventory/InventoryCheck'
 export default {
  data() {
    return {
@@ -1259,7 +1260,8 @@ export default {
      locate: '',
      contractdetail: '',
      craftnumber: '',
-      receive: '',
+      requestNumber: '', // 请购单明细流水号
+      receive: '', // 收件信息id
      name: '', // 名称
      mode: '', // 规格
      picture: '', // 图号
@@ -1410,7 +1412,6 @@ export default {
    },
    standardselecting(row) {
      this.contractDeatilNumber = row.采购合同明细流水号
-      this.steamPartNumber = row.组件零件流水号
      this.getStandardPartIn()
      this.getStandardPartOut()
    },
@@ -1425,8 +1426,10 @@ export default {
    // 查询标准件出库记录
    getStandardPartOut() {
      this.listLoading11 = true
-      searchStandardPartOut(this.steamPartNumber).then(response => {
+      searchStandardPartOut(this.contractDeatilNumber).then(response => {
+        console.log(response.data, 2345)
        this.StandardPartOut = response.data
+        console.log(this.StandardPartOut, 23456)
        this.listLoading11 = false
      })
    },
@@ -1524,6 +1527,25 @@ export default {
        this.BasicPartOut = response.data
      })
    },
+    // 查询车间外购记录
+    searchShopBasicPartRecord(row) {
+      this.listLoading4 = true
+      this.listLoading5 = true
+      this.requestNumber = row.请购单明细流水号
+      searchShopPurchasePartIn(this.requestNumber).then(response => {
+        this.HouseDataPurchaseIn = response.data
+        this.listLoading10 = false
+      })
+      searchShopPurchasePartOut(this.requestNumber).then(response => {
+        this.HouseDataPurchaseOut = response.data
+        this.listLoading11 = false
+      })
+    },
+    changesafeAmount(row) {
+      this.dialogFormVisible2 = true
+      this.teamPartNumber = row.组件零件流水号
+      this.form.safeNumber = row.安全库存量
+    },
    // 查询通用件记录
    searchGeneralPartRecord(row) {
      this.listLoading4 = true
@@ -1538,11 +1560,6 @@ export default {
        this.listLoading5 = false
      })
    },
-    changesafeAmount(row) {
-      this.dialogFormVisible2 = true
-      this.teamPartNumber = row.组件零件流水号
-      this.form.safeNumber = row.安全库存量
-    },
    // 修改安全库存量
    edeitsafeAmount() {
      safeAmount(this.teamPartNumber, this.form.safeNumber).then(response => {
@@ -1735,7 +1752,6 @@ export default {
      this.material = row.材料
    },
    AlterBasicNumber(row) {
-      console.log(row, 556677)
      this.project = row.项目流水号
      this.machinenumber = row.机床流水号
      this.partnumber = row.组件流水号
--- a/src/views/Inventory/SubstitutePart/index.vue
+++ b/src/views/Inventory/SubstitutePart/index.vue
@@ -67,7 +67,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="120">
@@ -76,6 +76,16 @@
          </template>
        </el-table-column>
      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="PageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="10"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
    </el-card>
    <el-card>
      <el-row>
@@ -306,6 +316,9 @@ export default {
      tableData1: [],
      tableData2: [],
      listNumber: '',
+      PageCurrent: 1,
+      PageSize: 10,
+      total: null,
      picikingPeople: '', // 领料人流水号
      partProjectNumber: '', // 项目流水号
      partProjectName: '', // 项目名称
@@ -404,8 +417,25 @@ export default {
        this.GroupNumValue_check = 1
      }
      this.listLoading = true
-      searchPurchasePart(this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        this.tableDataPurchase = response.data
+      searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].组件零件基本件流水号 === '0') {
+            response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
+            response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
+          }
+        }
+        for (let i = 0; i < response.data.rows.length; i++) {
+          if (response.data.rows[i].组件零件流水号 === '0') {
+            response.data.rows[i].物料名称 = response.data.rows[i].零件名称
+            response.data.rows[i].项目名称 = response.data.rows[i].基本件项目名称
+            response.data.rows[i].机床图号 = response.data.rows[i].基本件机床图号
+            response.data.rows[i].组号 = response.data.rows[i].基本件组号
+            response.data.rows[i].项目流水号 = response.data.rows[i].基本件项目流水号
+            response.data.rows[i].机床流水号 = response.data.rows[i].基本件机床流水号
+            response.data.rows[i].组件流水号 = response.data.rows[i].基本件组件流水号
+          }
+        }
+        this.tableDataPurchase = response.data.rows
        this.listLoading = false
      })
    },
@@ -424,7 +454,7 @@ export default {
      } else {
        this.materialName_check = 1
      }
-      searchSubstituted(this.materialName_check, this.materialName).then(response => {
+      searchSubstituted().then(response => {
        this.tableDataSub = response.data
      })
    },
@@ -501,6 +531,15 @@ export default {
    },
    submitEdit() {
      this.editTable(editSubstitutedCard, [this.substituteListNumber, this.form.ExchangeNumber, this.form.ExchangeNumberx, this.form.ExchangeNote], 'form', function() { this.getSubstitutedCard(); this.dialogFormVisible = false })
+    },
+    handleSizeChange(val) {
+      this.PageCurrent = 1
+      this.PageSize = val
+      this.searchPartinfo()
+    },
+    handleCurrentChange(val) {
+      this.PageCurrent = val
+      this.searchPartinfo()
    }
  }
 }