ll

src/views/Inventory/MaterialOut/index.vue

@@ -29,25 +29,36 @@
             {{ 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">
-            <el-tag v-if="Number(scope.row.是否启用)===1" type="warning" size="small">未确认</el-tag>
-            <el-tag v-else type="success" size="small">已确认</el-tag>
+            <el-tag v-if="Number(scope.row.是否审批)===0" type="warning" size="small">未审批</el-tag>
+            <el-tag v-else type="success" size="small">已审批</el-tag>
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="float:right;margin: 10px 0;">
-        <el-pagination
-          :current-page="pageCurrent3"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize3"
-          :total="total3"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange3"
-          @current-change="handleCurrentChange3"/>
-      </div>
-      <h4>领料单明细：{{ pickingListNumberShow }}</h4>
-      <el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail">
+      <el-row style="margin: 0;">
+        <el-col style="width: 300px">
+          <h4 style="margin-right: 100px;">领料单明细：{{ pickingListNumberShow }}</h4>
+        </el-col>
+        <el-col style="width: 300px;margin-top:15px">
+          <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="prepareConfirm()">备料确认</el-button>
+          <el-button :disabled="multipleSelection.length===0" size="small" type="primary" @click="inputPassword()">领料确认</el-button>
+        </el-col>
+        <el-col style="width:calc(100% - 600px)">
+          <div class="block" style="float:right;margin: 10px 0;">
+            <el-pagination
+              :current-page="pageCurrent3"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize3"
+              :total="total3"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange3"
+              @current-change="handleCurrentChange3"/>
+          </div>
+        </el-col>
+      </el-row>
+      <el-table :data="pickListTable2" highlight-current-row border style="width: 100%;" size="mini" height="400" @row-click="clickListDetail" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -89,17 +100,33 @@
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
+        <el-table-column v-if="true" label="备料确认" align="center" width="100">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已确认</el-tag>
+            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="true" label="领料确认" align="center" width="100">
+          <template slot-scope="scope">
+            <el-tag v-if="Number(scope.row.是否领料确认)===1" size="mini" type="success">已确认</el-tag>
+            <el-tag v-else type="warning" size="mini">未确认</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button size="mini" icon="el-icon-back" type="primary" disabled>归还</el-button>
+            <el-button :disabled="Number(scope.row.出库数量)<=0" size="mini" icon="el-icon-back" type="primary" @click="sendBack(scope.row)">归还</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
     <el-card>
-      <h4 style="margin-top:0">物料货位数量信息</h4>
-      <el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300">
+      <el-row>
+        <el-col :span="12">
+          <h4 style="margin-top:0">物料货位数量信息</h4>
+        </el-col>
+      </el-row>
+      <el-table :data="StockNumberTable" border style="width: 100%;" size="mini" height="300" show-summary>
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -126,7 +153,7 @@
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="货位存量" align="center" min-width="70">
+        <el-table-column label="货位存量" align="center" min-width="70" prop="货位存量">
           <template slot-scope="scope">
             {{ scope.row.货位存量 }}
           </template>
@@ -143,8 +170,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="200px">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>
-            <el-button size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>
+            <el-button :disabled="审批未通过" size="mini" type="primary" @click="outStore(scope.row)">出库</el-button>
+            <el-button :disabled="审批未通过" size="mini" type="warning" @click="errorRecord(scope.row)">异常记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -215,16 +242,63 @@
         <el-button type="primary" @click="submitErrorRecord()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible3" title="领料确认" center width="380px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left">
+        <el-form-item label="领料人" prop="personName" label-width="100px" size="small">
+          <el-input v-model="form3.personName" readonly size="small" placeholder="领料人" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="密码" prop="password" label-width="100px" size="small">
+          <el-input v-model="form3.password" size="small" placeholder="密码" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3=false">取消</el-button>
+        <el-button type="primary" @click="pickConfirm()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible4" title="归还" center width="380px">
+      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left">
+        <el-form-item label="仓库" prop="仓库流水号" label-width="100px" size="small">
+          <el-select v-model="form4.仓库流水号" placeholder="仓库名称" @change="getLocate">
+            <el-option
+              v-for="item in inventoryName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="货位" prop="货位流水号" label-width="100px" size="small">
+          <el-select v-model="form4.货位流水号" placeholder="货位名称">
+            <el-option
+              v-for="item in locateName"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="归还数量" prop="归还数量" label-width="100px" size="small">
+          <el-input-number :min="0" :max="最大归还量" v-model="form4.归还数量" size="small" placeholder="归还数量" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible4=false">取消</el-button>
+        <el-button type="primary" @click="submitSendBack()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType } from '@/api/Inventory/MaterialOut'
+import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut'
 import { mapGetters } from 'vuex'
+import request from '@/utils/request'
 export default {
   name: 'MaterialOut',
   data() {
     return {
+      multipleSelection: [],
       pickingListNum: '', // 领料单流水号
       pickingPersonNum: '', // 领料人流水号
       pickingListNumber: '',
@@ -237,6 +311,8 @@ export default {
       StockNumberTable: [],
       dialogFormVisible1: false,
       dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
       outType: [],
       form1: {
         machineValue: '',
@@ -253,6 +329,15 @@ export default {
         基本件流水号: '',
         货位流水号: ''
       },
+      form3: {
+        personName: '',
+        password: ''
+      },
+      form4: {
+        仓库流水号: '',
+        货位流水号: '',
+        归还数量: ''
+      },
       rules1: {
         machineValue: [{ required: true, message: '请选择' }],
         groupNumValue: [{ required: true, message: '请选择' }],
@@ -264,6 +349,14 @@ export default {
         errorNumber: [{ required: true, message: '请输入' }],
         reason: [{ required: true, message: '请输入' }]
       },
+      rules3: {
+        password: [{ required: true, message: '请输入' }]
+      },
+      rules4: {
+        仓库流水号: [{ required: true, message: '请输入' }],
+        货位流水号: [{ required: true, message: '请输入' }],
+        归还数量: [{ required: true, message: '请输入' }]
+      },
       machine: [],
       group: [],
       person: [],
@@ -275,7 +368,16 @@ export default {
       parchasePartNum: '', // 中间变量标准件和外购件流水号
       inventoryNum: '', // 中间变量仓库流水号
       locationNum: '', // 中间变量货位流水号
-      outNumber: 0 // 中间变量出库数量
+      outNumber: 0, // 中间变量出库数量
+      inventoryName: [],
+      locateName: [],
+      物料流水号: '',
+      基本件流水号: '',
+      标准件和外购件流水号: '',
+      领料单流水号: '',
+      请购单明细流水号: '',
+      最大归还量: '',
+      审批未通过: true
     }
   },
   computed: {
@@ -286,8 +388,154 @@ export default {
   mounted() {
     this.fetchData()
     this.searchList()
+    this.getHouse()
   },
   methods: {
+    // 获取仓库
+    async getHouse() {
+      const param = {
+        url: '',
+        method: 'post',
+        data: {
+          type: '1',
+          name: '库存管理_货位主文件_仓库查询'
+        }
+      }
+      request(param).then(res => {
+        for (let i = 0; i < res.data.length; i++) {
+          this.inventoryName.push({
+            label: res.data[i].仓库名称,
+            value: res.data[i].仓库流水号
+          })
+        }
+      })
+    },
+    // 获取货位
+    async getLocate() {
+      this.locateName = []
+      this.form4.货位流水号 = ''
+      const param = {
+        url: '',
+        method: 'post',
+        data: {
+          type: '1',
+          name: '库存管理_货位主文件_查询数据',
+          param: `仓库流水号=${this.form4.仓库流水号}`
+        }
+      }
+      request(param).then(res => {
+        for (let i = 0; i < res.data.length; i++) {
+          this.locateName.push({
+            label: res.data[i].货位名称,
+            value: res.data[i].货位流水号
+          })
+        }
+      })
+    },
+    // 归还
+    sendBack(row) {
+      this.dialogFormVisible4 = true
+      this.物料流水号 = row.物料流水号
+      this.基本件流水号 = row.基本件流水号
+      this.标准件和外购件流水号 = row.标准件和外购件流水号
+      this.请购单明细流水号 = row.请购单明细流水号
+      this.领料单流水号 = row.领料单流水号
+      this.最大归还量 = row.出库数量
+    },
+    // 提交归还
+    submitSendBack() {
+      sendBack(this.form4.货位流水号, this.物料流水号, this.form4.归还数量, this.id, this.基本件流水号, this.标准件和外购件流水号, this.请购单明细流水号, this.form4.仓库流水号, this.领料单流水号).then(res => {
+        console.log(res)
+        if (res.data[0].result === '1') {
+          this.$message.success('操作成功')
+          this.dialogFormVisible4 = false
+          this.clickListDetail()
+          this.clickList()
+        } else {
+          this.$message.error('操作失败')
+        }
+      })
+    },
+    // 多选
+    handleSelectionChange(val) {
+      this.multipleSelection = []
+      val.map(v => {
+        this.multipleSelection.push(v.领料单明细流水号)
+      })
+    },
+    // 备料确认
+    prepareConfirm() {
+      this.$confirm('是否备料确认?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const param = {
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `update 车间装配管理_领料单明细 set 是否备料确认 = 1 where 领料单明细流水号 in (${this.multipleSelection})`
+          }
+        }
+        request(param).then(res => {
+          if (res.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.clickList()
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+    // 领料确认
+    inputPassword() {
+      this.dialogFormVisible3 = true
+    },
+    // 提交领料确认
+    pickConfirm() {
+      this.$confirm('是否领料确认?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const param = {
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `update 车间装配管理_领料单明细 set 是否领料确认 = 1 where 领料单明细流水号 in (${this.multipleSelection})`
+          }
+        }
+        pickingSubmit(this.pickingPersonNum, this.form3.password).then(res => {
+          if (res.data[0].result === 'success') {
+            request(param).then(res => {
+              if (res.data[0].result === '1') {
+                this.$message.success('操作成功')
+                this.dialogFormVisible3 = false
+                this.clickList()
+              } else {
+                this.$message.error('操作失败')
+              }
+            })
+          } else if (res.data[0].result === 'error') {
+            this.$message.error('密码错误')
+          } else {
+            this.$message.error('操作失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
     // 初始化数据
     fetchData() {
       this.person = []
@@ -351,9 +599,12 @@ export default {
     },
     // 查看领料单明细
     clickList(row) {
+      console.log(row)
+      row && Number(row.是否审批) ? this.审批未通过 = false : this.审批未通过 = true
       row && row.领料单流水号 ? this.pickingListNum = row.领料单流水号 : this.pickingListNum
       row && row.人员编号 ? this.pickingPersonNum = row.人员编号 : this.pickingListNum
       row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
+      row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName
       searchListDetail(this.pickingListNum).then(res => {
         this.pickListTable2 = res.data
       })