yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://222.71.165.188:3000/yunxi/yueyueshu

Browse Source
master
mhsnet 2 months ago
parent bcda3d547a a5f8fddd87
commit 15b0795f88
15 changed files with 1033 additions and 1019 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialConstant.java
View File

File diff suppressed because one or more lines are too long

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysbillmaterial/YysBillMaterialForm.java
Unescape View File

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

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationConstant.java
Unescape View File

@ -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(){

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysunitinformation/YysUnitInformationForm.java
Unescape View File

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

37
jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/Detail.vue
Unescape View File

@ -1,62 +1,51 @@
<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-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" >
<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" >
<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" >
<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" >
<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" >
<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" >
<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" >
<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" >
<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" >
<jnpf-form-tip-item label="单据状态" prop="documentStatus">
<p>{{ dataForm.documentStatus }} </p>
</jnpf-form-tip-item>
</el-col>
@ -95,8 +84,10 @@
versionIllustrate: '',
versionDate: '',
creatorTime: '',
documentStatus : '',
documentStatus: "2",
},
documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }],
documentStatusProps: { "label": "fullName", "value": "id" },
}
},

83
jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/form.vue
Unescape View File

@ -1,92 +1,85 @@
<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-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%"}'>
<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" >
<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%"}'>
<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%"}'>
<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" >
<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" >
<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>
<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>
<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>
<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">
@ -154,12 +147,14 @@
versionIllustrate: undefined,
versionDate: undefined,
creatorTime: undefined,
documentStatus : undefined,
documentStatus: "2",
},
tableRequiredData: {},
dataRule:
{
},
documentStatusOptions: [{ "fullName": "已审核", "id": "1" }, { "fullName": "未审核", "id": "2" }],
documentStatusProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {

2
jnpf-java-boot/jnpf-web/src/views/yys/yysbillmaterial/index.vue
Unescape View File

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

25
jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/Detail.vue
Unescape View File

@ -1,38 +1,31 @@
<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-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" >
<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" >
<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" >
<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" >
<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" >
<jnpf-form-tip-item label="启用状态" prop="enableStatus">
<p>{{ dataForm.enableStatus }}</p>
</jnpf-form-tip-item>
</el-col>
@ -67,8 +60,10 @@
supplierSname: '',
supplierCname: '',
supplierClassification: '',
enableStatus : '',
enableStatus: '2',
},
enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps: { "label": "fullName", "value": "id" },
}
},

11
jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/form.vue
Unescape View File

@ -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: {

2
jnpf-java-boot/jnpf-web/src/views/yys/yyssupplierinformation/index.vue
Unescape View File

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

4
jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/Detail.vue
Unescape View File

@ -53,8 +53,10 @@
id :'',
unitId : '',
unitName : '',
enableStatus : '',
enableStatus : "1",
},
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
enableStatusProps:{"label":"fullName","value":"id" },
}
},

10
jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/form.vue
Unescape View File

@ -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: {

40
jnpf-java-boot/jnpf-web/src/views/yys/yysunitinformation/index.vue
Unescape View File

@ -1,3 +1,10 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -39,26 +46,39 @@
</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">
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<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"/>
@ -142,6 +162,8 @@ export default {
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
enableStatusProps:{"label":"fullName","value":"id" },
interfaceRes: {
},
}

Write Preview
Loading…
Cancel
Save