From 03b3dbbb0fe7613d8d9d66f7c8191bdcfcf474ca Mon Sep 17 00:00:00 2001
From: bryan sun <hitsjt@gmail.com>
Date: Fri, 13 Dec 2019 09:14:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/MaterialOut.js             |  23 +++-
 src/api/Inventory/OfflinePartOut.js          |  21 ++++
 src/utils/request.js                         |   6 +-
 src/views/Inventory/MaterialOut/index.vue    | 107 ++++++++++++-----
 src/views/Inventory/OfflinePartOut/index.vue | 116 +++++++++++++++----
 5 files changed, 216 insertions(+), 57 deletions(-)

diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index 34be6e77..797881b9 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -103,7 +103,7 @@ export function submitOutStore(...params) {
     data: {
       type: '2',
       name: '库存管理_物料出库_出库记录_增加数据_循环',
-      param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}&离线采购件流水号组=${params[12]}&领料部门=${params[12]}`
+      param: `领料单明细水号组=${params[0]}&基本件流水号组=${params[1]}&物料流水号组=${params[2]}&标准件和外购件流水号组=${params[3]}&请购单明细流水号组=${params[4]}&组件流水号组=${params[5]}&机床流水号组=${params[6]}&出库数量组=${params[7]}&出库人流水号=${params[8]}&领料人编号=${params[9]}&出库类别=${params[10]}&领料单流水号=${params[11]}&离线采购件流水号组=${params[12]}&领料部门=${params[13]}`
     }
   })
 }
@@ -186,3 +186,24 @@ export function setPickingList() {
     }
   })
 }
+export function selectdepartment() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '出库管理_部门查询'
+    }
+  })
+}
+export function selectleaders(department) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '出库管理_人员查询',
+      param: '考核部门编号=' + department
+    }
+  })
+}
diff --git a/src/api/Inventory/OfflinePartOut.js b/src/api/Inventory/OfflinePartOut.js
index 90c313d2..9e95f46b 100644
--- a/src/api/Inventory/OfflinePartOut.js
+++ b/src/api/Inventory/OfflinePartOut.js
@@ -85,3 +85,24 @@ export function outRecord(...params) {
     }
   })
 }
+export function selectdepartment() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '出库管理_部门查询'
+    }
+  })
+}
+export function selectleaders(department) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '出库管理_人员查询',
+      param: '考核部门编号=' + department
+    }
+  })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..059fb22e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic
 export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
 export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
 export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
-export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
+export const url = `http://192.168.0.104:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://192.168.0.104:8079/submit/downloadFile.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.104:8079/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 020fa906..b9199e7f 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -5,8 +5,8 @@
         <span style="margin: 5px">领料单编号:</span>
         <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
         <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
-        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>
-        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right" @click="inputPassword()">领料确认</el-button>
+        <!--        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
+        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
     <div style="width: 27%;float: left;margin-right: 16px">
@@ -84,12 +84,12 @@
               {{ scope.row.出库数量1 }}
             </template>
           </el-table-column>
-          <el-table-column v-if="true" label="备料" align="center" width="60">
-            <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="60">-->
+          <!--            <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="60">-->
           <!--            <template slot-scope="scope">-->
           <!--              <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领</el-tag>-->
@@ -189,7 +189,23 @@
           </el-select>
         </el-form-item>
         <el-form-item label="领料部门" label-width="100px" size="small">
-          <el-input v-model="form3.department" size="small" placeholder="领料部门" style="width: 200px"/>
+          <!--          <el-input v-model="form3.department" size="small" placeholder="领料部门" style="width: 200px"/>-->
+          <el-select v-model="form3.department" placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
+            <el-option
+              v-for="item in departments"
+              :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="form3.DirectNote" placeholder="请选择领料人" size="small" clearable style="width: 200px;">
+            <el-option
+              v-for="item in DirectNotes"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </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"/>
@@ -234,7 +250,7 @@
 </template>
 
 <script>
-import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, submitOutStore, initOutType } from '@/api/Inventory/MaterialOut'
+import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, submitOutStore, initOutType, selectdepartment, selectleaders } from '@/api/Inventory/MaterialOut'
 import { mapGetters } from 'vuex'
 import request from '@/utils/request'
 export default {
@@ -276,7 +292,8 @@ export default {
       form3: {
         outTypeValue: '',
         department: '',
-        password: ''
+        password: '',
+        DirectNote: ''
       },
       form4: {
         仓库流水号: '',
@@ -319,6 +336,9 @@ export default {
       offlineNum: [],
       inventoryName: [],
       locateName: [],
+      departments: [],
+      DirectNotes: [],
+      department111: '', // 领料部门中间变量
       物料流水号: '',
       基本件流水号: '',
       标准件和外购件流水号: '',
@@ -359,6 +379,27 @@ export default {
         }
       })
     },
+    selectDepartment() {
+      selectdepartment().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.departments.push({
+            label: response.data[i].部门名称,
+            value: response.data[i].考核部门编号
+          })
+        }
+      })
+    },
+    selectLeaders() {
+      this.DirectNotes = []
+      selectleaders(this.form3.department).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.DirectNotes.push({
+            label: response.data[i].姓名,
+            value: response.data[i].考勤编号
+          })
+        }
+      })
+    },
     // 获取货位
     async getLocate() {
       this.locateName = []
@@ -438,7 +479,8 @@ export default {
     inputPassword() {
       this.form3.outTypeValue = 21
       this.form3.password = ''
-      this.form3.department = '装配'
+      this.selectDepartment()
+      this.departments = []
       this.dialogFormVisible3 = true
     },
     selectable(row, index) { // 控制某行是否可选
@@ -564,23 +606,32 @@ export default {
           this.outNumber.push(this.pickListTable2[i].出库数量)
         }
       }
-      submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.password, this.form3.outTypeValue, this.pickingListNum, this.offlineNum, this.form3.department).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('出库成功')
-          this.dialogFormVisible3 = false
-          searchListDetail(this.pickingListNum).then(res => {
-            for (let i = 0; i < res.data.length; i++) {
-              if (res.data[i].离线采购件流水号 !== 0) {
-                res.data[i].货位存量1 = res.data[i].货位存量
+      if (Number(this.form3.password) === Number(this.form3.DirectNote)) {
+        for (let i = 0; i < this.departments.length; i++) {
+          if (this.form3.department === this.departments[i].value) {
+            this.department111 = this.departments[i].label
+          }
+        }
+        submitOutStore(this.multipleSelection, this.basePartNum, this.materialNum, this.parchasePartNum, this.purchaseBillNum, this.groupNumValue, this.machineValue, this.outNumber, this.id, this.form3.DirectNote, this.form3.outTypeValue, this.pickingListNum, this.offlineNum, this.department111).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('出库成功')
+            this.dialogFormVisible3 = false
+            searchListDetail(this.pickingListNum).then(res => {
+              for (let i = 0; i < res.data.length; i++) {
+                if (res.data[i].离线采购件流水号 !== 0) {
+                  res.data[i].货位存量1 = res.data[i].货位存量
+                }
+                if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
+                  res.data[i].货位存量1 = res.data[i].货位存量
+                }
               }
-              if (res.data[i].请购单明细流水号 !== 0 && res.data[i].请购单明细流水号 !== '' && res.data[i].请购单明细流水号 !== null) {
-                res.data[i].货位存量1 = res.data[i].货位存量
-              }
-            }
-            this.pickListTable2 = res.data
-          })
-        } else { this.$message.error('操作失败') }
-      })
+              this.pickListTable2 = res.data
+            })
+          } else { this.$message.error('操作失败') }
+        })
+      } else {
+        this.$message.error('人员编号错误')
+      }
     },
     // 提交出库
     submitOutStore() {
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 2c0015ea..e9a2284f 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -137,7 +137,7 @@
       </div>
     </el-card>
     <!--零件出库对话框-->
-    <el-dialog :visible.sync="dialogFormVisible" title="零件出库" center width="380px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="零件出库" center width="380px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left">
         <el-form-item label="项目" prop="ProjectValue" label-width="100px">
           <el-select v-model="form.ProjectValue" filterable size="small" placeholder="项目" style="width: 200px;margin-right:10px" @change="searchMachine()">
@@ -169,12 +169,33 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <!--</el-form-item>-->
-        <el-form-item label="领料部门" prop="department" label-width="100px" size="small">
-          <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>
+        <!--        <el-form-item label="领料部门" prop="department" label-width="100px" size="small">-->
+        <!--          <el-input v-model="form.department" size="small" placeholder="领料部门" style="width: 200px"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="部门" prop="部门" label-width="100px" size="small">
+          <el-select v-model="form.department" placeholder="请选择部门" size="small" clearable style="width: 200px;" @change="selectLeaders">
+            <el-option
+              v-for="item in departments"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="领料人" prop="DirectNote" label-width="100px">
-          <el-input v-model="form.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>
+        <el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
+          <el-select v-model="form.DirectNote" placeholder="请选择领料人" size="small" clearable style="width: 200px;">
+            <el-option
+              v-for="item in DirectNotes"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </el-form-item>
+        <el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px">
+          <el-input v-model="form.DirectNoteCode" size="small" placeholder="请输入人员编号" style="width: 200px"/>
+        </el-form-item>
+        <!--        <el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
+        <!--          <el-input v-model="form.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="callOff('form')">取消</el-button>
@@ -185,7 +206,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchTeam, searchPart, searchPeople, outlinePartOut, outRecord } from '@/api/Inventory/OfflinePartOut'
+import { initProject, searchmachine, searchTeam, searchPart, searchPeople, outlinePartOut, outRecord, selectdepartment, selectleaders } from '@/api/Inventory/OfflinePartOut'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -208,13 +229,15 @@ export default {
         MachineValue: '',
         GroupNumValue: '',
         department: '',
-        DirectNumber: '',
+        DirectNumber: 1,
         PeopleValue: '',
-        DirectNote: ''
+        DirectNote: '',
+        DirectNoteCode: ''
       },
       rules: { // 表单验证规则
         ProjectValue: [{ required: true, message: '请选择项目', trigger: 'blur' }],
         MachineValue: [{ required: true, message: '请选择机床', trigger: 'blur' }],
+        DirectNoteCode: [{ required: true, message: '请输入人员编号', trigger: 'blur' }],
         // GroupNumValue: [{ required: true, message: '请选择分组', trigger: 'blur' }],
         DirectNumber: [
           { required: true, message: '请输入数量', trigger: 'blur' },
@@ -240,6 +263,10 @@ export default {
       materialSpec: '', // 物料规格
       materialModel: '', // 物料型号
       离线合同明细流水号: '',
+      departments: [],
+      DirectNotes: [],
+      department111: '', // 部门参数中间变量
+      DirectNote111: '', // 人员参数中间变量
       组件零件基本件流水号: ''
     }
   },
@@ -263,6 +290,27 @@ export default {
     getpeopleid() {
       this.PeopleNumber = this.id
     },
+    selectDepartment() {
+      selectdepartment().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.departments.push({
+            label: response.data[i].部门名称,
+            value: response.data[i].考核部门编号
+          })
+        }
+      })
+    },
+    selectLeaders() {
+      this.DirectNotes = []
+      selectleaders(this.form.department).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.DirectNotes.push({
+            label: response.data[i].姓名,
+            value: response.data[i].考勤编号
+          })
+        }
+      })
+    },
     searchMachine() { // 查询机床
       this.Machine = []
       this.form.MachineValue = ''
@@ -347,19 +395,22 @@ export default {
     },
     // 打开表单
     parOut(row) {
-      this.form.department = '装配车间'
+      this.form.DirectNoteCode = ''
       this.locateNumber = row.货位流水号
       this.materialNumber = row.物料流水号
       this.partnumber = row.货位存量
       this.离线合同明细流水号 = row.离线合同明细流水号
       this.组件零件基本件流水号 = row.组件零件基本件流水号
+      this.departments = []
+      this.DirectNotes = []
+      this.selectLeaders()
+      this.selectDepartment()
       this.dialogFormVisible = true
     },
     // 重置表单
     callOff() {
-      this.form.DirectNumber = ''
+      this.form.DirectNumber = 1
       this.form.DirectNumberx = ''
-      this.form.DirectNote = ''
       this.dialogFormVisible = false
     },
     searchPeopleData() { // 查询人员
@@ -379,21 +430,36 @@ export default {
       } else {
         this.$refs['form'].validate((valid) => {
           if (valid) {
-            outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.form.department).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('零件出库成功')
-                this.dialogFormVisible = false
-                this.searchTable1()
-                // 物料流水号查
-                outRecord(this.materialNumber, this.pageCurrent2, this.pageSize2).then(response => {
-                  this.tableDataOut = response.data.rows
-                  this.total2 = response.data.total
-                  this.listLoading1 = false
-                })
-              } else {
-                this.$message.error('零件出库失败')
+            if (Number(this.form.DirectNoteCode) === Number(this.form.DirectNote)) {
+              for (let i = 0; i < this.departments.length; i++) {
+                if (this.form.department === this.departments[i].value) {
+                  this.department111 = this.departments[i].label
+                }
               }
-            })
+              for (let i = 0; i < this.DirectNotes.length; i++) {
+                if (this.form.DirectNote === this.DirectNotes[i].value) {
+                  this.DirectNote111 = this.DirectNotes[i].label
+                }
+              }
+              console.log(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111, 121221)
+              outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.DirectNote111, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号, this.组件零件基本件流水号, this.department111).then(response => {
+                if (response.data[0].result === '1') {
+                  this.$message.success('零件出库成功')
+                  this.dialogFormVisible = false
+                  this.searchTable1()
+                  // 物料流水号查
+                  outRecord(this.materialNumber, this.pageCurrent2, this.pageSize2).then(response => {
+                    this.tableDataOut = response.data.rows
+                    this.total2 = response.data.total
+                    this.listLoading1 = false
+                  })
+                } else {
+                  this.$message.error('零件出库失败')
+                }
+              })
+            } else {
+              this.$message.error('人员编号错误')
+            }
           } else {
             console.log('error submit!!')
             return false