lx

src/api/BasicData/ShiftManagement.js

@@ -60,7 +60,7 @@ export function deleteShift(shiftCode) {
     }
   })
 }
-// 删除班次
+// 班次类型与工作时间增加
 export function addShiftType() {
   return request({
     url: '',

src/api/Inventory/InventoryCheck.js

@@ -212,14 +212,14 @@ export function searchHoursePurchasePart(pageCurrent, pageSize, project_check, p
   })
 }
 // 车间采购库存盘点修改
-export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, alterdate, craftnumber, materialType, materiallocate) {
+export function CheckAlter(receive, project, machinenumber, partnumber, oldnumber, reason, number, people, locate, contractdetail, craftnumber, materialType, materiallocate, name, mode, picture, type, material) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_库存盘点_修改数量',
-      param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate
+      param: '收件信息ID=' + receive + '&项目流水号=' + project + '&机床流水号=' + machinenumber + '&组件流水号=' + partnumber + '&原数量=' + oldnumber + '&修改原因=' + reason + '&数量=' + number + '&人员编号=' + people + '&货位流水号=' + locate + '&采购合同明细流水号=' + contractdetail + '&工艺计划流水号=' + craftnumber + '&零件类型代码=' + materialType + '&物料与货位对照流水号=' + materiallocate + '&名称=' + name + '&规格=' + mode + '&图号=' + picture + '&型号=' + type + '&材料=' + material
     }
   })
 }

src/api/Inventory/PartOut.js

@@ -36,15 +36,28 @@ export function ListDetailOut(listNumber) {
     }
   })
 }
+// 交换件查询
+export function ExchangeOut(listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_零件出库_交换件查询',
+      param: '领料单流水号=' + listNumber
+    }
+  })
+}
+
 // 外购件零件出库
-export function PurchasePart(data1, data2, data3, data4, data5) {
+export function PurchasePart(data1, data2, data3, data4, data5, data6) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_外购件出库_修改数据',
-      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
     }
   })
 }
@@ -61,18 +74,18 @@ export function BasicPart(data1, data2, data3, data4, data5) {
   })
 }
 // 车间采购件零件出库
-export function WorkShopPart(data1, data2, data3, data4, data5) {
+export function WorkShopPart(data1, data2, data3, data4, data5, data6) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_车间采购出库_修改数据',
-      param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '请购单明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&物料与货位对照流水号=' + data5 + '&备注=' + data6
     }
   })
 }
