lx part out

src/api/Inventory/OfflinePurchase.js

@@ -73,16 +73,51 @@ export function addRequestCardDetail(data1, data2) {
     }
   })
 }
-// 请购单明细增加
-export function alterNumber(data1, data2) {
+// 请购单明细修改
+export function alterNumber(data1, data2, data3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_离线请购单_请购单明细修改',
-      param: '离线请购单明细流水号=' + data1 + '&数量=' + data2
+      param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3
+    }
+  })
+}
+// 请购单删除
+export function deleteRequest(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_离线请购单_请购单删除',
+      param: '离线请购单流水号=' + data1
+    }
+  })
+}
+// 请购单明细删除
+export function deleteRequestDetail(data1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '库存管理_离线请购单_请购单明细删除',
+      param: '离线请购单明细流水号=' + data1
+    }
+  })
+}
+// 设置安全库存
+export function setSafeValue(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线合同_物料安全库存_修改数据',
+      param: `物料流水号=${params[0]}&安全库存量=${params[1]}`
     }
   })
 }
-

src/views/Inventory/OfflinePurchase/index.vue

@@ -62,12 +62,12 @@
             {{ scope.row.供货商 }}
           </template>
         </el-table-column>
-        <el-table-column label="当前库存量" min-width="200" 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="200" 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"/>
@@ -131,7 +131,6 @@
         style="margin-left: 10px"
         @click="addMateriel">选入物料</el-button>
     </el-card>
-
     <el-card>
       <el-table v-loading="" :data="tableData2" 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">
@@ -145,14 +144,14 @@
             {{ 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.请购人编号 }}
+            {{ 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.仓库流水号 }}
+            {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
         <el-table-column label="请购时间" align="center" width="100">
@@ -162,8 +161,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="280" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="parseInt(scope.row.离线合同状态)!==1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
-            <el-button type="warning" size="mini" icon="el-icon-download">传递</el-button>
+            <el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -177,8 +175,9 @@
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
+        <el-button style="margin-left:500px;" type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
       </div>
-      <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 300px;" height="300px" size="mini" show-summary>
+      <el-table v-loading="" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini">
         <el-table-column label="离线请购单编号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.请购单编号 }}
@@ -211,121 +210,11 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
-      <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商名称">
-              <el-input v-model="supplierName" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业性质">
-              <el-input v-model="enterpriseNature" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="货期">
-              <el-input v-model="goodTime" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input v-model="registeredCapital" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="税号">
-              <el-input v-model="taxNum" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input v-model="EMail" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="地址">
-              <el-input v-model="address" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账号">
-              <el-input v-model="account" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="开户行">
-              <el-input v-model="openingBank" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电话号码">
-              <el-input v-model="phone" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input v-model="fax" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-button
-              type="success"
-              size="small"
-              icon="el-icon-search"
-              @click="searchSupplier">查询</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitSelectSupplier">确定</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-delete"
-              @click="emptySupplierDetail">清空</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail">
-          <el-table-column align="center" label="供应商名称" min-width="250">
-            <template slot-scope="scope">
-              {{ scope.row.供应商名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="企业性质" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.企业性质 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="创立日期" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="注册资本" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.注册资本 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail } from '@/api/Inventory/OfflinePurchase'
+import { searchRequestCard, initWarehouse, addRequestCard, searchInventoryNum, SeeDetail, addRequestCardDetail, deleteRequest, deleteRequestDetail, alterNumber, setSafeValue } from '@/api/Inventory/OfflinePurchase'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -395,7 +284,7 @@ export default {
       disable2: true,
       disable3: true,
       disable4: true,
-      disable: true, // 其他的禁用
+      disable: false, // 其他的禁用
       House: [],
       HouseNumber: ''
     }
@@ -427,6 +316,8 @@ export default {
     searchTable2() {
       if (this.purchasecard === '') {
         this.purchasecard_check = 0
+      } else {
+        this.purchasecard_check = 1
       }
       searchRequestCard(this.pageCurrent2, this.pageSize2, this.purchasecard_check, this.purchasecard).then(response => {
         this.tableData2 = response.data.rows
@@ -450,6 +341,11 @@ export default {
       }
       searchInventoryNum(this.pageCurrent1, this.pageSize1, this.materialName_check, this.materialName, this.inventoryStateValue_check, this.inventoryStateValue).then(response => {
         this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'changeSafeValue', false)
+          v.原安全库存量 = v.安全库存量
+          return v
+        })
         this.total1 = response.data.total
       })
     },
@@ -465,15 +361,17 @@ export default {
     addTableData() {
       if (this.HouseNumber === '') {
         this.$message.error('请选择仓库')
+      } else {
+        console.log(this.id, this.HouseNumber)
+        addRequestCard(this.id, this.HouseNumber).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('添加成功')
+            this.searchTable2()
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
       }
-      console.log(this.id, this.HouseNumber)
-      addRequestCard(this.id, this.HouseNumber).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.error('添加成功')
-        } else {
-          this.$message.error('添加失败')
-        }
-      })
     },
     handleSelectionChange(val) {
       this.materielGroup = []
@@ -496,6 +394,96 @@ export default {
           }
         })
       }
