java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改制试表格预览方式

dev
long 2 years ago
parent
f20f085b90
commit
4d1a12330b
12 changed files with 66 additions and 97 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
  2. 13
      src/views/accessrecords/plan/ProcessMaterialsPlan.vue
  3. 63
      src/views/accessrecords/plan/ProcessMaterialsPlanList.vue
  4. 8
      src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
  5. 5
      src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
  6. 8
      src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue
  7. 4
      src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue
  8. 7
      src/views/accessrecords/statement/ProcessMaterialsPlanStatement3.vue
  9. 7
      src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue
  10. 3
      src/views/activiti/form/ProcessMaterialWarehousing.vue
  11. 4
      src/views/activiti/form/ProcessUdgetPlan.vue
  12. 26
      src/views/activiti/form/ProcessUdgetPlanForm.vue

15
src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
Unescape View File

@ -3,14 +3,14 @@
<a-tabs style="text-align: center" :active-key="this.tabKey" @change="callback"> <a-tabs style="text-align: center" :active-key="this.tabKey" @change="callback">
<a-tab-pane tab="物资明细" key="1" forceRender > <a-tab-pane tab="物资明细" key="1" forceRender >
<process-material-warehousing-detail :materWared="this.$route.query.item" /> <process-material-warehousing-detail :materWared="this.$route.query.item" />
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="流程节点图" key="2" forceRender > <a-tab-pane tab="流程节点图" key="2" forceRender >
<process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/> <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="3" forceRender> <a-tab-pane tab="制式表格" key="3" forceRender>
<process-material-warehousing-statement :materWared="this.$route.query.item"/> <process-material-warehousing-statement :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
@ -114,6 +114,17 @@ export default {
this.loading = false; this.loading = false;
}) })
} }
if (key == 3) {
getAction(this.url.getProcessPicture, { id: this.$route.query.item }).then((res) => {
if (res.success) {
// this.dataSource = res.result.records;
// this.ipagination.total = res.result.total;
console.log(res, '获取数据')
this.$route.query.procInstId=res.result.procInstId;
console.log(this.procInstId)
}
})
}
} }
}, },

13
src/views/accessrecords/plan/ProcessMaterialsPlan.vue
Unescape View File

@ -10,7 +10,7 @@
<process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/> <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="3" forceRender> <a-tab-pane tab="制式表格" key="3" forceRender>
<ProcessMaterialsPlanList :materWared="this.$route.query.item"/> <ProcessMaterialsPlanList :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
@ -125,6 +125,17 @@
this.loading = false; this.loading = false;
}) })
} }
if (key == 3) {
getAction(this.url.getProcessPicture, { id: this.$route.query.item }).then((res) => {
if (res.success) {
// this.dataSource = res.result.records;
// this.ipagination.total = res.result.total;
console.log(res, '获取数据')
this.$route.query.procInstId=res.result.procInstId;
console.log(this.procInstId)
}
})
}
}, },
} }
} }

63
src/views/accessrecords/plan/ProcessMaterialsPlanList.vue
Unescape View File