-// 车间采购件零件出库
+// 异常出库
 export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12) {
   return request({
     url: '',

src/views/Inventory/ExchangePart/index.vue

@@ -432,7 +432,6 @@ export default {
       this.listLoading1 = true
       searchExchangePart(this.PageCurrent1, this.PageSize1).then(response => {
         const data = response.data.rows
-        console.log(data, 2233)
         for (let i = 0; i < data.length; i++) {
           data[i].审批通过 === '1' || data[i].审批通过 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
         }

src/views/Inventory/InboundCard/index.vue

@@ -1021,7 +1021,7 @@ export default {
       const printNode = $(htmlNode)
       body.append(printNode)
       window.print()
-      body.children().show()
+      body.children().not('script').show()
       printNode.remove()
     }
   }

src/views/Inventory/InventoryCheck/index.vue

@@ -79,13 +79,13 @@
                 {{ 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
                   type="primary"
                   size="mini"
                   icon="el-icon-edit"
-                  @click="AlterNumber(scope.row)">设置</el-button>
+                  @click="AlterBasicNumber(scope.row)">设置</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -565,12 +565,12 @@
             </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">
               <template slot-scope="scope">
-                {{ scope.row.类型名称 }}
+                {{ scope.row.外购件类型 }}
               </template>
             </el-table-column>
             <el-table-column label="安全库存" align="center" min-width="80">
@@ -580,8 +580,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="200px">
               <template slot-scope="scope" align="center">
-                <el-button size="mini" type="warning" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
+                <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 0px" @click="AlterNumber(scope.row)" >设置</el-button>
-                <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
+                <el-button size="mini" type="danger" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -1259,7 +1259,12 @@ export default {
       locate: '',
       contractdetail: '',
       craftnumber: '',
-      receive: ''
+      receive: '',
+      name: '', // 名称
+      mode: '', // 规格
+      picture: '', // 图号
+      type: '', // 型号
+      material: '' // 材料
     }
   },
   computed: {
@@ -1314,7 +1319,6 @@ export default {
       this.GroupNum = []
       this.MachineValue = ''
       this.GroupNumValue = ''
-      console.log(this.ProjectValue)
       if (this.ProjectValue !== '') {
         searchmachine(1, this.ProjectValue).then(response => {
           for (let i = 0; i < response.data.length; i++) {
@@ -1559,7 +1563,7 @@ export default {
       this.$refs[formName].resetFields()
     },
     tableRowClassName1({ row }) {
-      if (row.安全库存量 > row.库存数量) {
+      if (Number(row.安全库存量) > Number(row.货位存量)) {
         return 'background: #ff6666'
       } else {
         return ''
@@ -1713,6 +1717,25 @@ export default {
       })
     },
     AlterNumber(row) {
+      this.project = row.项目流水号
+      this.machinenumber = row.机床流水号
+      this.partnumber = row.组件流水号
+      this.oldnumber = row.货位存量
+      this.locate = row.货位流水号
+      this.contractdetail = row.采购合同明细流水号
+      this.craftnumber = row.工艺计划流水号
+      this.receive = row.收件信息id
+      this.materiallocate = row.物料与货位对照流水号
+      this.materialType = row.零件类型代码
+      this.dialogFormVisible = true
+      this.name = row.物料名称
+      this.mode = row.物料规格
+      this.picture = row.零件图号
+      this.type = row.物料型号
+      this.material = row.材料
+    },
+    AlterBasicNumber(row) {
+      console.log(row, 556677)
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号
@@ -1720,13 +1743,18 @@ export default {
       this.locate = row.货位流水号
       this.contractdetail = row.采购合同明细流水号
       this.craftnumber = row.工艺计划流水号
-      this.receive = row.收件信息ID
+      this.receive = row.收件信息id
       this.materiallocate = row.物料与货位对照流水号
-      this.materialType = row.零件类型代码
+      this.materialType = row.零件类型
       this.dialogFormVisible = true
+      this.name = row.零件名称
+      this.mode = row.物料规格
+      this.picture = row.零件图号
+      this.type = row.物料型号
+      this.material = row.材料
     },
     submitChannge() {
-      CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate).then(response => {
+      CheckAlter(this.receive, this.project, this.machinenumber, this.partnumber, this.oldnumber, this.form2.AlterReason, this.form2.Number, this.id, this.locate, this.contractdetail, this.craftnumber, this.materialType, this.materiallocate, this.name, this.mode, this.picture, this.type, this.material).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('修改成功')
           this.dialogFormVisible = false

src/views/Inventory/OfflinePurchase/index.vue

@@ -551,7 +551,7 @@ export default {
       const printNode = $(htmlNode)
       body.append(printNode)
       window.print()
-      body.children().show()
+      body.children().not('script').show()
       printNode.remove()
     },
     // 传递请购单

src/views/Inventory/PartOut/index.vue

@@ -93,6 +93,61 @@
         </el-table-column>
       </el-table>
     </el-card>
+    <el-card>
+      <el-table
+        v-loading="listLoading1"
+        :data="tableDataExchange"
+        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="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>
+    </el-card>
     <!--异常出库对话框-->
     <el-dialog :visible.sync="dialogFormVisible" title="异常出库" center width="380px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left">
@@ -112,7 +167,7 @@
 </template>
 
 <script>
-import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut } from '@/api/Inventory/PartOut'
+import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut, ErrorOut, ExchangeOut } from '@/api/Inventory/PartOut'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -160,6 +215,7 @@ export default {
       projectnumber: '',
       machinenumber: '',
       teamnumber: '',
+      tableDataExchange: [], // 交换件列表
       purchaseDeatileNumber: '', // 采购合同明细流水号
       askPurchaseNumber: '', // 请购单明细流水号
       craftnumber: '', // 工艺计划流水号
@@ -195,6 +251,13 @@ export default {
         this.listLoading = false
       })
     },
+    // 查询交换单
+    searchExchange() {
+      ExchangeOut(this.pickingListNumberx).then(response => {
+        const data = response.data
+        this.tableDataExchange = data
+      })
+    },
     // 查询领料单明细
     searchListDetailt() {
       this.listLoading1 = true
@@ -212,13 +275,14 @@ export default {
     chooseListinfor(row) {
       this.pickingListNumberx = row.领料单流水号
       this.getpicikingPeople = row.领料人流水号
-      console.log(this.pickingListNumberx)
+      console.log(this.pickingListNumberx, 223344)
       this.searchListDetailt()
+      this.searchExchange()
     },
     // 出库
     partOut(row) {
       if (row.出库类型 === 3) {
-        WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
+        WorkShopPart(row.请购单明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
           if (response.data[0].result === '1') {
             ListDetailOut(row.领料单明细流水号)
             this.$message.success('出库成功')
@@ -226,7 +290,7 @@ export default {
           } else { this.$message.error('出库失败') }
         })
       } else if (row.出库类型 === 2) {
-        PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
+        PurchasePart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.物料与货位对照流水号, row.备注).then(response => {
           if (response.data[0].result === '1') {
             ListDetailOut(row.领料单明细流水号)
             this.$message.success('出库成功')

src/views/Inventory/PartsReplacement/index.vue

@@ -724,7 +724,7 @@ export default {
       const printNode = $(htmlNode)
       body.append(printNode)
       window.print()
-      body.children().show()
+      body.children().not('script').show()
       printNode.remove()
     }
   }

src/views/Inventory/PickingList/index.vue

@@ -244,7 +244,7 @@
           align="center"
           type="index"
           width="50"/>
-        <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>
@@ -259,6 +259,11 @@
             {{ 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.项目名称 }}
@@ -327,7 +332,7 @@
           align="center"
           type="index"
           width="50"/>
-        <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>
@@ -667,6 +672,17 @@ export default {
             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
         this.total1 = response.data.total