+    },
+    deleteOfflineContract(row) { // 删除请购单
+      this.$confirm('确定删除该请购单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteRequest(row.离线请购单流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchTable2()
+            SeeDetail(this.purchasecardnumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    deleteMateriel(row) { // 删除请购单明细
+      this.$confirm('确定移除该物料?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteRequestDetail(row.离线请购单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('移除成功')
+            this.searchTable2()
+            SeeDetail(this.purchasecardnumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('移除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消作废'
+        })
+      })
+    },
+    cancelEdit(row) { // 取消设置
+      row.安全库存量 = row.原安全库存量
+      row.changeSafeValue = false
+      this.$message('取消修改')
+    },
+    confirmEdit(row) { // 确认设置
+      Number(row.安全库存量) ? row.安全库存量 = Number(row.安全库存量) : row.安全库存量 = 0
+      setSafeValue(row.物料流水号, parseInt(row.安全库存量)).then(response => {
+        if (response.data[0].result === '1') {
+          row.changeSafeValue = false
+          this.$message.success('设置成功')
+          this.searchTable1()
+        } else {
+          this.$message.error('设置失败')
+        }
+      })
+    },
+    // 传递请购单
+    doneRequestCard() {
+      this.$confirm('确定传递请购单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.partGroup = []
+        this.numGroup = []
+        for (let i = 0; i < this.tableData3.length; i++) {
+          this.partGroup.push(this.tableData3[i].离线请购单明细流水号)
+          this.numGroup.push(this.tableData3[i].数量)
+        }
+        alterNumber(this.purchasecardnumber, this.partGroup, this.numGroup).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('请购单生成成功')
+            this.searchTable2()
+            SeeDetail(this.purchasecardnumber).then(response => {
+              this.tableData3 = response.data
+            })
+          } else { this.$message.error('请购单生成失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
     }
   }
 }

src/views/Inventory/PartOut/index.vue

@@ -39,6 +39,7 @@
       <el-table
         v-loading="listLoading1"
         :data="tableDataPicking"
+        size="mini"
         border
         style="width: 100%;"
         height="400">
@@ -47,12 +48,12 @@
           align="center"
           type="index"
           width="50"/>
-        <el-table-column label="项目名称" align="center" min-width="130">
+        <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="130">
+        <el-table-column label="机床图号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -62,17 +63,17 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="领用数量" align="center" min-width="130">
+        <el-table-column label="领用数量" align="center" width="50">
           <template slot-scope="scope">
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="130">
+        <el-table-column label="仓库" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位" align="center" min-width="130">
+        <el-table-column label="货位" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
           </template>
@@ -87,13 +88,29 @@
             {{ scope.row.类型名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="80">
+        <el-table-column label="操作" align="center" min-width="200">
           <template slot-scope="scope">
+            <el-button :disabled="scope.row.是否出库" size="small" type="danger" icon="el-icon-back" style="margin: 0 0 0 0px" @click="ErrorpartOut(scope.row)">异常</el-button>
             <el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
+    <!--异常出库对话框-->
+    <el-dialog :visible.sync="dialogFormVisible1" title="编辑直达件" center width="380px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left">
+        <el-form-item label="异常数量" prop="ContractNumberValue" label-width="100px" size="small">
+          <el-input v-model="form.ErrorNumber" size="small" placeholder="到货数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="异常原因" prop="TotalContractAmount" label-width="100px">
+          <el-input v-model="form.Reason" size="small" placeholder="请输入备注" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="callOff('form')">取消</el-button>
+        <el-button type="primary" @click="editDirectPartm()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -131,7 +148,15 @@ export default {
       outNote: '', // 出库备注
       getpicikingPeople: '', // 领料人
       listLoading: '',
-      listLoading1: ''
+      listLoading1: '',
+      rules: { // 表单验证规则
+        ErrorNumber: [{ required: true, message: '请输入直达件数量', trigger: 'blur' }],
+        Reason: [{ required: true, message: '请选择领用人', trigger: 'blur' }]
+      },
+      form: {
+        ErrorNumber: '',
+        Reason: ''
+      }
     }
   },
   computed: {
@@ -209,6 +234,9 @@ export default {
           } else { this.$message.error('增加失败') }
         })
       }
+    },
+    ErrorpartOut() {
+      console.log(21231)
     }
   }
 }

src/views/Inventory/PickingList/index.vue

@@ -285,6 +285,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.类型名称 }}