+
-
-
+
+
+
{{ scope.row.名称 }}
-
+
{{ scope.row.图号或型号 || '—' }}
-
+
{{ scope.row.规格 || '—' }}
+
+
+ {{ scope.row.总数量 }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.备件数量 }}
+
+
+
+
+ {{ scope.row.货位存量1 }}
+
+
+
+
+ {{ scope.row.出库数量1 }}
+
+
+
+
+ 已备
+ 未备
+
+
+
+
+
+
+
+
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.组号 }}
-
-
- {{ scope.row.总数量 }}
-
-
-
-
- {{ scope.row.备件数量 }}
-
-
-
-
- {{ scope.row.货位存量1 }}
-
-
-
-
- {{ scope.row.出库数量1 }}
-
-
-
-
-
-
-
-
-
- 已备料
- 未备料
-
-
-
-
- 已领料
- 未领完
- 未领料
-
-
@@ -237,6 +238,7 @@ export default {
name: 'MaterialOut',
data() {
return {
+ multipleSelection1: [],
multipleSelection: [],
pickingListNum: '', // 领料单流水号
pickingPersonNum: '', // 领料人流水号
@@ -244,7 +246,7 @@ export default {
pickingListNumberShow: '',
pickListTable1: [],
pageCurrent3: 1,
- pageSize3: 40,
+ pageSize3: 10000,
total3: 0,
pickListTable2: [],
StockNumberTable: [],
@@ -430,6 +432,8 @@ export default {
},
// 领料确认
inputPassword() {
+ this.form3.outTypeValue = ''
+ this.form3.password = ''
this.dialogFormVisible3 = true
},
selectable(row, index) { // 控制某行是否可选
@@ -518,16 +522,27 @@ export default {
})
},
tableRowClassName({ row }) {
- if (parseInt(row.是否审批) === 1) {
+ if (parseInt(row.是否审批) === 0) {
return 'shenpi-row'
} else {
return ''
}
},
+ tableRowClassName1({ row }) {
+ if (parseInt(row.出库数量1) === 0) {
+ return 'weilingliao-row'
+ } else if (parseInt(row.总数量) > parseInt(row.出库数量1) && parseInt(row.出库数量1)) {
+ return 'weilingwan-row'
+ } else {
+ return ''
+ }
+ },
// 多选
handleSelectionChange(val) {
- console.log(val)
- this.SELECTION = val
+ this.multipleSelection1 = []
+ val.map(v => {
+ this.multipleSelection1.push(v.领料单明细流水号)
+ })
},
// 提交领料确认
pickConfirm1() {
@@ -602,4 +617,10 @@ export default {
.el-table .shenpi-row {
background: #9BD7FC !important;
}
+ .el-table .weilingliao-row {
+ background: #D8DDE6 !important;
+ }
+ .el-table .weilingwan-row {
+ background: #E9F0F9 !important;
+ }
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index cd7432ce..b6818390 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -1,16 +1,16 @@
- 供应商：
-
+
+
- 合同：
-
+
+
+
-
查询
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index 301e7399..4d482779 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -21,9 +21,9 @@
+
-
查询
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index 648df99e..bf9eed2b 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -1,24 +1,24 @@
- 供应商：
-
+
+
- 合同：
-
+
+
- 合同类型：
-
+
+
- 确认入库
+ 确认入库
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index be0b4cd9..41579e2f 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -3,47 +3,59 @@
- 物料名称:
-
- 物料规格:
-
- 物料型号:
-
- 查询
+
+
+
+
+
+
+
+
+
+ 查询
+
-
-
+
+
{{ scope.row.物料名称 }}
-
+
{{ scope.row.物料型号 }}
-
+
{{ scope.row.物料规格 }}
-
+
{{ scope.row.物料来源 }}
-
-
- {{ scope.row.仓库名称 }}
-
-
-
+
+
+
+
+
+
{{ scope.row.货位名称 }}
-
+
@@ -52,6 +64,12 @@
{{ scope.row.货位存量 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,10 +180,22 @@ export default {
materialName: '',
materialSpec: '',
materialModel: '',
+ inventoryNameValue: '',
+ inventoryName: [],
+ locateNameValue: '',
+ locateName: [],
tableData1: [],
pageCurrent: 1,
- pageSize: 10,
- total: 0
+ pageSize: 20,
+ total: 0,
+ dialogVisible: false,
+ tableData01: [],
+ pageCurrent01: 1,
+ pageSize01: 10,
+ total01: 0,
+ localNumber: '',
+ materialValue: '',
+ isBacklog: false
}
},
computed: {
@@ -88,23 +204,66 @@ export default {
])
},
mounted() {
+ this.initData()
this.searchMaterial()
},
methods: {
+ // 初始化数据
+ initData() {
+ 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].仓库流水号
+ })
+ }
+ })
+ },
+ // 根据仓库查货位
+ getLocate() {
+ this.locateName = []
+ this.locateNameValue = ''
+ const param = {
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_货位主文件_查询数据',
+ param: `仓库流水号=${this.inventoryNameValue}`
+ }
+ }
+ request(param).then(res => {
+ for (let i = 0; i < res.data.length; i++) {
+ this.locateName.push({
+ label: res.data[i].货位名称,
+ value: res.data[i].货位流水号
+ })
+ }
+ })
+ },
// 根据条件查物料货位数量
searchMaterial() {
- // this.$router.push('/ManufacturingCenter/StatusQuery')
- let check1, check2, check3
+ let check1, check2, check3, check4, check5
this.materialName ? check1 = 1 : check1 = 0
this.materialSpec ? check2 = 1 : check2 = 0
this.materialModel ? check3 = 1 : check3 = 0
+ this.inventoryNameValue ? check4 = 1 : check4 = 0
+ this.locateNameValue ? check5 = 1 : check5 = 0
const param = {
url: '',
method: 'post',
data: {
type: '1',
name: `库存管理_库存盘点_物料货位数量_查询数据`,
- param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${0}&仓库流水号=${0}&货位流水号_check=${0}&货位流水号=${0}`,
+ param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&仓库流水号_check=${check4}&仓库流水号=${this.inventoryNameValue}&货位流水号_check=${check5}&货位流水号=${this.locateNameValue}`,
Pagination: this.pageCurrent + '&' + this.pageSize
}
}
@@ -127,6 +286,91 @@ export default {
handleCurrentChange(val) {
this.pageCurrent = val
this.searchMaterial()
+ },
+ // 取消设置
+ cancelEdit(row) {
+ row.货位存量 = row.原货位存量
+ row.changeValue = false
+ this.$message('取消修改')
+ },
+ // 确认设置
+ confirmEdit(row) {
+ Number(row.货位存量) ? row.货位存量 = Number(row.货位存量) : row.货位存量 = 0
+ const param = {
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: `库存管理_库存盘点_物料货位数量_修改数据`,
+ param: `货位存量=${row.货位存量}&物料流水号=${row.物料流水号}&货位流水号=${row.货位流水号}&物料来源=${row.物料来源}`
+ }
+ }
+ request(param).then(res => {
+ if (res.data[0].result === '1') {
+ this.$message.success('操作成功')
+ row.changeValue = false
+ } else {
+ this.$message.error('操作失败')
+ }
+ })
+ },
+ // 新增物料货位数量
+ addMaterial() {
+ this.dialogVisible = true
+ },
+ // 选择物料
+ selectMaterial(row) {
+ this.materialValue = row.物料流水号
+ },
+ // 确认新增物料货位数量
+ submitAdd() {
+ const param = {
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: `库存管理_库存盘点_物料货位数量_增加数据`,
+ param: `物料流水号=${this.materialValue}&货位流水号=${this.locateNameValue}&货位存量=${this.localNumber}&是否为滞货=${Number(this.isBacklog)}`
+ }
+ }
+ request(param).then(res => {
+ if (res.data[0].result === '1') {
+ this.$message.success('操作成功')
+ this.dialogVisible = false
+ } else {
+ this.$message.error('操作失败')
+ }
+ })
+ },
+ // 查物料
+ searchMaterial01() {
+ let check1, check2, check3
+ this.materialName ? check1 = 1 : check1 = 0
+ this.materialSpec ? check2 = 1 : check2 = 0
+ this.materialModel ? check3 = 1 : check3 = 0
+ const param = {
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: `库存管理_物料主文件_基本_查询数据_分页`,
+ param: `物料名称_check=${check1}&物料名称=${this.materialName}&物料规格_check=${check2}&物料规格=${this.materialSpec}&物料型号_check=${check3}&物料型号=${this.materialModel}&PageCurrent=${this.pageCurrent01}=int&PageSize=${this.pageSize01}=int&PageCount=1=int=output&ItemCount=1=int=output`
+ }
+ }
+ request(param).then(res => {
+ this.tableData01 = res.data.result
+ this.total01 = Number(res.data.output[0].ItemCount)
+ })
+ },
+ // 分页
+ handleSizeChange01(val) {
+ this.pageSize01 = val
+ this.pageCurrent01 = 1
+ this.searchMaterial01()
+ },
+ handleCurrentChange01(val) {
+ this.pageCurrent01 = val
+ this.searchMaterial01()
}
}
}
@@ -140,3 +384,146 @@ export default {
width:165px
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index accec227..74463e8e 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -42,7 +42,7 @@
{{ scope.row.零件号 }}
-
+
{{ scope.row.零件名称 }}
@@ -271,49 +271,53 @@ export default {
}
},
getTable() { // 获取主表
- this.loading0 = true
- this.tableData = []
- if (this.radio === 2) { // 全部
- getTable0(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
- this.total = response.data.total
- for (let i = 0; i < response.data.rows.length; i++) {
- response.data.rows[i].工艺计划开始时间 = response.data.rows[i].工艺计划开始时间.split(' ')[0]
- response.data.rows[i].工艺计划结束时间 = response.data.rows[i].工艺计划结束时间.split(' ')[0]
- response.data.rows[i].操作时间 = response.data.rows[i].操作时间.split(' ')[0]
- }
- for (let i = 0; i < response.data.rows.length; i++) {
- this.tableData.push({
- 零件号: 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.loading0 = false
- })
- } else { // 当天
- getTable00(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
- this.total = response.data.total
- for (let i = 0; i < response.data.rows.length; i++) {
- this.tableData.push({
- 零件号: 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.loading0 = false
- })
+ if (this.GroupNumValue === null) {
+ this.tableData = []
+ } else {
+ this.loading0 = true
+ this.tableData = []
+ if (this.radio === 2) { // 全部
+ getTable0(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
+ this.total = response.data.total
+ for (let i = 0; i < response.data.rows.length; i++) {
+ response.data.rows[i].工艺计划开始时间 = response.data.rows[i].工艺计划开始时间.split(' ')[0]
+ response.data.rows[i].工艺计划结束时间 = response.data.rows[i].工艺计划结束时间.split(' ')[0]
+ response.data.rows[i].操作时间 = response.data.rows[i].操作时间.split(' ')[0]
+ }
+ for (let i = 0; i < response.data.rows.length; i++) {
+ this.tableData.push({
+ 零件号: 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.loading0 = false
+ })
+ } else { // 当天
+ getTable00(this.PageCurrent, this.PageSize, this.GroupNumValue).then(response => {
+ this.total = response.data.total
+ for (let i = 0; i < response.data.rows.length; i++) {
+ this.tableData.push({
+ 零件号: 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.loading0 = false
+ })
+ }
}
},
handleSizeChange(val) {
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 345097fd..b9a9e306 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -39,7 +39,7 @@
-
+
-
+
-
-
+
+
+
-
-
+
物料变更
-
+
- 未询价
- 已询价
- 审批中
- 已采购
+ 未询价
+ 已询价
+ 审批中
+ 已采购
+
+
+
+
-
+
{{ scope.row.供货商 }}
-
-
- {{ scope.row.任务分配时间.split(' ')[0] }}
-
-
-
+
{{ scope.row.机床图号 }}
-
-
- {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
-
-
-
+
{{ scope.row.组号 }}
@@ -159,37 +153,37 @@
-
+
{{ scope.row.物料名称 }}
-
+
{{ scope.row.物料型号 }}
-
+
{{ scope.row.物料规格 }}
-
+
{{ scope.row.零件数量 }}
-
+
{{ scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
-
+
{{ Number(scope.row.货位存量) }}
-
+
{{ Number(scope.row.使用滞货数量) }}
@@ -207,16 +201,26 @@
-
+
{{ Number(scope.row.滞货数量) }}
-
+
{{ scope.row.备注 }}
+
+
+ {{ scope.row.任务分配时间.split(' ')[0] }}
+
+
+
+
+ {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
+
+
{{ scope.row.询价单编号 }}
@@ -244,7 +248,7 @@
-
+
-
+
-
+
+
+
-
-
零件变更-->
-
+
未询价
已询价
@@ -328,52 +332,42 @@
{{ scope.row.供货商 }}
-
-
- {{ scope.row.任务分配时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.项目名称 }}
-
-
-
+
+
+
+
+
+
{{ scope.row.机床图号 }}
-
-
- {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
-
-
-
+
{{ scope.row.组号 }}
-
+
{{ scope.row.零件图号 }}
-
+
{{ scope.row.零件名称 }}
-
+
{{ scope.row.规格 }}
-
+
{{ scope.row.材料 }}
-
+
{{ scope.row.零件数量 }}
@@ -383,6 +377,16 @@
{{ scope.row.备注 }}
+
+
+ {{ scope.row.任务分配时间.split(' ')[0] }}
+
+
+
+
+ {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
+
+
{{ scope.row.询价单编号 }}
@@ -588,170 +592,183 @@
- 询价单号:
-
- 供应商:
-
+
+
+
+
查询
- 创建询价单
+ style="margin:0px 10px"
+ @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询
选入物料
+ 创建询价单
- 询价单
- 询价单基础信息维护
-
-
-
- {{ scope.row.询价单编号 }}
-
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.电话号码 }}
-
-
-
-
- {{ scope.row.传真 }}
-
-
-
-
- {{ scope.row.注册资本 }}
-
-
-
-
- {{ scope.row.帐号 }}
-
-
-
-
- {{ scope.row.开户行 }}
-
-
-
-
- {{ scope.row.税号 }}
-
-
-
-
- {{ scope.row.企业性质 }}
-
-
-
-
- {{ scope.row.货期 }}
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
- 打印
- 导出
+
+ 询价单
+ 编辑
+ 删除
+
+ 打印
+ 导出
- 保存
+ 保存
-
- 询价单明细
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.组件零件流水号 ? scope.row.物料型号 : scope.row.零件图号 }}
-
-
-
-
- {{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
-
-
-
-
- {{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
-
-
-
-
- {{ scope.row.技术下达数量 }}
-
-
-
-
-
-
-
-
-
- {{ scope.row.计量单位 }}
-
-
-
-
-
-
-
-
-
- {{ scope.row.询价单编号 }}
-
-
-
-
- {{ scope.row.机床图号 || scope.row.基本件机床图号 }}
-
-
-
-
- {{ scope.row.组号 || scope.row.基本件组号 }}
-
-
-
-
-
- 移出
-
-
-
-
+ 信息维护
+
+
+
+
+
+
+
+ {{ scope.row.询价单编号 }}
+
+
+
+
+ {{ scope.row.供应商名称 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.组件零件流水号 ? scope.row.物料型号 : scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.组件零件流水号 ? scope.row.物料名称 : scope.row.零件名称 }}
+
+
+
+
+ {{ scope.row.组件零件流水号 ? scope.row.物料规格 : scope.row.规格 }}
+
+
+
+
+ {{ scope.row.技术下达数量 }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.计量单位 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.机床图号 || scope.row.基本件机床图号 }}
+
+
+
+
+ {{ scope.row.组号 || scope.row.基本件组号 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1132,10 +1149,10 @@ export default {
value: 0,
label: '全部'
},
- {
- value: 1,
- label: '未分配'
- },
+ // {
+ // value: 1,
+ // label: '未分配'
+ // },
{
value: 2,
label: '已分配',
@@ -1178,7 +1195,7 @@ export default {
tableData2: [], // 询价单列表
total2: 0,
pageCurrent2: 1,
- pageSize2: 10,
+ pageSize2: 10000,
tableData3: [], // 询价单明细
dialogVisible1: false,
inquirySheetNum: '', // 询价单号
@@ -1248,7 +1265,8 @@ export default {
backlogMaterialNum: '',
cancelNum: 0,
machines1: [],
- machines2: []
+ machines2: [],
+ row1: ''
}
},
computed: {
@@ -1876,41 +1894,52 @@ export default {
}
})
},
- deleteInquirySheet(row) { // 删除询价单
- this.$confirm('确定删除该询价单?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning'
- }).then(() => {
- deleteInquirySheet(row.询价单流水号).then(response => {
- if (response.data[0].result === '1') {
- this.$message.success('删除成功')
- this.inquirySheetNum = ''
- this.supplierName = ''
- this.supplierValue = ''
- this.searchTable2()
- this.tableData3 = []
- this.searchTable11()
- this.searchTable12()
- } else { this.$message.error('删除失败') }
+ deleteInquirySheet() { // 删除询价单
+ if (this.row1 === '') {
+ console.log(this.row1, 1)
+ this.$message.error('请选择询价单')
+ } else {
+ console.log(this.row1, 2)
+ this.$confirm('确定删除该询价单?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ deleteInquirySheet(this.row1.询价单流水号).then(response => {
+ if (response.data[0].result === '1') {
+ this.$message.success('删除成功')
+ this.inquirySheetNum = ''
+ this.supplierName = ''
+ this.supplierValue = ''
+ this.searchTable2()
+ this.tableData3 = []
+ this.searchTable11()
+ this.searchTable12()
+ } else { this.$message.error('删除失败') }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ })
})
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '已取消删除'
- })
- })
- },
- editInquirySheet(row) { // 编辑询价单
- if (this.$refs['form2'] !== undefined) {
- this.$refs['form2'].resetFields()
}
- this.title2 = '编辑询价单'
- this.form2.inquirySheetNumValue = row.询价单流水号
- this.form2.inquirySheetNum = row.询价单编号
- this.form2.supplierValue = row.供应商流水号
- this.form2.supplierName = row.供应商名称
- this.dialogVisible2 = true
+ },
+ editInquirySheet() { // 编辑询价单
+ if (this.row1 === '') {
+ console.log(this.row1)
+ this.$message.error('请选择询价单')
+ } else {
+ if (this.$refs['form2'] !== undefined) {
+ this.$refs['form2'].resetFields()
+ }
+ this.title2 = '编辑询价单'
+ this.form2.inquirySheetNumValue = this.row1.询价单流水号
+ this.form2.inquirySheetNum = this.row1.询价单编号
+ this.form2.supplierValue = this.row1.供应商流水号
+ this.form2.supplierName = this.row1.供应商名称
+ this.dialogVisible2 = true
+ }
},
submitEditInquirySheet() { // 提交编辑询价单
this.$refs['form2'].validate((valid) => {
@@ -1926,7 +1955,7 @@ export default {
if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1 && numGroup1.indexOf(this.form2.inquirySheetNum) !== numGroup2.indexOf(parseInt(this.form2.inquirySheetNumValue))) {
this.$message.error('该询价单号已存在')
} else {
- editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierValue).then(response => {
+ editInquirySheet(this.form2.inquirySheetNumValue, this.form2.inquirySheetNum, this.form2.supplierNameValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改成功')
this.inquirySheetNum = ''
@@ -2211,6 +2240,7 @@ export default {
this.dialogVisible1 = false
},
searchTable3(row) { // 查询该询价单中的物料和零件
+ this.row1 = row
this.tableData3 = []
this.inquirySheetFlowNum = row.询价单流水号
this.orderExport = row.询价单编号
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 222fa254..b521a335 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -41,85 +41,62 @@
-
+
-
+
-
+
-
+
-
+
快速修改价格
还原
-
-
-
- {{ scope.row.交货期.split(' ')[0] || '—' }}
-
-
{{ scope.row.机床图号 }}
-
+
{{ scope.row.组号 }}
-
+
{{ scope.row.名称 }}
-
+
{{ scope.row.图号 ? scope.row.图号 : '—' }}
-
+
{{ scope.row.规格 ? scope.row.规格 : '—' }}
-
+
{{ scope.row.数量 }}
-
+
{{ scope.row.计量单位 }}
-
-
-
- —
-
-
-
+
—
-
-
- {{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
-
-
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.含税单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
@@ -131,6 +108,30 @@
{{ scope.row.备注 || '—' }}
+
+
+
+ {{ scope.row.交货期.split(' ')[0] || '—' }}
+
+
+
+
+
+ —
+
+
+
+
+ {{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
+
+
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index b6f8bf9a..3865e6eb 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -29,10 +29,10 @@
+
- 物料状态:
-
+
查询
-
+
-
+
-
+
未询价
已询价
已采购
-
+
{{ scope.row.供货商 }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
-
-
-
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.组号 }}
-
+
{{ scope.row.物料类别 }}
-
+
{{ scope.row.物料品种 }}
@@ -117,22 +111,22 @@
{{ scope.row.物料名称 }}
-
+
{{ scope.row.物料型号 }}
-
+
{{ scope.row.物料规格 }}
-
+
{{ scope.row.零件数量 }}
-
+
{{ scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) }}
@@ -142,7 +136,7 @@
-
+
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) }}
@@ -152,11 +146,16 @@
{{ scope.row.备注 }}
-
+
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+
+
+ {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
+
+
+
- 物料状态:
-
+
查询
-
+
-
+
-
+
未询价
已询价
已采购
-
+
{{ scope.row.供货商 }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
-
-
-
+
{{ scope.row.机床图号 }}
-
+
{{ scope.row.组号 }}
-
+
{{ scope.row.物料类别 }}
-
+
{{ scope.row.物料品种 }}
@@ -284,17 +277,17 @@
{{ scope.row.物料名称 }}
-
+
{{ scope.row.物料型号 }}
-
+
{{ scope.row.物料规格 }}
-
+
{{ scope.row.零件数量 }}
@@ -317,7 +310,7 @@
{{ Number(scope.row.滞货数量) }}
-
+
{{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
@@ -332,6 +325,11 @@
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
+
+
+ {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
+
+
+
- 物料状态:
-
+
查询
-
+
-
+
-
+
未询价
已询价
已采购
-
+
{{ scope.row.供货商 }}
-
-
- {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
-
-
-
+
{{ scope.row.项目名称 }}
-
+
{{ scope.row.机床图号 }}
-
-
- {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
-
-
-
+
{{ scope.row.组号 }}
-
+
{{ scope.row.零件图号 }}
-
+
{{ scope.row.零件名称 }}
-
+
{{ scope.row.规格 }}
-
+
{{ scope.row.材料 }}
-
+
{{ scope.row.待采购数量 }}
@@ -479,6 +467,16 @@
{{ scope.row.备注 }}
+
+
+ {{ scope.row.组件设计者 || scope.row.机床设计者 || '—' }}
+
+
+
+
+ {{ scope.row.任务分配时间 ? scope.row.任务分配时间.split(' ')[0] : '-' }}
+
+
@@ -594,16 +592,16 @@
- 离线合同号:
-
- 供应商:
-
+
+
+
+
查询
+ @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询
选入物料
+
+ 生成
+
+ 保存
+
+
+
+
+
税率:
+ 快速修改价格
+ 还原
-
+
@@ -628,24 +643,24 @@
-
+
编辑中
已采购
全部到货
-
+
{{ scope.row.离线合同编号 }}
-
+
{{ scope.row.离线合同名称 }}
-
+
{{ scope.row.供应商名称 }}
@@ -665,12 +680,12 @@
{{ scope.row.规定到货时间.split(' ')[0] }}
-
+
- 编辑
- 删除
+
+
- 导出
+
@@ -683,26 +698,9 @@
:page-size="pageSize2"
:total="total2"
style="display:inline-block;width:50%"
- layout="total, sizes, prev, pager, next, jumper"
+ layout="total"
@size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/>
-
- 生成
-
- 保存
-
-
-
-
- 税率:
- 快速修改价格
- 还原