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

修改登录输入框内容，修改预算计划流程

dev
long 2 years ago
parent
1ab7ed36bb
commit
85291f4dd8
5 changed files with 197 additions and 186 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
      .env.production
  2. 2
      package.json
  3. 175
      src/views/activiti/form/ProcessMaterialWarehousingForm.vue
  4. 200
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  5. 4
      src/views/user/Login.vue

2
.env.production
Unescape View File

@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=https://bootapi.jeecg.com
VUE_APP_API_BASE_URL=http://haoyi.scyp.ink/prod-api
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

2
package.json
Unescape View File

@ -6,7 +6,7 @@
"pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
"serve": "vue-cli-service serve",
"build:test": "vue-cli-service build --mode test",
"build": "vue-cli-service build",
"build": "vue-cli-service build --mode production",
"lint": "vue-cli-service lint"
},
"dependencies": {

175
src/views/activiti/form/ProcessMaterialWarehousingForm.vue
Unescape View File

@ -31,7 +31,8 @@
</a-col>
<a-col :span="12" >
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number v-decorator="['materialType']" placeholder="请输入物资类型" style="width: 100%" dictCode="material_type"/>
<j-dict-select-tag type="list" v-decorator="['materialType']" :trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型"/>
</a-form-item>
</a-col>
<a-col :span="12" >
@ -135,92 +136,92 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
loading: false,
dataSource: [],
columns: [
{
title: '物料组',
key: 'materialGroup',
type: FormTypes.sel_search,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '物料号',
key: 'materialNumber',
type: FormTypes.sel_search,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '物料描述',
key: 'materialDescription',
type: FormTypes.input,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '仓储地点_id',
key: 'unitWasteWarehouseCodeId',
type: FormTypes.sel_search,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '生产时间',
key: 'productionTime',
type: FormTypes.date,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '保质期',
key: 'expirationDate',
type: FormTypes.date,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '是否到货',
key: 'arrivalNotice',
type: FormTypes.select,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '入库时间',
key: 'storageTime',
type: FormTypes.date,
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '入库人',
key: 'librarySign',
type: FormTypes.sel_search,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
{
title: '核算属性',
key: 'materialType',
type: FormTypes.sel_search,
dictCode:"",
width:"200px",
placeholder: '请输入${title}',
defaultValue:'',
},
// {
// title: '物料组',
// key: 'materialGroup',
// type: FormTypes.sel_search,
// dictCode:"",
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '物料号',
// key: 'materialNumber',
// type: FormTypes.sel_search,
// dictCode:"",
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '物料描述',
// key: 'materialDescription',
// type: FormTypes.input,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '仓储地点_id',
// key: 'unitWasteWarehouseCodeId',
// type: FormTypes.sel_search,
// dictCode:"",
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '生产时间',
// key: 'productionTime',
// type: FormTypes.date,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '保质期',
// key: 'expirationDate',
// type: FormTypes.date,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '是否到货',
// key: 'arrivalNotice',
// type: FormTypes.select,
// dictCode:"",
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '入库时间',
// key: 'storageTime',
// type: FormTypes.date,
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '入库人',
// key: 'librarySign',
// type: FormTypes.sel_search,
// dictCode:"",
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
// {
// title: '核算属性',
// key: 'materialType',
// type: FormTypes.sel_search,
// dictCode:"",
// width:"200px",
// placeholder: '请输入${title}',
// defaultValue:'',
// },
{
title: '器材编号',
key: 'equipment',

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

@ -5,6 +5,11 @@
<!-- 主表单区域 -->
<a-form :form="form" slot="detail">
<a-row>
<a-col :span="12" v-show="false">
<a-form-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['id']" placeholder="" style="width: 100%"/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="流程发起公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-select-company v-decorator="['company']" multi/>
@ -89,7 +94,7 @@
const VALIDATE_NO_PASSED = Symbol()
import pick from 'lodash.pick'
import { getAction } from '@/api/manage'
import { getAction,httpAction } from '@/api/manage'
import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import JFormContainer from '@/components/jeecg/JFormContainer'
@ -158,70 +163,70 @@
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '物料描述',
key: 'materialDescription',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '仓储地点_id',
key: 'unitWasteWarehouseCodeId',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '生产时间',
key: 'productionTime',
type: FormTypes.date,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '保质期',
key: 'expirationDate',
type: FormTypes.date,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '是否到货',
key: 'arrivalNotice',
type: FormTypes.inputNumber,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '入库时间',
key: 'storageTime',
type: FormTypes.date,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '入库人',
key: 'librarySign',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '核算属性',
key: 'materialType',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
// {
// title: '物料描述',
// key: 'materialDescription',
// type: FormTypes.input,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '仓储地点_id',
// key: 'unitWasteWarehouseCodeId',
// type: FormTypes.input,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '生产时间',
// key: 'productionTime',
// type: FormTypes.date,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '保质期',
// key: 'expirationDate',
// type: FormTypes.date,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '是否到货',
// key: 'arrivalNotice',
// type: FormTypes.inputNumber,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '入库时间',
// key: 'storageTime',
// type: FormTypes.date,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '入库人',
// key: 'librarySign',
// type: FormTypes.input,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '核算属性',
// key: 'materialType',
// type: FormTypes.input,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
{
title: '物料名称及规格型号',
key: 'materialName',
@ -385,8 +390,13 @@
this.data = formData;
console.log("表单回显数据",this.data)
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.data,'company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId'))
this.form.setFieldsValue(pick(this.data,'id','company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId'))
});
// 加载子表数据
if (this.data.id) {
let params = { id: this.data.id }
this.requestSubTableData(this.url.processUdgetPlanMaterial.list, params, this.processUdgetPlanMaterialTable)
}
this.btndisabled = false;
}else {
this.$message.error(res.message)
@ -465,35 +475,35 @@
throw this.throwNotFunction('classifyIntoFormData')
}
let formData = this.classifyIntoFormData(allValues)
console.log('格式化后的数据',formData)
// this.form.validateFields((err, values) => {
// if (!err) {
// let formData = Object.assign(this.data||{}, values)
// formData.procDefId = this.processData.id;
// formData.procDeTitle = this.processData.name;
// if (!formData.tableName)formData.tableName = this.processData.businessTable;
// formData.filedNames = _.keys(values).join(",");
// console.log('formData', values)
// this.processUdgetPlanMaterialTable.dataSource=[]
// console.log('子表数据')
// var url = this.url.add;
// if (!this.isNew){
// url = this.url.edit;
// }
// //this.btndisabled = true;
// // this.postFormAction(url,formData).then((res)=>{
// // if (res.success){
// // this.$message.success("保存成功！")
// // //todo 将表单的数据传给父组件
// // this.$emit('afterSubmit',formData)
// // }else {
// // this.$message.error(res.message)
// // }
// // }).finally(()=>{
// // this.btndisabled = false;
// // })
// }
// })
this.form.validateFields((err, values) => {
if (!err) {
formData.procDefId = this.processData.id;
formData.procDeTitle = this.processData.name;
formData.title=this.processData.description;
if (!formData.tableName)formData.tableName = this.processData.businessTable;
console.log('格式化后的数据',formData)
var url = this.url.add;
let method='post';
if (!this.isNew){
url = this.url.edit;
method='put';
}
console.log('提交方法',method)
this.btndisabled = true;
httpAction(url,formData,method).then((res)=>{
if (res.success){
this.$message.success("保存成功！")
//todo 将表单的数据传给父组件
this.$emit('afterSubmit',formData)
}else {
this.$message.error(res.message)
}
}).finally(()=>{
this.btndisabled = false;
})
}
})
})
},

4
src/views/user/Login.vue
Unescape View File

@ -11,7 +11,7 @@
size="large"
v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
type="text"
placeholder="请输入帐户名 / admin">
placeholder="请输入帐户名">
<a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>
@ -22,7 +22,7 @@
size="large"
type="password"
autocomplete="false"
placeholder="密码 / 123456">
placeholder="请输入密码">
<a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
</a-input>
</a-form-item>

Write Preview
Loading…
Cancel
Save