mhsnet 2 months ago
commit 15b0795f88

@ -43,5 +43,5 @@ public class YysBillMaterialForm {
private String creatorTime;
/** 单据状态 **/
@JsonProperty("documentStatus")
private String documentStatus;
private Object documentStatus;
}

@ -21,7 +21,7 @@ public class YysUnitInformationConstant{
/** 整个表单配置json */
public static final String getFormData(){
StringBuilder sb = new StringBuilder();
sb.append("{\"popupType\":\"general\",\"idGlobal\":103,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102213960,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102214103,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":103,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102214513,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"enableStatus\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}"); return sb.toString();
sb.append("{\"popupType\":\"general\",\"idGlobal\":104,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位编码\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102213960,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"单位名称\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723102214103,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"unitName\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"filterable\":false,\"clearable\":true,\"__config__\":{\"formId\":104,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"select\",\"defaultValue\":\"1\",\"noShow\":false,\"dataType\":\"static\",\"dictionaryType\":\"\",\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"启用状态\",\"trigger\":\"change\",\"propsUrl\":\"\",\"templateJson\":[],\"showLabel\":true,\"required\":false,\"tableName\":\"yys_unit_information\",\"renderKey\":1723106784894,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-select\",\"propsName\":\"\",\"tag\":\"JnpfSelect\",\"regList\":[],\"span\":24},\"options\":[{\"fullName\":\"启用\",\"id\":\"1\"},{\"fullName\":\"禁用\",\"id\":\"2\"}],\"multiple\":false,\"__vModel__\":\"enableStatus\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"interfaceHasPage\":false,\"placeholder\":\"请选择\",\"props\":{\"label\":\"fullName\",\"value\":\"id\"}}],\"span\":24}"); return sb.toString();
}
/** 列表字段配置json */
public static final String getColumnData(){

@ -25,5 +25,5 @@ public class YysUnitInformationForm {
private String unitName;
/** 启用状态 **/
@JsonProperty("enableStatus")
private String enableStatus;
private Object enableStatus;
}

@ -1,67 +1,56 @@
<template>
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label="母件编码"
prop="pieceId" >
<p>{{dataForm.pieceId}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="母件编码" prop="pieceId">
<p>{{ dataForm.pieceId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="母件名称"
prop="pieceName" >
<p>{{dataForm.pieceName}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="母件名称" prop="pieceName">
<p>{{ dataForm.pieceName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="规格型号"
prop="models" >
<p>{{dataForm.models}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="规格型号" prop="models">
<p>{{ dataForm.models }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="计量单位"
prop="unit" >
<p>{{dataForm.unit}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="计量单位" prop="unit">
<p>{{ dataForm.unit }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="版本代号"
prop="versionCode" >
<p>{{dataForm.versionCode}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="版本代号" prop="versionCode">
<p>{{ dataForm.versionCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="版本说明"
prop="versionIllustrate" >
<p>{{dataForm.versionIllustrate}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="版本说明" prop="versionIllustrate">
<p>{{ dataForm.versionIllustrate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="版本日期"
prop="versionDate" >
<p>{{dataForm.versionDate}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="版本日期" prop="versionDate">
<p>{{ dataForm.versionDate }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="创建时间"
prop="creatorTime" >
<p>{{dataForm.creatorTime}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<p>{{ dataForm.creatorTime }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="单据状态"
prop="documentStatus" >
<p>{{dataForm.documentStatus}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="单据状态" prop="documentStatus">
<p>{{ dataForm.documentStatus }} </p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
@ -70,14 +59,14 @@
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
@ -86,17 +75,19 @@
loading: false,
dataForm: {
id :'',
pieceId : '',
pieceName : '',
models : '',
unit : '',
versionCode : '',
versionIllustrate : '',
versionDate : '',
creatorTime : '',
documentStatus : '',
id: '',
pieceId: '',
pieceName: '',
models: '',
unit: '',
versionCode: '',
versionIllustrate: '',
versionDate: '',
creatorTime: '',
documentStatus: "2",
},
documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }],
documentStatusProps: { "label": "fullName", "value": "id" },
}
},
@ -105,7 +96,7 @@
created() {
},
mounted() {},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -119,8 +110,8 @@
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
@ -128,10 +119,10 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysBillMaterial/detail/'+this.dataForm.id,
url: '/api/example/YysBillMaterial/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -142,6 +133,6 @@
})
},
},
}
}
</script>

@ -1,122 +1,115 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<template>
<el-dialog :title="!dataForm.id ? '新建' : '编辑'" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px" label-position="right" >
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24" >
<jnpf-form-tip-item
label="母件编码" prop="pieceId" >
<JnpfInput v-model="dataForm.pieceId" @change="changeData('pieceId',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="24">
<jnpf-form-tip-item label="母件编码" prop="pieceId">
<JnpfInput v-model="dataForm.pieceId" @change="changeData('pieceId', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="母件名称" prop="pieceName" >
<JnpfInput v-model="dataForm.pieceName" @change="changeData('pieceName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="24">
<jnpf-form-tip-item label="母件名称" prop="pieceName">
<JnpfInput v-model="dataForm.pieceName" @change="changeData('pieceName', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="规格型号" prop="models" >
<JnpfInput v-model="dataForm.models" @change="changeData('models',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="24">
<jnpf-form-tip-item label="规格型号" prop="models">
<JnpfInput v-model="dataForm.models" @change="changeData('models', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="计量单位" prop="unit" >
<JnpfInput v-model="dataForm.unit" @change="changeData('unit',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="24">
<jnpf-form-tip-item label="计量单位" prop="unit">
<JnpfInput v-model="dataForm.unit" @change="changeData('unit', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="版本代号" prop="versionCode" >
<JnpfInput v-model="dataForm.versionCode" @change="changeData('versionCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="24">
<jnpf-form-tip-item label="版本代号" prop="versionCode">
<JnpfInput v-model="dataForm.versionCode" @change="changeData('versionCode', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="版本说明" prop="versionIllustrate" >
<JnpfInput v-model="dataForm.versionIllustrate" @change="changeData('versionIllustrate',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-col :span="24">
<jnpf-form-tip-item label="版本说明" prop="versionIllustrate">
<JnpfInput v-model="dataForm.versionIllustrate" @change="changeData('versionIllustrate', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="版本日期" prop="versionDate" >
<JnpfInput v-model="dataForm.versionDate" @change="changeData('versionDate',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
<el-col :span="24">
<jnpf-form-tip-item label="版本日期" prop="versionDate">
<JnpfDatePicker v-model="dataForm.versionDate" @change="changeData('versionDate', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="date" format="yyyy-MM-dd">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="创建时间" prop="creatorTime" >
<JnpfInput v-model="dataForm.creatorTime" @change="changeData('creatorTime',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
<el-col :span="24">
<jnpf-form-tip-item label="创建时间" prop="creatorTime">
<JnpfDatePicker v-model="dataForm.creatorTime" @change="changeData('creatorTime', -1)"
:startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
placeholder="请选择" clearable :style='{ "width": "100%" }' type="datetime"
format="yyyy-MM-dd HH:mm:ss">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item
label="单据状态" prop="documentStatus" >
<JnpfInput v-model="dataForm.documentStatus" @change="changeData('documentStatus',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
<el-col :span="24">
<jnpf-form-tip-item label="单据状态" prop="documentStatus">
<JnpfSelect v-model="dataForm.documentStatus" @change="changeData('documentStatus', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="documentStatusOptions"
:props="documentStatusProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
{{ '上一条' }}
</el-button>
<el-button @click="next" :disabled='nextDis'>
{{'下一条'}}
{{ '下一条' }}
</el-button>
</div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading">
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-button>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-button>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</template>
</template>
<script>
import request from '@/utils/request'
import {mapGetters} from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { },
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {},
props: [],
data() {
return {
@ -130,48 +123,50 @@
loading: false,
btnLoading: false,
formRef: 'formRef',
setting:{},
setting: {},
eventType: '',
userBoxVisible:false,
userBoxVisible: false,
selectDialogVisible: false,
currTableConf:{},
dataValueAll:{},
addTableConf:{
currTableConf: {},
dataValueAll: {},
addTableConf: {
},
//
ableAll:{
ableAll: {
},
tableRows:{
tableRows: {
},
Vmodel:"",
currVmodel:"",
Vmodel: "",
currVmodel: "",
dataForm: {
pieceId : undefined,
pieceName : undefined,
models : undefined,
unit : undefined,
versionCode : undefined,
versionIllustrate : undefined,
versionDate : undefined,
creatorTime : undefined,
documentStatus : undefined,
pieceId: undefined,
pieceName: undefined,
models: undefined,
unit: undefined,
versionCode: undefined,
versionIllustrate: undefined,
versionDate: undefined,
creatorTime: undefined,
documentStatus: "2",
},
tableRequiredData: {},
dataRule:
{
},
childIndex:-1,
isEdit:false,
documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }],
documentStatusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
pieceId:[] ,
pieceName:[] ,
models:[] ,
unit:[] ,
versionCode:[] ,
versionIllustrate:[] ,
versionDate:[] ,
creatorTime:[] ,
documentStatus:[] ,
pieceId: [],
pieceName: [],
models: [],
unit: [],
versionCode: [],
versionIllustrate: [],
versionDate: [],
creatorTime: [],
documentStatus: [],
},
}
},
@ -184,7 +179,7 @@
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() {},
mounted() { },
methods: {
prev() {
this.index--
@ -214,7 +209,7 @@
},
getInfo(id) {
request({
url: '/api/example/YysBillMaterial/'+ id,
url: '/api/example/YysBillMaterial/' + id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -238,7 +233,7 @@
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
if (this[options]) {
this[options]()
}
this.changeData(key, index)
@ -247,8 +242,8 @@
}
}
},
changeDataFormData(type, data, model,index,defaultValue) {
if(!this.isEdit) {
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
@ -262,12 +257,12 @@
}
}
},
dataAll(){
dataAll() {
},
clearData(){
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
@ -286,16 +281,16 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysBillMaterial/'+this.dataForm.id,
url: '/api/example/YysBillMaterial/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
} else {
this.clearData()
this.initDefaultData()
}
@ -316,7 +311,7 @@
})
},
request() {
let _data =this.dataList()
let _data = this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
@ -346,13 +341,13 @@
this.$emit('refresh', true)
}
})
}).catch(()=>{
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}else{
} else {
request({
url: '/api/example/YysBillMaterial/'+this.dataForm.id,
url: '/api/example/YysBillMaterial/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
@ -367,15 +362,15 @@
this.$emit('refresh', true)
}
})
}).catch(()=>{
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
@ -384,8 +379,8 @@
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if(this['get'+this.currVmodel]){
this['get'+this.currVmodel](t)
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
}
}
},
@ -452,18 +447,18 @@
}
return timeDataValue;
},
dataList(){
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex=-1
this.childIndex = -1
},
},
}
}
</script>

@ -160,6 +160,8 @@ export default {
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }],
documentStatusProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}