@ -42,13 +42,13 @@
<!-- <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>--> <!-- <process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>-->
<!-- </a-tab-pane>--> <!-- </a-tab-pane>-->
<a-tab-pane tab="采购申请表" key="3" forceRender> <a-tab-pane tab="采购申请表" key="3" forceRender>
<process-materials-plan-statement :materWared="this.$route.query.item"/> <process-materials-plan-statement :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="采购通知书" key="4" forceRender> <a-tab-pane tab="采购通知书" key="4" forceRender>
<process-materials-plan-statement2 :materWared="this.$route.query.item"/> <process-materials-plan-statement2 :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="代储代销物资采购通知书" key="5" forceRender v-if="this.isIf"> <a-tab-pane tab="代储代销物资采购通知书" key="5" forceRender v-if="this.isIf">
<process-materials-plan-statement3 :materWared="this.$route.query.item"/> <process-materials-plan-statement3 :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
<!-- <a-tab-pane tab="报验单" key="6" forceRender> <!-- <a-tab-pane tab="报验单" key="6" forceRender>
<process-materials-plan-statement4 :materWared="this.$route.query.item"/> <process-materials-plan-statement4 :materWared="this.$route.query.item"/>
@ -115,54 +115,15 @@
], ],
} }
}, },
props: { /* props: {
// procInstId: {
// /*流程数据*/ type: String,
// processData:{ default: '',
// type:Object, required: true
// default:()=>{return {}}, },
// required:false },*/
// },
// item: {
// type:String,
// },
// },
// props: {
// /*流程数据*/
// processData:{
// type:Object,
// default:()=>{return {}},
// required:false
// },
// /*是否新增*/
// isNew: {type: Boolean, default: false, required: false},
// /*是否处理流程*/
// task: {type: Boolean, default: false, required: false},
// //流程表单data
// formData: {
// type: Object,
// default: () => {
// },
// required: false
// },
// //表单模式：false流程表单 true普通表单
// formBpm: {
// type: Boolean,
// default: false,
// required: false
// },
// //表单禁用
// disabled: {
// type: Boolean,
// default: false,
// required: false
// }
// materWared:{
// type:String,
// },
},
created(){ created(){
console.log("进来没有") console.log("进来没有",this.procInstId)
if (this.$route.query.sourceCapital==2){ if (this.$route.query.sourceCapital==2){
this.isIf=true; this.isIf=true;
} }
@ -182,7 +143,7 @@
methods: { methods: {
callback(key){ callback(key){
if (key==2){ if (key==2){
getAction(this.url.getProcessPicture, { id:this.$route.query.item }).then((res) => { getAction(this.url.getProcessPicture, { id:this.$route.query.item}).then((res) => {
if (res.success) { if (res.success) {
// this.dataSource = res.result.records; // this.dataSource = res.result.records;
// this.ipagination.total = res.result.total; // this.ipagination.total = res.result.total;

8
src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
Unescape View File

@ -52,7 +52,8 @@
pdfWord: '', pdfWord: '',
pdfSrc: '', pdfSrc: '',
queryParam: { queryParam: {
id: '' id: '',
procInstId:''
}, },
url: { url: {
list: '/hy/processUdgetPlan/getPlanTable', list: '/hy/processUdgetPlan/getPlanTable',
@ -98,7 +99,7 @@
methods: { methods: {
// 下载 // 下载
downWord() { downWord() {
downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryPlandDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件下载失败') this.$message.warning('文件下载失败')
return return
@ -116,7 +117,8 @@
}, },
previewWord() { previewWord() {
this.$message.loading('加载中请稍后......') this.$message.loading('加载中请稍后......')
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => { console.log(this.$route.query.procInstId,"***************")
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件预览失败') this.$message.warning('文件预览失败')
return return

5
src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
Unescape View File

@ -52,7 +52,8 @@
pdfWord: '', pdfWord: '',
pdfSrc: '', pdfSrc: '',
queryParam: { queryParam: {
id: '' id: '',
procInstId:''
}, },
url: { url: {
list: '/hy/processUdgetPlan/getPlanTable', list: '/hy/processUdgetPlan/getPlanTable',
@ -98,7 +99,7 @@
methods: { methods: {
// 下载 // 下载
downWord() { downWord() {
downFile(this.url.queryDeliveryDownWord, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryDeliveryDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件下载失败') this.$message.warning('文件下载失败')
return return

8
src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue
Unescape View File

@ -59,7 +59,8 @@
modalLsVisible: false, modalLsVisible: false,
pdfWord: '', pdfWord: '',
queryParam: { queryParam: {
id: '' id: '',
procInstId:''
}, },
pdfSrc: '', pdfSrc: '',
url: { url: {
@ -96,7 +97,7 @@
methods: { methods: {
// 下载 // 下载
downWord() { downWord() {
downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryPlandDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件下载失败') this.$message.warning('文件下载失败')
return return
@ -114,12 +115,11 @@
}, },
previewWord() { previewWord() {
this.$message.loading('加载中请稍后......') this.$message.loading('加载中请稍后......')
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryPlanPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件预览失败') this.$message.warning('文件预览失败')
return return
} }
console.log(data)
const blob = new Blob([data], { type: 'application/pdf' }) const blob = new Blob([data], { type: 'application/pdf' })
this.pdfSrc = window.URL.createObjectURL(blob) this.pdfSrc = window.URL.createObjectURL(blob)
window.open(this.pdfSrc)//新窗口打开，借用浏览器去打印 window.open(this.pdfSrc)//新窗口打开，借用浏览器去打印

4
src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue
Unescape View File

@ -98,7 +98,7 @@
methods: { methods: {
// 下载 // 下载
downWord() { downWord() {
downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryPlandDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size>0) { if (!data.size>0) {
this.$message.warning("文件下载失败") this.$message.warning("文件下载失败")
return return
@ -116,7 +116,7 @@
}, },
previewWord() { previewWord() {
this.$message.success("加载中请稍后......") this.$message.success("加载中请稍后......")
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryPlanPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size>0) { if (!data.size>0) {
this.$message.warning("文件预览失败") this.$message.warning("文件预览失败")
return return

7
src/views/accessrecords/statement/ProcessMaterialsPlanStatement3.vue
Unescape View File

@ -52,7 +52,8 @@
pdfWord: '', pdfWord: '',
pdfSrc: '', pdfSrc: '',
queryParam: { queryParam: {
id: '' id: '',
procInstId:''
}, },
url: { url: {
list: '/hy/processUdgetPlan/getPlanTable', list: '/hy/processUdgetPlan/getPlanTable',
@ -98,7 +99,7 @@
methods: { methods: {
// 下载 // 下载
downWord() { downWord() {
downFile(this.url.querySourceCapitalDownWord, { id: this.queryParam.id }).then((data) => { downFile(this.url.querySourceCapitalDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件下载失败') this.$message.warning('文件下载失败')
return return
@ -116,7 +117,7 @@
}, },
previewWord() { previewWord() {
this.$message.loading('加载中请稍后......') this.$message.loading('加载中请稍后......')
downFile(this.url.querySourceCapitalPrevie, { id: this.queryParam.id }).then((data) => { downFile(this.url.querySourceCapitalPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件预览失败') this.$message.warning('文件预览失败')
return return

7
src/views/accessrecords/statement/ProcessMaterialsPlanStatement4.vue
Unescape View File

@ -52,7 +52,8 @@
pdfWord: '', pdfWord: '',
pdfSrc: '', pdfSrc: '',
queryParam: { queryParam: {
id: '' id: '',
procInstId:''
}, },
url: { url: {
list: '/hy/processUdgetPlan/getPlanTable', list: '/hy/processUdgetPlan/getPlanTable',
@ -98,7 +99,7 @@
methods: { methods: {
// 下载 // 下载
downWord() { downWord() {
downFile(this.url.queryInspectionFormDownWord, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryInspectionFormDownWord, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件下载失败') this.$message.warning('文件下载失败')
return return
@ -116,7 +117,7 @@
}, },
previewWord() { previewWord() {
this.$message.loading('加载中请稍后......') this.$message.loading('加载中请稍后......')
downFile(this.url.queryInspectionFormPrevie, { id: this.queryParam.id }).then((data) => { downFile(this.url.queryInspectionFormPrevie, { id: this.queryParam.id,procInstId: this.$route.query.procInstId }).then((data) => {
if (!data.size > 0) { if (!data.size > 0) {
this.$message.warning('文件预览失败') this.$message.warning('文件预览失败')
return return

3
src/views/activiti/form/ProcessMaterialWarehousing.vue
Unescape View File

@ -16,7 +16,7 @@
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/> <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable"> <a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
<process-material-warehousing-statement :isTable="isTable" :materWared="this.$route.query.item"/> <process-material-warehousing-statement :isTable="isTable" :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-card> </a-card>
@ -72,6 +72,7 @@
this.isTable=true this.isTable=true
} }
this.$route.query.item=this.itemId this.$route.query.item=this.itemId
this.$route.query.procInstId=this.procInstId
}, },
methods: { methods: {
afterSub(formData) { afterSub(formData) {

4
src/views/activiti/form/ProcessUdgetPlan.vue
Unescape View File

@ -14,7 +14,7 @@
<historic-detail :pictureId="pictureId" :procInstId="procInstId"/> <historic-detail :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane> </a-tab-pane>
<a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable"> <a-tab-pane tab="制式表格" key="4" forceRender v-if="isTable">
<ProcessMaterialsPlanList :isTable="isTable" :materWared="this.$route.query.item"/> <ProcessMaterialsPlanList :isTable="isTable" :materWared="this.$route.query.item" :procInstId="this.$route.query.procInstId"/>
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
@ -122,7 +122,9 @@
if (this.itemId){ if (this.itemId){
this.isTable=true this.isTable=true
} }
console.log(this.itemId,this.procInstId,"***********")
this.$route.query.item=this.itemId this.$route.query.item=this.itemId
this.$route.query.procInstId=this.procInstId
}, },
methods: { methods: {
afterSub(formData){ afterSub(formData){

26
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -1519,31 +1519,7 @@
}) })
}, },
saveAndpassTask() { saveAndpassTask() {
this.getAllTable().then(tables => {
return validateFormAndTables(this.form, tables)
}).then(allValues => {
let formData = this.classifyIntoFormData(allValues)
if (this.isPlanType) {
if (!formData.planType) {
this.$message.error('请选择采购类型')
return
} else {
if (formData.ifDirect == null && this.routePlanName == '采购员' && formData.planType==1) {
this.$message.error('请选择是否属于直达物资!')
return
} else {
if (formData.ifDirect == 1) {
if (formData.ifInspection == null) {
this.$message.error('请选择是否需要送检!')
return
}
}
}
this.passTask()
this.handleSubmit(true) this.handleSubmit(true)
}
}
})
}, },
// handler // handler
handleSubmit(e) { handleSubmit(e) {
@ -1610,6 +1586,8 @@
} }
} }
} }
}else if (e==true){
this.passTask()
} }
console.log(formData, '格式化的数据') console.log(formData, '格式化的数据')
if (this.btndisabled === false) { if (this.btndisabled === false) {

Write Preview
Loading…
Cancel
Save