yangshiqiang
/
NX-zhihui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备库存，园区设备管理，设备保修信息提交

Browse Source
master
zengchenxi 3 months ago
parent b0a6ff4d37
commit 9fbdb6680a
3 changed files with 503 additions and 458 deletions
Show Stats Download Patch File Download Diff File

4
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/vehicle/VehicleForm.java
Unescape View File

@ -50,4 +50,8 @@ public class VehicleForm {
/** 归属名称 **/
@JsonProperty("ascriptionName")
private String ascriptionName;
@JsonProperty("vehicleWeight")
private String vehicleWeight;
@JsonProperty("weightTolerances")
private String weightTolerances;
}

26
jnpf-java-boot/jnpf-web/src/views/scm/enterprisemerchants/form.vue
Unescape View File

@ -4,8 +4,8 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
<!-- <el-dropdown class="dropdown" placement="bottom"> -->
<!-- <el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
@ -16,12 +16,12 @@
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{ '下一条' }}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
</template> -->
<!-- <el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
:disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item> -->
<!-- </el-dropdown-menu>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled='continueBtnLoading'> 保
存</el-button>
<el-button @click="goBack"> 取 消</el-button>
@ -40,8 +40,8 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="公司编码" prop="cmpNo">
<JnpfInput v-model="dataForm.cmpNo" @change="changeData('cmpNo', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.cmpNo" @change="changeData('cmpNo', -1)" :disabled="!changeId"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -130,8 +130,9 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
<JnpfInput v-model="dataForm.unifiedSocialCreditCode" @change="changeData('unifiedSocialCreditCode', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.unifiedSocialCreditCode"
@change="changeData('unifiedSocialCreditCode', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -518,6 +519,9 @@ export default {
}
},
computed: {
changeId() {
return !this.dataForm.id;
},
...mapGetters(['userInfo'])
},
watch: {},

47
jnpf-java-boot/jnpf-web/src/views/scm/vehicle/form.vue
Unescape View File

@ -9,7 +9,7 @@
<el-col :span="8">
<jnpf-form-tip-item label="车牌号" prop="vehicleNumber">
<JnpfInput v-model="dataForm.vehicleNumber" @change="changeData('vehicleNumber', -1)" placeholder="请输入"
clearable :style='{"width":"100%"}'>
:disabled="!changeId" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -41,6 +41,20 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="皮重重量" prop="vehicleWeight">
<JnpfInput v-model="dataForm.vehicleWeight" @change="changeData('vehicleWeight', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="皮重公差" prop="weightTolerances">
<JnpfInput v-model="dataForm.weightTolerances" @change="changeData('weightTolerances', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="联系电话" prop="contactsPhone">
<JnpfInput v-model="dataForm.contactsPhone" @change="changeData('contactsPhone', -1)" placeholder="请输入"
@ -88,7 +102,7 @@
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<!-- <div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'>
{{'上一条'}}
</el-button>
@ -97,7 +111,7 @@
</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>
@ -166,6 +180,8 @@
vehicleColor: undefined,
contactsName: undefined,
contactsPhone: undefined,
weightTolerances: undefined,
vehicleWeight: undefined,
vehiclePhotos: [],
vehicleAscription: "1",
ascriptionId: undefined,
@ -199,6 +215,22 @@
message: '请输入',
trigger: 'blur'
},],
weightTolerances: [
{
pattern: /^\d+$/,
message: '请输入正确的数字',
trigger: 'blur'
},
],
vehicleWeight: [
{
pattern: /^\d+$/,
message: '请输入正确的数字',
trigger: 'blur'
},
],
contactsPhone: [{
required: true,
message: '请输入',
@ -258,6 +290,8 @@
vehicleBrand: [],
vehicleColor: [],
contactsName: [],
weightTolerances: [],
vehicleWeight: [],
contactsPhone: [],
vehiclePhotos: [],
vehicleAscription: [],
@ -267,6 +301,9 @@
}
},
computed: {
changeId() {
return !this.dataForm.id;
},
...mapGetters(['userInfo'])
},
watch: {},
@ -278,8 +315,8 @@
mounted() { },
methods: {
selectChangeData(var1, var2) {
this.dataForm.ascriptionId = var2.id;
this.dataForm.ascriptionName = var2.cmp_nm;
this.dataForm.ascriptionId = var1.id;
this.dataForm.ascriptionName = var1.cmp_nm;
},
depSelectChangeData(var1, var2) {
this.dataForm.ascriptionId = var2.id;

Write Preview
Loading…
Cancel
Save