diff --git a/package.json b/package.json index 02b3cafd..4bf74258 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "nprogress": "0.2.0", "qrcode": "^1.3.2", "time-formater": "^1.0.3", + "v-viewer": "^1.3.1", "vue": "2.5.17", "vue-router": "3.0.1", "vuex": "3.0.1", diff --git a/src/api/Assembly/AssemblyProcessAssignment.js b/src/api/Assembly/AssemblyProcessAssignment.js index fbe7519b..42d429e3 100644 --- a/src/api/Assembly/AssemblyProcessAssignment.js +++ b/src/api/Assembly/AssemblyProcessAssignment.js @@ -30,7 +30,7 @@ export function initPerson() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17=int' + param: '考核部门编号=9=int' } }) } diff --git a/src/api/Assembly/AssemblyProcessPlanning.js b/src/api/Assembly/AssemblyProcessPlanning.js index 41619c17..229319bb 100644 --- a/src/api/Assembly/AssemblyProcessPlanning.js +++ b/src/api/Assembly/AssemblyProcessPlanning.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/Assembly/AssemblyQuotaSetting.js b/src/api/Assembly/AssemblyQuotaSetting.js index f1769456..62050c24 100644 --- a/src/api/Assembly/AssemblyQuotaSetting.js +++ b/src/api/Assembly/AssemblyQuotaSetting.js @@ -8,7 +8,7 @@ export function initCraftmen() { data: { type: '1', name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号', - param: '考核部门编号=17' + param: '考核部门编号=9' } }) } diff --git a/src/api/WorkshopProcurement/OfflineContract1.js b/src/api/WorkshopProcurement/OfflineContract1.js index 71d1a725..2d2f7bc9 100644 --- a/src/api/WorkshopProcurement/OfflineContract1.js +++ b/src/api/WorkshopProcurement/OfflineContract1.js @@ -59,6 +59,17 @@ export function deleteData(RequisitionList) { } }) } +export function updateStatus(num) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间采购管理_离线合同_导出更改状态', + param: '请购单流水号=' + num + } + }) +} // 查询离线合同明细 export function searchMateriel(num) { return request({ diff --git a/src/main.js b/src/main.js index 487c94b2..3831fa72 100644 --- a/src/main.js +++ b/src/main.js @@ -17,10 +17,17 @@ import curd from '@/utils/curd' import time from 'time-formater' import htmlToPdf from '@/vendor/htmlToPdf' - +import Viewer from 'v-viewer' +import 'viewerjs/dist/viewer.css' Vue.use(curd) Vue.use(htmlToPdf) Vue.use(ElementUI) +// 查看图片 +Vue.use(Viewer) +Viewer.setDefaults({ + Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' } +}) + // 处理时间字符串格式全局过滤器 '2018/1/23 00:00:00' to '2018-01-23' Vue.filter('formatTime', function(value) { if (!value) return '' diff --git a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue index 423324e9..f06eeda4 100644 --- a/src/views/Assembly/TypicalAssemblyMaintenance/index.vue +++ b/src/views/Assembly/TypicalAssemblyMaintenance/index.vue @@ -286,7 +286,7 @@ export default { for (let i = 0; i < response.data.length; i++) { this.GroupNumber.push({ label: response.data[i].组号, - value: response.data[i].组号 + value: response.data[i].组件流水号 }) } }) diff --git a/src/views/BasicData/MaterialMaintenance/index.vue b/src/views/BasicData/MaterialMaintenance/index.vue index afd74ae3..bae4bedc 100644 --- a/src/views/BasicData/MaterialMaintenance/index.vue +++ b/src/views/BasicData/MaterialMaintenance/index.vue @@ -63,7 +63,7 @@ - + @@ -97,7 +97,9 @@ export default { MaterialName2: '' }, rules: { - MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }], + MaterialName: [{ required: true, message: '请输入材料名称', trigger: 'blur' }] + }, + rules1: { MaterialName2: [{ required: true, message: '请输入材料名称', trigger: 'blur' }] } } diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index d0a01fde..bf943e12 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -253,7 +253,7 @@ export default { this.listLoading = true this.tableData = [] this.num0 = '' - if (this.radio === 1) { + if (this.radio === 1) { // 未编制 detailInfo(this.partNumValue).then(response => { if (response.data.length !== 0) { this.typeValue = response.data[0].零件类型名称 @@ -264,6 +264,7 @@ export default { } }).then(() => { mainTable(this.num0).then(response => { + console.log(response.data) if (response.data.length === 0) { this.listLoading = false } else { diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue index bd0a5c6e..99e3189d 100644 --- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue +++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue @@ -98,7 +98,7 @@ - + diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 1c694e72..17ba8ce0 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -73,7 +73,7 @@ - + - + + + + - + - + @@ -363,7 +369,7 @@ export default { } diff --git a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue index 86a33d93..ea4d535b 100644 --- a/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue +++ b/src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue @@ -9,17 +9,6 @@ :label="item.label" :value="item.value"/> - - - - - - - - - - - - + - + - + - - - + + +