@ -1,43 +1,36 @@
<template>
<el-dialog title="详情"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<el-dialog title="详情" :close-on-click-modal="false" append-to-body :visible.sync="visible"
class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24" >
<jnpf-form-tip-item label="供应商编码"
prop="supplierId" >
<p>{{dataForm.supplierId}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="供应商编码" prop="supplierId">
<p>{{ dataForm.supplierId }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="供应商简称"
prop="supplierSname" >
<p>{{dataForm.supplierSname}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="供应商简称" prop="supplierSname">
<p>{{ dataForm.supplierSname }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="供应商全称"
prop="supplierCname" >
<p>{{dataForm.supplierCname}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="供应商全称" prop="supplierCname">
<p>{{ dataForm.supplierCname }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="供应商分类"
prop="supplierClassification" >
<p>{{dataForm.supplierClassification}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="供应商分类" prop="supplierClassification">
<p>{{ dataForm.supplierClassification }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="启用状态"
prop="enableStatus" >
<p>{{dataForm.enableStatus}}</p>
<el-col :span="24">
<jnpf-form-tip-item label="启用状态" prop="enableStatus">
<p>{{ dataForm.enableStatus }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
@ -46,14 +39,14 @@
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
@ -62,13 +55,15 @@
loading: false,
dataForm: {
id :'',
supplierId : '',
supplierSname : '',
supplierCname : '',
supplierClassification : '',
enableStatus : '',
id: '',
supplierId: '',
supplierSname: '',
supplierCname: '',
supplierClassification: '',
enableStatus: '2',
},
enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps: { "label": "fullName", "value": "id" },
}
},
@ -77,7 +72,7 @@
created() {
},
mounted() {},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -91,8 +86,8 @@
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
@ -100,10 +95,10 @@
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/example/YysSupplierInformation/detail/'+this.dataForm.id,
url: '/api/example/YysSupplierInformation/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -114,6 +109,6 @@
})
},
},
}
}
</script>

@ -37,9 +37,10 @@
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="启用状态" prop="enableStatus">
<JnpfInput v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enableStatusOptions"
:props="enableStatusProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
@ -110,12 +111,14 @@ export default {
supplierSname: undefined,
supplierCname: undefined,
supplierClassification: undefined,
enableStatus: undefined,
enableStatus: 2,
},
tableRequiredData: {},
dataRule:
{
},
enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {

@ -152,6 +152,8 @@ export default {
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}

@ -21,7 +21,7 @@
<el-col :span="24" >
<jnpf-form-tip-item label="启用状态"
prop="enableStatus" >
<p>{{dataForm.enableStatus}}</p>
<p>{{ dataForm.enableStatus }} </p>
</jnpf-form-tip-item>
</el-col>
</template>
@ -53,8 +53,10 @@
id :'',
unitId : '',
unitName : '',
enableStatus : '',
enableStatus : "1",
},
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
enableStatusProps:{"label":"fullName","value":"id" },
}
},

