diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js
index 4c1525da..13525ee8 100644
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
@@ -57,8 +57,11 @@ const devWebpackConfig = merge(baseWebpackConfig, {
template: 'index.html',
inject: true,
favicon: resolve('favicon.ico'),
- title: 'vue-admin-template'
- })
+ title: 'vue-element-admin',
+ templateParameters: {
+ BASE_URL: config.dev.assetsPublicPath + config.dev.assetsSubDirectory,
+ },
+ }),
]
})
@@ -78,7 +81,9 @@ module.exports = new Promise((resolve, reject) => {
new FriendlyErrorsPlugin({
compilationSuccessInfo: {
messages: [
- `Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`
+ `Your application is running here: http://${
+ devWebpackConfig.devServer.host
+ }:${port}`
]
},
onErrors: config.dev.notifyOnErrors
diff --git a/index.html b/index.html
index deed4af4..7d978087 100644
--- a/index.html
+++ b/index.html
@@ -6,6 +6,7 @@
高精机电装备有限公司数字化工厂
+
diff --git a/src/api/Inventory/InventoryManagement.js b/src/api/Inventory/InventoryManagement.js
index dda1f073..b121a949 100644
--- a/src/api/Inventory/InventoryManagement.js
+++ b/src/api/Inventory/InventoryManagement.js
@@ -96,14 +96,14 @@ export function deleteLocate(num) {
})
}
// 人员查询 需要在部门确定之后修改
-export function searchPeople() {
+export function searchPeople(role) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
- param: '考核部门编号=' + 18
+ name: '菜单系统模块_项目角色员工综合_查询数据',
+ param: '姓名_check=' + 0 + '&角色编号_check=' + 1 + '&角色编号=' + role + '&考核部门编号_check=' + 0
}
})
}
diff --git a/src/api/Inventory/OfflinePurchase.js b/src/api/Inventory/OfflinePurchase.js
new file mode 100644
index 00000000..de237229
--- /dev/null
+++ b/src/api/Inventory/OfflinePurchase.js
@@ -0,0 +1,123 @@
+import request from '@/utils/request'
+
+// 请购单查询
+export function searchRequestCard(pageCurrent, pageSize, card_check, card) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_离线请购单_请购单查询',
+ param: '请购单编号_check=' + card_check + '&请购单编号=' + card,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 请购单增加
+export function addRequestCard(peoplenumber, housenumber) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: 'dbo.库存管理_离线请购单_请购单增加',
+ param: '请购人编号=' + peoplenumber + '&仓库流水号=' + housenumber
+ }
+ })
+}
+// 查询仓库
+export function initWarehouse() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_货位仓库_仓库_查询数据'
+ }
+ })
+}
+// 查询库存数
+export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_离线物料_物料余量_查询数据',
+ param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}`,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
+// 查询请购单明细
+export function SeeDetail(data) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_离线请购单_请购单明细查询',
+ param: '离线请购单流水号=' + data
+ }
+ })
+}
+// 请购单明细增加
+export function addRequestCardDetail(data1, data2) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '库存管理_离线请购单_请购单明细增加',
+ param: '离线请购单流水号=' + data1 + '&物料流水号组=' + data2
+ }
+ })
+}
+// 请购单明细修改
+export function alterNumber(data1, data2, data3) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '库存管理_离线请购单_请购单明细修改',
+ 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]}`
+ }
+ })
+}
diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index c92c3998..1ef3d858 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -49,14 +49,14 @@ export function PurchasePart(data1, data2, data3, data4, data5) {
})
}
// 基本件零件出库
-export function BasicPart(data1, data2, data3, data4) {
+export function BasicPart(data1, data2, data3, data4, data5) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'MES_机加工MES_库存管理_出库模块_出库零件信息_零件出库',
- param: '工艺计划流水号=' + data1 + '&本次出库数量=' + data2 + '&收件信息ID=' + data3 + '&出库备注=' + data4
+ param: '工艺计划流水号=' + data1 + '&本次出库数量=' + data2 + '&收件信息ID=' + data3 + '&领用人编号=' + data4 + '&出库备注=' + data5
}
})
}
diff --git a/src/api/ManufacturingCenter/QuotaFormulation.js b/src/api/ManufacturingCenter/QuotaFormulation.js
index 04062dbc..939492c8 100644
--- a/src/api/ManufacturingCenter/QuotaFormulation.js
+++ b/src/api/ManufacturingCenter/QuotaFormulation.js
@@ -33,7 +33,6 @@ export function getPerson() {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=9'
-
}
})
}
diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index 1dea4f95..f5019a57 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -48,7 +48,7 @@ export function searchTable(check, entryNameValue, check1, machine, check2, grou
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新',
+ name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK',
param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
pagination: pageCurrent + '&' + pageSize
}
diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js
index 909c5ad7..a0563fb7 100644
--- a/src/api/MarketingCenter/ContractCapitalManagement.js
+++ b/src/api/MarketingCenter/ContractCapitalManagement.js
@@ -194,7 +194,7 @@ export function selectMachine(code) {
method: 'post',
data: {
type: '1',
- name: 'PDM_机床名称_查询数据_通过项目流水号',
+ name: '合同收款计划_发货情况_查询数据',
param: '项目流水号=' + code
}
})
@@ -271,7 +271,7 @@ export function editTime(code, num2) {
data: {
type: '2',
name: '合同资金管理_批次付款表_修改计划时间',
- param: '批次资金ID=' + code + '=int&计划付款时间=' + num2 + '=string'
+ param: '批次资金ID=' + code + '=int&执行进度ID=' + num2 + '=int'
}
})
}
@@ -352,3 +352,24 @@ export function SelectContractFunds(num1, pageCurrent, pageSize) {
}
})
}
+export function executionProgressID() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '合同信息管理_执行进度_查询'
+ }
+ })
+}
+export function never(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '合同资金管理_催收账款_不再提醒',
+ param: '批次资金ID=' + num1 + '=int'
+ }
+ })
+}
diff --git a/src/api/MarketingCenter/ContractInformationManagement.js b/src/api/MarketingCenter/ContractInformationManagement.js
index c1d14060..346008f6 100644
--- a/src/api/MarketingCenter/ContractInformationManagement.js
+++ b/src/api/MarketingCenter/ContractInformationManagement.js
@@ -250,7 +250,7 @@ export function changeExecutionProgressID() {
data: {
type: '2',
name: '创建合同_改变执行进度',
- param: '执行进度流水号=' + arguments[0] + '&项目流水号=' + arguments[1]
+ param: '执行进度流水号=' + arguments[0] + '&项目流水号=' + arguments[1] + '&进度完成日期=' + arguments[2]
}
})
}
@@ -265,3 +265,25 @@ export function selectBidBond() {
}
})
}
+export function searchTime() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '创建合同_查询执行进度时间',
+ param: '项目流水号=' + arguments[0] + '&执行进度流水号=' + arguments[1]
+ }
+ })
+}
+export function searchTimeAll() {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '创建合同_查询执行进度时间_总',
+ param: '项目流水号=' + arguments[0]
+ }
+ })
+}
diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index 1fd165f9..5cd99a83 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -11,7 +11,7 @@ export function initInquiryState() {
}
})
}
-// 根据续表查物料表
+// 查询分配后的标准件和外购件
export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2, person) {
return request({
url: '',
@@ -24,6 +24,19 @@ export function searchMaterial(pageCurrent, pageSize, check1, num1, check2, num2
}
})
}
+// 查询分配后的基本件
+export function searchPart(pageCurrent, pageSize, check1, num1, person) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购部采购_查询物料_基本件_分配后',
+ param: `询价状态编号_check=${check1}&询价状态编号=${num1}&人员编号=${person}`,
+ Pagination: pageCurrent + '&' + pageSize
+ }
+ })
+}
// 查询供应商
export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
return request({
@@ -69,7 +82,7 @@ export function searchSheetDetail(num2) {
data: {
type: '1',
name: '采购管理_询价单明细_查询数据',
- param: '询价单流水号_check=1&询价单流水号=' + num2
+ param: '询价单流水号=' + num2
}
})
}
@@ -97,27 +110,39 @@ export function deleteInquirySheet(num1) {
}
})
}
-// 追加现有询价单
-export function addInquirySheet(num1, num2, num3, num4, remark) {
+// 将标准件和外购件追加现有询价单
+export function addInquirySheet1(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_询价单明细_增加数据',
- param: '询价单流水号=' + num1 + '&组件零件流水号=' + num2 + '&总数量=' + num3 + '&备量=' + num4 + '&备注=' + remark + '&identity=1=output'
+ param: '询价单流水号=' + num1 + '&组件零件流水号=' + num2 + '&数量=' + num3
+ }
+ })
+}
+// 将基本件追加现有询价单
+export function addInquirySheet2(num1, num2, num3) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购管理_询价单明细_增加数据',
+ param: '询价单流水号=' + num1 + '&组件零件基本件流水号=' + num2 + '&数量=' + num3
}
})
}
// 移出询价单
-export function outInquirySheet(num1, num2) {
+export function outInquirySheet(num1, num2, num3) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_询价单明细_删除数据',
- param: '询价单流水号=' + num1 + '&组件零件流水号=' + num2
+ param: '询价单明细流水号=' + num1 + '&组件零件流水号=' + num2 + '&组件零件基本件流水号=' + num3
}
})
}
diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
new file mode 100644
index 00000000..56a81486
--- /dev/null
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 查询询价单列表 表1
+export function searchInquirySheet(check1, value1, check2, value2, check3, id) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_询价单_查询数据',
+ param: `供应商名称_check=${check1}&供应商名称=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}`
+ }
+ })
+}
+// 根据询价单流水号查询物料详情
+export function searchSheetContract(num1) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_询价单明细_查询数据',
+ param: '询价单流水号=' + num1
+ }
+ })
+}
diff --git a/src/api/PurchasingCenter/PurchaseTaskAllocate.js b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
index a3ff15f7..22b17376 100644
--- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js
+++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
@@ -1,5 +1,28 @@
import request from '@/utils/request'
-
+// 物料类别
+export function initMaterialCategory(check, DepartmentValue) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_物料类别编号_查询数据_根据物料部门编号',
+ param: '物料部门流水号_check=' + check + '=int&物料部门流水号=' + DepartmentValue
+ }
+ })
+}
+// 物料品种
+export function initMaterialVariety(MaterialCategoryValue) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '库存管理_物料品种编号_查询数据',
+ param: '物料类别流水号=' + MaterialCategoryValue
+ }
+ })
+}
// 初始化项目（车间传递来的）
export function initProject() {
return request({
@@ -23,21 +46,34 @@ export function initBuyer() {
}
})
}
-// 查询表1
-export function searchTable1(pageCurrent, pageSize, check1, num1, check2, name, state) {
+// 查询表1标准件和外购件
+export function searchTable1(...params) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_采购部采购_查询物料',
- param: `项目流水号_check=${check1}&项目流水号=${num1}&物料名称_check=${check2}&物料名称=${name}&分配状态=${state}`,
- Pagination: pageCurrent + '&' + pageSize
+ param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&分配状态=${params[10]}`,
+ Pagination: params[0] + '&' + params[1]
}
})
}
-// 分配任务
-export function allocateTask(group, person) {
+// 查询表1基本件
+export function searchTable2(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '1',
+ name: '采购管理_采购部采购_查询物料_基本件',
+ param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&分配状态=${params[4]}`,
+ Pagination: params[0] + '&' + params[1]
+ }
+ })
+}
+// 分配任务1标准件和外购件
+export function allocateTask1(group, person) {
return request({
url: '',
method: 'post',
@@ -47,8 +83,21 @@ export function allocateTask(group, person) {
param: `标准件和外购件流水号组=${group}&人员编号=${person}`
}
})
-}// 执行退回
-export function executeReturn(...params) {
+}
+// 分配任务2基本件
+export function allocateTask2(group, person) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购部采购_分配任务_基本件',
+ param: `基本件流水号组=${group}&人员编号=${person}`
+ }
+ })
+}
+// 执行退回1标准件和外购件
+export function executeReturn1(...params) {
return request({
url: '',
method: 'post',
@@ -59,3 +108,15 @@ export function executeReturn(...params) {
}
})
}
+// 执行退回1基本件
+export function executeReturn2(...params) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ type: '2',
+ name: '采购部采购_退回物料_基本件',
+ param: `基本件流水号组=${params[0]}&组件零件基本件流水号组=${params[1]}`
+ }
+ })
+}
diff --git a/src/components/Tinymce/components/editorImage.vue b/src/components/Tinymce/components/editorImage.vue
new file mode 100644
index 00000000..bcd82099
--- /dev/null
+++ b/src/components/Tinymce/components/editorImage.vue
@@ -0,0 +1,103 @@
+
+
+ 上传图片
+
+
+
+ 点击上传
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
new file mode 100644
index 00000000..b8d03287
--- /dev/null
+++ b/src/components/Tinymce/index.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js
new file mode 100644
index 00000000..8fc207e8
--- /dev/null
+++ b/src/components/Tinymce/plugins.js
@@ -0,0 +1,7 @@
+// Any plugins you want to use has to be imported
+// Detail plugins list see https://www.tinymce.com/docs/plugins/
+// Custom builds see https://www.tinymce.com/download/custom-builds/
+
+const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools importcss insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
+
+export default plugins
diff --git a/src/components/Tinymce/toolbar.js b/src/components/Tinymce/toolbar.js
new file mode 100644
index 00000000..7d6c2c73
--- /dev/null
+++ b/src/components/Tinymce/toolbar.js
@@ -0,0 +1,6 @@
+// Here is a list of the toolbar
+// Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols
+
+const toolbar = ['bold italic underline strikethrough alignleft aligncenter alignright outdent indent blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen']
+
+export default toolbar
diff --git a/src/icons/svg/OfflinePurchase.svg b/src/icons/svg/OfflinePurchase.svg
new file mode 100644
index 00000000..2793ad62
--- /dev/null
+++ b/src/icons/svg/OfflinePurchase.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index c2634d07..b4a4025e 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -115,7 +115,8 @@ export default {
},
computed: {
...mapGetters([
- 'id'
+ 'id',
+ 'token'
])
},
created() {
@@ -145,6 +146,8 @@ export default {
// 获取人员编号
getpeopleid() {
this.PeopleNumber = this.id
+ const a = this.token
+ console.log(a, 1111)
},
aaa() {
print('#print')
@@ -174,9 +177,9 @@ export default {
getCraftNumber() {
CraftNumber(this.Partpaint).then(response => {
this.partNumber = response.data[0].工艺计划流水号
+ }).then(() => {
+ this.getscantable()
})
- console.log(this.partNumber, 1111)
- this.getscantable()
},
getPaint() {
searchPartNumber(this.partNumber).then(response => {
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 886b427a..eaf9f20e 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -114,7 +114,7 @@
- {{ scope.row.入库人员 }}
+ {{ scope.row.姓名 }}
@@ -147,7 +147,7 @@
- {{ scope.row.领用人编号 }}
+ {{ scope.row.姓名 }}
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index b1196317..aae428da 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -246,6 +246,7 @@
+
+
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index 71b8ed1f..512471e7 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -39,6 +39,7 @@
@@ -47,12 +48,12 @@
align="center"
type="index"
width="50"/>
-
+
{{ scope.row.项目名称 }}
-
+
{{ scope.row.机床图号 }}
@@ -62,14 +63,19 @@
{{ scope.row.组号 }}
-
+
{{ scope.row.出库数量 }}
-
+
- {{ scope.row.货位流水号 }}
+ {{ scope.row.仓库名称 }}
+
+
+
+
+ {{ scope.row.货位名称 }}
@@ -82,13 +88,29 @@
{{ scope.row.类型名称 }}
-
+
+ 异常
出库
+
+
+
+
+
+
+
+
+
+
+
+
@@ -126,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: {
@@ -196,7 +226,7 @@ export default {
} else { this.$message.error('出库失败') }
})
} else {
- BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, row.备注).then(response => {
+ BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, this.getpicikingPeople, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('出库成功')
ListDetailOut(row.领料单明细流水号)
@@ -204,6 +234,9 @@ export default {
} else { this.$message.error('增加失败') }
})
}
+ },
+ ErrorpartOut() {
+ console.log(21231)
}
}
}
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index fbe1fc6e..045412de 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -96,6 +96,16 @@
{{ scope.row.出库数量 }}
+
+
+ {{ scope.row.仓库名称 }}
+
+
+
+
+ {{ scope.row.货位名称 }}
+
+
{{ scope.row.备注 }}
@@ -168,21 +178,31 @@
{{ scope.row.零件名称 }}
-
+
{{ scope.row.批次数量 }}
-
+
{{ scope.row.可出库数量 }}
-
+
{{ scope.row.待出库数量 }}
+
+
+ {{ scope.row.仓库名称 }}
+
+
+
+
+ {{ scope.row.货位名称 }}
+
+
{{ scope.row.零件图号 }}
@@ -195,7 +215,7 @@
- 领料
+ 领料
@@ -265,6 +285,11 @@
{{ scope.row.待出库数量 }}
+
+
+ {{ scope.row.入库备注 }}
+
+
{{ scope.row.类型名称 }}
@@ -633,6 +658,11 @@ export default {
this.total1 = response.data.total
})
searchBasicPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+ const data = response.data.rows
+ console.log(data, 323423)
+ for (let i = 0; i < data.length; i++) {
+ data[i].可出库数量 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+ }
this.tableDataBasic = response.data.rows
this.listLoading1 = false
this.total = response.data.total
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 935b26dc..227a4c79 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -1,7 +1,7 @@
- 项目名称
+ 项目名称：
- 销售经理
+ 销售经理：
- 查询收款计划
- 新增收款计划
+ 查询
+ 新增
查看收款信息
@@ -27,19 +27,25 @@
height="280"
highlight-current-row
border
+ size="mini"
@expand-change="selectMachine"
@row-click="getTableData2">
-
-
+
+
- {{ scope.row.机床图号 }}
+ {{ scope.row.发货单号 }}
-
+
- {{ scope.row.机床名称 }}
+ {{ scope.row.发货日期 }}
+
+
+
+
+ {{ parseInt(scope.row.运输状态) === 0 ? '运输中' : '已签收' }}
@@ -55,7 +61,7 @@
{{ scope.row.项目名称 }}
-
+
{{ scope.row.付款方式 }}
@@ -65,14 +71,14 @@
{{ scope.row.合同总金额 }}
-
+
{{ scope.row.已支付 }}
-
+
- {{ scope.row.未支付金额 }}
+ {{ scope.row.未支付金额 }}
@@ -150,10 +156,11 @@
height="350"
highlight-current-row
border
+ size="mini"
@expand-change="selectMachine1">
-
+
-
+ width="150"/>
+
{{ scope.row.应收金额 }}
-
+
{{ scope.row.已收金额 }}
-
+
- {{ scope.row.未收金额 }}
+ {{ scope.row.未收金额 }}
-
+
{{ scope.row.转下阶段金额 }}
-
+
-
+
+
+
-
+
-
+ 后
+
+ 天
-
+
- 无计划
- 已完成
- 未开始
- 即将拖期
- 已拖期
+
+
+
{{ scope.row.执行进度名 }} 未完成
+
+
+
{{ scope.row.执行进度名 }}于{{ scope.row.节点日期 }}完成，计划于{{ scope.row.计划付款时间 }}进行收款，距离计划日期还剩{{ parseInt(scope.row.剩余天数) > 0 ? scope.row.剩余天数 : 0 }}天
+
+ 无计划
+ 已完成
+ 未开始
+ 即将拖期
+ 已拖期
+
-
+
-
-
-
+
+
+
{{ scope.row.项目名称 }}
-
+
{{ scope.row.客户名称 }}
-
+
{{ scope.row.联系人 }}
-
+
{{ scope.row.电话 }}
-
+
{{ scope.row.计划付款时间 }}
-
+
{{ scope.row.付款批次 }}
-
+
{{ scope.row.状态 }}
-
+
立即收款
+ 不再提醒
@@ -474,7 +498,7 @@
+
+
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index c01c138d..f8524905 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -1,18 +1,16 @@
-
-
-
- 项目名称:
-
+
+
+
+ 项目名称:
+
- 物料名称:
-
分配情况:
查询
-
-
-
-
- 采购员:
-
+
+ 采购员:
+
+
+
+ 分配
+ 退回
+
+
+
+ 物料类别:
+
+
+ 物料品种:
+
+
+
+ 物料名称:
+
+
+
+
+
+
+
+ {{ scope.row.项目名称 }}
+
+
+
+
+ {{ scope.row.物料类别 }}
+
+
+
+
+ {{ scope.row.物料品种 }}
+
+
+
+
+ {{ scope.row.物料型号 }}
+
+
+
+
+ {{ scope.row.物料名称 }}
+
+
+
+
+ {{ scope.row.物料规格 }}
+
+
+
+
+ {{ scope.row.零件数量 }}
+
+
+
+
+ {{ 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.物料计划到货时间.split(' ')[0] }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
-
-
-
+ @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询
+
+ 采购员:
+
+
+
+ 分配
+ 退回
+
+
+
+
+
+
+
+ {{ scope.row.项目名称 }}
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.零件名称 }}
+
+
+
+
+ {{ scope.row.规格 }}
+
+
+
+
+ {{ scope.row.材料 }}
+
+
+
+
+ {{ scope.row.数量 }}
+
+
+
+
+ {{ scope.row.备注 }}
+
+
+
+
+ {{ scope.row.供货商 }}
+
+
+
+
+ {{ scope.row.物料计划到货时间.split(' ')[0] }}
+
+
+
+
+ {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
+
+
+
+
+
+
+
+
+