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

修改民爆采购页面提交

dev
caoyizhong 2 years ago
parent
d7aa7a8f97
commit
748a248560
6 changed files with 204 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/activiti/applyHome.vue
  2. 8
      src/views/burst/form/purchase/ProcessIndustrialDeliveryForm.vue
  3. 331
      src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
  4. 8
      src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
  5. 8
      src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
  6. 8
      src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue

2
src/views/activiti/applyHome.vue
Unescape View File

@ -290,7 +290,7 @@
})
},
filterDictText(dictOptions, text) {
console.log("-=-=",dictOptions,text);
// console.log("-=-=",dictOptions,text);
if (dictOptions instanceof Array) {
for (let dictItem of dictOptions) {
if (text === dictItem.value) {

8
src/views/burst/form/purchase/ProcessIndustrialDeliveryForm.vue
Unescape View File

@ -22,7 +22,10 @@
<a-col :xs="24" :sm="8">
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deliveryType">
<a-input-number v-model="model.deliveryType" placeholder="请输入物资类型" style="width: 100%" />
<!-- <a-input-number v-model="model.deliveryType" placeholder="请输入物资类型" style="width: 100%" />-->
<j-dict-select-tag type="list" v-model="form.deliveryType"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
@ -505,4 +508,7 @@ import { getStringArry } from '@api/manage'
</script>
<style scoped>
.div_process {
margin-top: 30px;
}
</style>

331
src/views/burst/form/purchase/ProcessIndustrialPurchaseForm.vue
Unescape View File

@ -2,26 +2,24 @@
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<!-- 主表单区域 -->
<a-form-model ref="form" :model="form" :rules="validatorRules" slot="detail">
<a-form ref="form" :form="form" slot="detail">
<a-row>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planType">
<!-- <a-input-number v-model="model.planType" placeholder="请输入流程发起人" style="width: 100%" disabled />-->
<j-select-user-by-dep v-model="form.planType" disabled/>
<j-select-user-by-dep v-decorator="['createBy']" disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="company">
<!-- <a-input v-model="model.company" placeholder="请输入流程发起公司" 流程发起人></a-input>-->
<j-select-company v-model="form.company" multi disabled/>
<j-select-company v-decorator="['company']" disabled/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="流程发起部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departId">
<!-- <a-input v-model="model.departId" placeholder="请输入流程发起部门" 流程发起人></a-input>-->
<j-select-depart v-model="form.departId" multi disabled/>
<j-select-depart v-decorator="['departId']" disabled/>
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="12">-->
@ -43,17 +41,17 @@
<a-col :xs="24" :sm="8">
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialType">
<!-- <a-input-number v-model="form.materialType" placeholder="请输入物资类型" style="width: 100%" />-->
<j-dict-select-tag type="list" v-model="form.materialType"
dictCode="material_type"
<j-dict-select-tag type="list" v-decorator="['materialType',validatorRules.materialType]"
dictCode="explosive_type" :trigger-change="true"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="归口部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="putUnder">
<a-input v-model="form.putUnder" placeholder="请输入归口部门" ></a-input>
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="归口部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="putUnder">-->
<!-- <a-input v-decorator="['putUnder']" placeholder="请输入归口部门" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :xs="24" :sm="12">-->
<!-- <a-form-model-item label="大于50000的单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialPrice">-->
<!-- <a-input-number v-model="model.materialPrice" placeholder="请输入大于50000的单价" style="width: 100%" />-->
@ -66,7 +64,7 @@
<!-- </a-col>-->
<a-col :xs="24" :sm="8">
<a-form-model-item label="需求时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="needTime">
<j-date placeholder="请选择需求时间" v-model="form.needTime" style="width: 100%" />
<j-date placeholder="请选择需求时间" v-decorator="['needTime',validatorRules.needTime]" style="width: 100%" />
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="12">-->
@ -79,28 +77,28 @@
<!-- <a-input v-model="model.sort" placeholder="请输入生成序号" ></a-input>-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :xs="24" :sm="8">
<a-form-model-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNumber">
<a-input-number v-model="form.orderNumber" placeholder="请输入顺序号" style="width: 100%" />
</a-form-model-item>
</a-col>
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNumber">-->
<!-- <a-input-number v-model="form.orderNumber" placeholder="请输入顺序号" style="width: 100%" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<!-- <a-col :xs="24" :sm="8">-->
<!-- <a-form-model-item label="是否直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifDirect">-->
<!-- <a-input-number v-model="form.ifDirect" placeholder="请输入是否属于直达物资" style="width: 100%" />-->
<!-- </a-form-model-item>-->
<!-- </a-col>-->
<a-col :xs="24" :sm="8">
<a-form-model-item label="是否直达物资" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifDirect">
<a-input-number v-model="form.ifDirect" placeholder="请输入是否属于直达物资" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
<a-form-model-item label="文件id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileId">
<a-form-model-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" prop="fileId">
<!-- <a-input v-model="form.fileId" placeholder="请输入文件id" ></a-input>-->
<j-upload v-model="form.fileId" style="z-index: 999"></j-upload>
<j-upload v-decorator="['fileId']" style="z-index: 999"></j-upload>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</a-form>
</j-form-container>
<!-- 子表单区域 -->
<a-tabs v-model="activeKey" @change="handleChangeTabs">
@ -152,7 +150,8 @@ import { FormTypes, getRefPromise, VALIDATE_NO_PASSED, validateFormAndTables } f
import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectCompany from '../../../../components/jeecgbiz/JSelectCompany'
import { getStringArry, httpAction } from '@api/manage'
import { getCurrentTime, getStringArry, httpAction } from '@api/manage'
import pick from 'lodash.pick'
export default {
name: 'ProcessIndustrialPurchaseForm',
@ -168,7 +167,6 @@ import { getStringArry, httpAction } from '@api/manage'
},
data() {
return {
isGetOneAndLast: true, //提交按钮显示
btndisabled: false,
labelCol: {
@ -179,39 +177,41 @@ import { getStringArry, httpAction } from '@api/manage'
xs: { span: 24 },
sm: { span: 16 },
},
labelCol3: {
xs: { span: 24 },
sm: { span: 6 }
},
wrapperCol3: {
xs: { span: 24 },
sm: { span: 5 }
},
// form:{
// planType:null,
// company:null,
// departId:null,
// },
validatorRules: {
planType: [
{ required: true, message: '请输入计划采购类型!'},
],
ifDirect: [
{ required: true, message: '请输入是否属于直达物资!'},
],
ifInspection: [
planType: { rules:[
{ required: true, message: '请输入计划采购类型!'}
]},
ifDirect: { rules:[
{ required: true, message: '请输入是否属于直达物资!'}
]},
ifInspection: { rules:[
{ required: true, message: '请输入是否需要送检!'},
],
sourceCapital: [
]},
sourceCapital: { rules:[
{ required: true, message: '请输入资金来源!'},
],
departId: [
{ required: true, message: '请输入流程发起部门!'},
],
materialType: [
]},
materialType: { rules:[
{ required: true, message: '请输入物资类型!'},
],
orderNumber: [
]},
orderNumber: { rules:[
{ required: true, message: '请输入顺序号!'},
],
actStatus: [
{ required: true, message: '请输入流程状态描述!'},
],
warehousingBatch: [
{ required: true, message: '请输入入库批次号!'},
],
]},
needTime: { rules:[{ required: true, message: '请选择需求时间!' } ]},
},
// 新增时子表默认添加几行空数据
addDefaultRowNum: 1,
@ -302,14 +302,14 @@ import { getStringArry, httpAction } from '@api/manage'
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '执行标准',
key: 'materialStandard',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
// {
// title: '执行标准',
// key: 'materialStandard',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
{
title: '交货时间',
key: 'deliveryTime',
@ -318,27 +318,19 @@ import { getStringArry, httpAction } from '@api/manage'
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '备注',
key: 'remarks',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '关联id',
key: 'processIndustrialPurchaseId',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
// {
// title: '关联id',
// key: 'processIndustrialPurchaseId',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// validateRules: [{ required: true, message: '${title}不能为空' }],
// },
{
title: '保质期',
key: 'expirationDate',
type: FormTypes.date,
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
@ -369,23 +361,23 @@ import { getStringArry, httpAction } from '@api/manage'
// placeholder: '请输入${title}',
// defaultValue:'',
// },
{
title: '商品详情id',
key: 'commodityDetailsId',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '物料描述',
key: 'materialDescription',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
// {
// title: '商品详情id',
// key: 'commodityDetailsId',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// validateRules: [{ required: true, message: '${title}不能为空' }],
// },
// {
// title: '物料描述',
// key: 'materialDescription',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
{
title: '生产时间',
key: 'productionTime',
@ -393,7 +385,7 @@ import { getStringArry, httpAction } from '@api/manage'
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
// validateRules: [{ required: true, message: '${title}不能为空' }],
},
// {
// title: '入库时间',
@ -403,23 +395,31 @@ import { getStringArry, httpAction } from '@api/manage'
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '商品id',
// key: 'commodityId',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// validateRules: [{ required: true, message: '${title}不能为空' }],
// },
{
title: '商品id',
key: 'commodityId',
title: '供应商',
key: 'supplierId',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
// validateRules: [{ required: true, message: '${title}不能为空' }],
},
{
title: '供应商',
key: 'supplierId',
title: '备注',
key: 'remarks',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
// {
// title: '库房id',
@ -430,15 +430,15 @@ import { getStringArry, httpAction } from '@api/manage'
// defaultValue:'',
// validateRules: [{ required: true, message: '${title}不能为空' }],
// },
{
title: '核算属性',
key: 'materialType',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
// {
// title: '核算属性',
// key: 'materialType',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// validateRules: [{ required: true, message: '${title}不能为空' }],
// },
// {
// title: '删除时间',
// key: 'delTime',
@ -455,15 +455,15 @@ import { getStringArry, httpAction } from '@api/manage'
// placeholder: '请输入${title}',
// defaultValue:'',
// },
{
title: '批次数',
key: 'supplierBatch',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
validateRules: [{ required: true, message: '${title}不能为空' }],
},
// {
// title: '批次数',
// key: 'supplierBatch',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// validateRules: [{ required: true, message: '${title}不能为空' }],
// },
// {
// title: '是否完结0未完结 1完结',
// key: 'status',
@ -477,6 +477,7 @@ import { getStringArry, httpAction } from '@api/manage'
url: {
add: "/burst/processIndustrialPurchase/add",
edit: "/burst/processIndustrialPurchase/edit",
addFromTableApply: "/burst/processIndustrialPurchase/addFromTableApply",
processIndustrialPurchaseMaterial: {
list: '/burst/processIndustrialPurchase/queryProcessIndustrialPurchaseMaterialByMainId'
},
@ -485,12 +486,22 @@ import { getStringArry, httpAction } from '@api/manage'
}
},
props: {
/*流程数据*/
processData: {
type: Object,
default: () => {
return {}
},
required: false
},
//表单禁用
disabled: {
type: Boolean,
default: false,
required: false
},
/*是否新增*/
isNew: { type: Boolean, default: false, required: false },
/*是否处理流程*/
task: { type: Boolean, default: false, required: false },
/*采购类型*/
@ -508,6 +519,9 @@ import { getStringArry, httpAction } from '@api/manage'
this.popupCallback(company, userInfo, puwwcid)
},
methods: {
onChange(date, dateString) {
console.log(date, dateString);
},
//物资类型切换
elect(val) {
if (val != undefined) {
@ -532,7 +546,7 @@ import { getStringArry, httpAction } from '@api/manage'
}
let formData = this.classifyIntoFormData(allValues)
console.log("=--=-=-",formData);
/* if (formData.processIndustrialPurchaseMaterialList==0){
if (formData.processIndustrialPurchaseMaterialList == 0){
this.$message.error('请填写清单内容')
return
}
@ -543,11 +557,6 @@ import { getStringArry, httpAction } from '@api/manage'
this.describes = this.describes + '---' + formData.processIndustrialPurchaseMaterialList[i].materialName
}
}
*/
formData.fileId = getStringArry(formData.fileId)
// if (this.materialPrice != 0 && this.materialPrice != null) {
// formData.materialPrice = this.materialPrice;
@ -561,13 +570,14 @@ import { getStringArry, httpAction } from '@api/manage'
}
// console.log(this.opinion, '流程说明')
this.form.validateFields((err, values) => {
if (!err) {
// console.log(this.processData, '申请列表传值数据')
formData.procDefId = this.processData.id
formData.procDeTitle = this.processData.name
formData.title = this.processData.description
//formData.sourceCapital
// console.log('this.planType++', this.planType)
// console.log('this.planType++');
if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.addFromTableApply
let method = 'post'
@ -598,18 +608,18 @@ import { getStringArry, httpAction } from '@api/manage'
console.log(formData, '表单数据')
if (this.btndisabled === false) {
this.btndisabled = true
// httpAction(url, formData, method).then((res) => {
// if (res.success) {
// this.$message.success('提交申请成功！')
// //todo 将表单的数据传给父组件
// this.$emit('loadData')
// this.close()
// } else {
// this.$message.error(res.message)
// }
// }).finally(() => {
// this.btndisabled = false
// })
httpAction(url, formData, method).then((res) => {
if (res.success) {
this.$message.success('提交申请成功！')
//todo 将表单的数据传给父组件
this.$emit('loadData')
this.close()
} else {
this.$message.error(res.message)
}
}).finally(() => {
this.btndisabled = false
})
}
}
})
@ -700,19 +710,19 @@ import { getStringArry, httpAction } from '@api/manage'
if(!!formData.ifInspection) formData.ifInspection = parseInt(formData.ifInspection);
console.log(formData, '格式化的数据');
if (this.btndisabled === false) {
// this.btndisabled = true
// httpAction(url, formData, method).then((res) => {
// if (res.success) {
// //todo 将表单的数据传给父组件
// if (e != true) {
// this.$emit('afterSubmit', formData)
// }
// } else {
// this.$message.error(res.message)
// }
// }).finally(() => {
// this.btndisabled = false
// })
this.btndisabled = true
httpAction(url, formData, method).then((res) => {
if (res.success) {
//todo 将表单的数据传给父组件
if (e != true) {
this.$emit('afterSubmit', formData)
}
} else {
this.$message.error(res.message)
}
}).finally(() => {
this.btndisabled = false
})
}
}
})
@ -721,9 +731,18 @@ import { getStringArry, httpAction } from '@api/manage'
},
popupCallback(company, row, puwwcid) {
let res = JSON.parse(row)
this.form.planType = res.username
this.form.company = company
this.form.departId = res.departIds
let param = {}
param.createBy = res.username
param.company = company
param.departId = res.departIds;
//查询数据
// this.getSortNum(res.departIds);
// param.createTime = getCurrentTime();
this.data = param
let fieldval = pick(this.data, 'createBy', 'company', 'departId')
this.$nextTick(() => {
this.form.setFieldsValue(fieldval);
})
// if (puwwcid != null) {
// let params = {}
// params.id = puwwcid
@ -811,7 +830,7 @@ import { getStringArry, httpAction } from '@api/manage'
close() {
this.visible = false
this.$emit('close')
this.$refs.form.clearValidate();
// this.$refs.form.clearValidate();
},
}

8
src/views/burst/form/purchase/ProcessIndustrialRestoreForm.vue
Unescape View File

@ -22,7 +22,10 @@
<a-col :span="8" >
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>-->
<j-dict-select-tag type="list" v-model="form.type"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
<a-col :span="8" >
@ -507,4 +510,7 @@ import { getAction, getStringArry } from '@/api/manage'
</script>
<style scoped>
.div_process {
margin-top: 30px;
}
</style>

8
src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
Unescape View File

@ -28,7 +28,10 @@
<a-col :xs="24" :sm="8">
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>-->
<j-dict-select-tag type="list" v-model="form.type"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
</a-row>
@ -495,4 +498,7 @@ import { getStringArry } from '@api/manage'
</script>
<style scoped>
.div_process {
margin-top: 30px;
}
</style>

8
src/views/burst/form/purchase/ProcessIndustrialStorageForm.vue
Unescape View File

@ -27,7 +27,10 @@
<a-col :xs="24" :sm="8">
<a-form-model-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>
<!-- <a-input v-model="model.type" placeholder="请输入物资类型" ></a-input>-->
<j-dict-select-tag type="list" v-model="form.type"
dictCode="explosive_type"
placeholder="请选择物资类型" @change="elect"/>
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="8">
@ -529,4 +532,7 @@ import { getStringArry } from '@api/manage'
</script>
<style scoped>
.div_process {
margin-top: 30px;
}
</style>
Write Preview
Loading…
Cancel
Save