@ -29,9 +29,9 @@
<el-col :span="24" >
<jnpf-form-tip-item
label="启用状态" prop="enableStatus" >
<JnpfInput v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enableStatusOptions" :props="enableStatusProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
@ -100,12 +100,14 @@
dataForm: {
unitId : undefined,
unitName : undefined,
enableStatus : undefined,
enableStatus : "1",
},
tableRequiredData: {},
dataRule:
{
},
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
enableStatusProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {

@ -1,3 +1,10 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -39,36 +46,49 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="unitId" label="单位编码" align="center">
:span-method="arraySpanMethod"
>
<el-table-column
prop="unitId"
label="单位编码" align="left"
>
</el-table-column>
<el-table-column prop="unitName" label="单位名称" align="center">
<el-table-column
prop="unitName"
label="单位名称" align="left"
>
</el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center">
<el-table-column
prop="enableStatus"
label="启用状态" align="left"
>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)">
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">
<el-button type="text"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
@ -77,39 +97,39 @@
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
import request from '@/utils/request'
import {mapGetters} from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
ExportBox,ToFormDetail , SuperQuery
},
data() {
return {
keyword: '',
keyword:'',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
toFormDetailVisible:false,
expandObj:{},
columnOptions: [],
mergeList: [],
exportList: [],
exportList:[],
columnList,
superQueryVisible: false,
@ -117,8 +137,8 @@ export default {
uploadBoxVisible: false,
detailVisible: false,
query: {
unitName: undefined,
enableStatus: undefined,
unitName:undefined,
enableStatus:undefined,
},
treeProps: {
children: 'children',
@ -142,6 +162,8 @@ export default {
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
enableStatusProps:{"label":"fullName","value":"id" },
interfaceRes: {
},
}
@ -186,9 +208,9 @@ export default {
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
const config ={
treeInterfaceId:"",
treeTemplateJson:[]
}
if (config.treeInterfaceId) {
//
@ -267,7 +289,7 @@ export default {
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
@ -305,13 +327,13 @@ export default {
}
this.exportList = exportList
},
goDetail(id) {
goDetail(id){
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
sortChange({column, prop, order}) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
@ -330,16 +352,16 @@ export default {
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '591253620058492869',
type: 1,
menuId:this.menuId,
moduleId:'591253620058492869',
type:1,
};
request({
url: `/api/example/YysUnitInformation/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
var _list =res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
@ -367,10 +389,10 @@ export default {
}).catch(() => {
});
},
handelUpload() {
handelUpload(){
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/YysUnitInformation")
this.$refs.UploadBox.init("","example/YysUnitInformation")
})
},
openSuperQuery() {
@ -385,10 +407,10 @@ export default {
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
let id = row?row.id:""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
this.$refs.JNPFForm.init(id, isDetail,this.list)
})
},
exportData() {
@ -398,7 +420,7 @@ export default {
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({
url: `/api/example/YysUnitInformation/Actions/Export`,
method: 'post',
@ -411,10 +433,10 @@ export default {
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.listQuery.currentPage=1
this.listQuery.pageSize=20
this.listQuery.sort="desc"
this.listQuery.sidx=""
this.initData()
},
refresh(isrRefresh) {
@ -430,5 +452,5 @@ export default {
if (isrRefresh) this.reset()
},
}
}
}
</script>

Loading…
Cancel
Save