feat():前端样式调整,后端代码提交;

master
jiyufei 2 months ago
parent df245d568c
commit 1b8af37e7a

@ -29,6 +29,7 @@ import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel; import jnpf.base.model.ColumnDataModel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.utils.UuidUtils; import me.zhyd.oauth.utils.UuidUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel; import jnpf.database.model.superQuery.SuperJsonModel;
@ -259,6 +260,9 @@ public class YysDayLogsServiceImpl extends ServiceImpl<YysDayLogsMapper, YysDayL
List<String> finalAllRuleIDlist = allRuleIDlist; List<String> finalAllRuleIDlist = allRuleIDlist;
yysDayLogsQueryWrapper.lambda().and(t -> t.in(YysDayLogsEntity::getId, finalAllRuleIDlist)); yysDayLogsQueryWrapper.lambda().and(t -> t.in(YysDayLogsEntity::getId, finalAllRuleIDlist));
} }
if (ObjectUtil.isNotNull(yysDayLogsPagination.getProductType())) {
yysDayLogsQueryWrapper.lambda().eq(YysDayLogsEntity::getProductType, yysDayLogsPagination.getProductType());
}
//假删除标志 //假删除标志
yysDayLogsQueryWrapper.lambda().isNull(YysDayLogsEntity::getDeleteMark); yysDayLogsQueryWrapper.lambda().isNull(YysDayLogsEntity::getDeleteMark);

@ -42,4 +42,9 @@ public class YysDayLogsPagination extends Pagination {
/** 报工成员 */ /** 报工成员 */
@JsonProperty("reportMember") @JsonProperty("reportMember")
private Object reportMember; private Object reportMember;
/**
*
*/
@JsonProperty("productType")
private Object productType;
} }

@ -82,7 +82,7 @@
@select="addForSelect" @close="selectDialogVisible = false" /> @select="addForSelect" @close="selectDialogVisible = false" />
</el-row> </el-row>
<span slot="footer" class="dialog-footer"> <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 @click="prev" :disabled='prevDis'>
{{ '上一条' }} {{ '上一条' }}
</el-button> </el-button>
@ -91,7 +91,7 @@
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>

@ -62,6 +62,10 @@
<el-table-column prop="creatorTime" label="创建时间" align="center"> <el-table-column prop="creatorTime" label="创建时间" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="documentStatus" label="单据状态" align="center"> <el-table-column prop="documentStatus" label="单据状态" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.documentStatus == '未审核'"></el-tag>
<el-tag type="success" v-else-if="scope.row.documentStatus == ''">已审核</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

@ -0,0 +1,190 @@
<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" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="生产日期"
prop="manufactureTime" >
<p>{{dataForm.manufactureTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="顺序号"
prop="sort" >
<JnpfNumber v-model="dataForm.sort"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="班次"
prop="post" >
<p>{{ dataForm.post }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="开始时间"
prop="startTime" >
<p>{{dataForm.startTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="结束时间"
prop="endTime" >
<p>{{dataForm.endTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="产品编码"
prop="productCode" >
<p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="产品名称"
prop="productName" >
<p>{{dataForm.productName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="规格型号"
prop="models" >
<p>{{dataForm.models}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="计量单位"
prop="measurementUnit" >
<p>{{dataForm.measurementUnit}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="报工成员"
prop="reportMember" >
<p>{{dataForm.reportMember}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="报工数量"
prop="qualifiedNum" >
<p>{{dataForm.qualifiedNum}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="补偿工时"
prop="compensatoryHour" >
<JnpfNumber v-model="dataForm.compensatoryHour"
placeholder="数字文本" disabled
:step="1" :precision="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
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},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
manufactureTime : '',
deviceCode : '',
deviceName : '',
sort : '',
post : "",
startTime : '',
endTime : '',
productCode : '',
productName : '',
models : '',
measurementUnit : '',
reportMember : '',
qualifiedNum : '',
compensatoryHour : '',
},
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
postProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDayLogs/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,525 @@
<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" >
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8" >
<jnpf-form-tip-item
label="生产日期" prop="manufactureTime" >
<JnpfDatePicker v-model="dataForm.manufactureTime" @change="changeData('manufactureTime',-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="8" >
<jnpf-form-tip-item
label="设备编码" prop="deviceCode" >
<JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="设备名称" prop="deviceName" >
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="顺序号" prop="sort" >
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort',-1)"
placeholder="数字文本" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="班次" prop="post" >
<JnpfSelect v-model="dataForm.post" @change="changeData('post',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="postOptions" :props="postProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="开始时间" prop="startTime" >
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="结束时间" prop="endTime" >
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品编码" prop="productCode" >
<JnpfInput v-model="dataForm.productCode" @change="changeData('productCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品名称" prop="productName" >
<JnpfInput v-model="dataForm.productName" @change="changeData('productName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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="8" >
<jnpf-form-tip-item
label="计量单位" prop="measurementUnit" >
<JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工成员" prop="reportMember" >
<JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember',-1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.reportMemberableIds" clearable :style='{"width":"100%"}'>
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工数量" prop="qualifiedNum" >
<JnpfInput v-model="dataForm.qualifiedNum" @change="changeData('qualifiedNum',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="补偿工时" prop="compensatoryHour" >
<JnpfInputNumber v-model="dataForm.compensatoryHour" @change="changeData('compensatoryHour',-1)"
placeholder="数字文本" :precision="1" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<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>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</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: { },
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting:{},
eventType: '',
userBoxVisible:false,
selectDialogVisible: false,
currTableConf:{},
dataValueAll:{},
addTableConf:{
},
//
ableAll:{
},
tableRows:{
},
Vmodel:"",
currVmodel:"",
dataForm: {
manufactureTime : undefined,
deviceCode : undefined,
deviceName : undefined,
sort : undefined,
post : undefined,
startTime : undefined,
endTime : undefined,
productCode : undefined,
productName : undefined,
models : undefined,
measurementUnit : undefined,
reportMember : undefined,
qualifiedNum : undefined,
compensatoryHour : undefined,
version: 0,
},
tableRequiredData: {},
dataRule:
{
},
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
postProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {
manufactureTime:[] ,
deviceCode:[] ,
deviceName:[] ,
sort:[] ,
post:[] ,
startTime:[] ,
endTime:[] ,
productCode:[] ,
productName:[] ,
models:[] ,
measurementUnit:[] ,
reportMember:[] ,
qualifiedNum:[] ,
compensatoryHour:[] ,
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() {},
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysDayLogs/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
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) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDayLogs/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysDayLogs',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}else{
request({
url: '/api/example/YysDayLogs/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if(this['get'+this.currVmodel]){
this['get'+this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList(){
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex=-1
},
},
}
</script>

@ -0,0 +1,458 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="生产日期">
<JnpfDateRangePicker v-model="query.manufactureTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品编码">
<el-input v-model="query.productCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称">
<el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="设备名称">
<el-input v-model="query.deviceName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">
</el-table-column>
<el-table-column prop="productCode" label="产品编码" align="center">
</el-table-column>
<el-table-column prop="productName" label="产品名称" align="center">
</el-table-column>
<el-table-column prop="models" label="规格型号" align="center">
</el-table-column>
<el-table-column prop="measurementUnit" label="计量单位" align="center">
</el-table-column>
<el-table-column prop="qualifiedNum" label="生产数量" align="center">
</el-table-column>
</JNPF-table>
<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" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<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" />
</div>
</template>
<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'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
productType:'包装',
manufactureTime: undefined,
productCode: undefined,
productName: undefined,
deviceName: undefined,
reportMember: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '591260101755544965',
type: 1,
};
request({
url: `/api/example/YysDayLogs/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
// var filteredList = _list.filter(o => o.productType == '');
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysDayLogs/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/YysDayLogs")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/YysDayLogs/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

File diff suppressed because one or more lines are too long

@ -1,108 +1,98 @@
<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-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"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="物料编码" prop="materialCode" > <jnpf-form-tip-item label="物料编码" prop="materialCode">
<JnpfInput v-model="dataForm.materialCode" @change="changeData('materialCode',-1)" <JnpfInput v-model="dataForm.materialCode" @change="changeData('materialCode', -1)"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="物料名称" prop="materialName">
label="物料名称" prop="materialName" > <JnpfInput v-model="dataForm.materialName" @change="changeData('materialName', -1)"
<JnpfInput v-model="dataForm.materialName" @change="changeData('materialName',-1)" placeholder="请输入" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="物料分类" prop="materialClassification">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.materialClassification"
label="物料分类" prop="materialClassification" > @change="changeData('materialClassification', -1)" placeholder="请输入" clearable
<JnpfInput v-model="dataForm.materialClassification" @change="changeData('materialClassification',-1)" :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="计量单位" prop="unit">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.unit" @change="changeData('unit', -1)" placeholder="请输入"
label="计量单位" prop="unit" > clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.unit" @change="changeData('unit',-1)" </JnpfInput>
placeholder="请输入" clearable :style='{"width":"100%"}'> </jnpf-form-tip-item>
</JnpfInput> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="物料简称" prop="materialSname">
<el-col :span="24" > <JnpfInput v-model="dataForm.materialSname" @change="changeData('materialSname', -1)"
<jnpf-form-tip-item placeholder="请输入" clearable :style='{ "width": "100%" }'>
label="物料简称" prop="materialSname" > </JnpfInput>
<JnpfInput v-model="dataForm.materialSname" @change="changeData('materialSname',-1)" </jnpf-form-tip-item>
placeholder="请输入" clearable :style='{"width":"100%"}'> </el-col>
</JnpfInput> <el-col :span="24">
</jnpf-form-tip-item> <jnpf-form-tip-item label="规格型号" prop="models">
</el-col> <JnpfInput v-model="dataForm.models" @change="changeData('models', -1)" placeholder="请输入"
<el-col :span="24" > clearable :style='{ "width": "100%" }'>
<jnpf-form-tip-item </JnpfInput>
label="规格型号" prop="models" > </jnpf-form-tip-item>
<JnpfInput v-model="dataForm.models" @change="changeData('models',-1)" </el-col>
placeholder="请输入" clearable :style='{"width":"100%"}'> <el-col :span="24">
</JnpfInput> <jnpf-form-tip-item label="库存数量" prop="inventoryNumber">
</jnpf-form-tip-item> <JnpfInput v-model="dataForm.inventoryNumber" @change="changeData('inventoryNumber', -1)"
</el-col> placeholder="请输入" clearable :style='{ "width": "100%" }'>
<el-col :span="24" > </JnpfInput>
<jnpf-form-tip-item </jnpf-form-tip-item>
label="库存数量" prop="inventoryNumber" > </el-col>
<JnpfInput v-model="dataForm.inventoryNumber" @change="changeData('inventoryNumber',-1)" <!-- 表单结束 -->
placeholder="请输入" clearable :style='{"width":"100%"}'> </template>
</JnpfInput> </el-form>
</jnpf-form-tip-item> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
</el-col> @select="addForSelect" @close="selectDialogVisible = false" />
<!-- 表单结束 --> </el-row>
</template> <span slot="footer" class="dialog-footer">
</el-form> <!-- <div class="upAndDown-button" v-if="dataForm.id"> -->
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" <!-- <el-button @click="prev" :disabled='prevDis'>
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>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -114,336 +104,336 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
materialCode : undefined, materialCode: undefined,
materialName : undefined, materialName: undefined,
materialClassification : undefined, materialClassification: undefined,
unit : undefined, unit: undefined,
materialSname : undefined, materialSname: undefined,
models : undefined, models: undefined,
inventoryNumber : undefined, inventoryNumber: undefined,
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
materialCode:[] , materialCode: [],
materialName:[] , materialName: [],
materialClassification:[] , materialClassification: [],
unit:[] , unit: [],
materialSname:[] , materialSname: [],
models:[] , models: [],
inventoryNumber:[] , inventoryNumber: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysInventoryQuery/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysInventoryQuery/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysInventoryQuery/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysInventoryQuery/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysInventoryQuery', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysInventoryQuery',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysInventoryQuery/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysInventoryQuery/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

@ -29,8 +29,8 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()"> <!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button> </el-button> -->
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">

@ -1,84 +1,78 @@
<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-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"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="分类编码" prop="classId" > <jnpf-form-tip-item label="分类编码" prop="classId">
<JnpfInput v-model="dataForm.classId" @change="changeData('classId',-1)" <JnpfInput v-model="dataForm.classId" @change="changeData('classId', -1)" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="分类名称" prop="className">
label="分类名称" prop="className" > <JnpfInput v-model="dataForm.className" @change="changeData('className', -1)"
<JnpfInput v-model="dataForm.className" @change="changeData('className',-1)" placeholder="请输入" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="上级分类" prop="parentClassification">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.parentClassification"
label="上级分类" prop="parentClassification" > @change="changeData('parentClassification', -1)" placeholder="请输入" clearable
<JnpfInput v-model="dataForm.parentClassification" @change="changeData('parentClassification',-1)" :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="启用状态" prop="enableStatus">
<jnpf-form-tip-item <JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
label="启用状态" prop="enableStatus" > placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enableStatusOptions"
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)" :props="enableStatusProps">
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enableStatusOptions" :props="enableStatusProps" > </JnpfSelect>
</JnpfSelect> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <!-- 表单结束 -->
<!-- 表单结束 --> </template>
</template> </el-form>
</el-form> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" @select="addForSelect" @close="selectDialogVisible = false" />
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> </el-row>
</el-row> <span slot="footer" class="dialog-footer">
<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 @click="prev" :disabled='prevDis'>
{{'上一条'}} {{ '上一条' }}
</el-button> </el-button>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -90,332 +84,332 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
classId : undefined, classId: undefined,
className : undefined, className: undefined,
parentClassification : undefined, parentClassification: undefined,
enableStatus : "1", enableStatus: "1",
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
classId:[] , classId: [],
className:[] , className: [],
parentClassification:[] , parentClassification: [],
enableStatus:[] , enableStatus: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysMaterialClass/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysMaterialClass/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysMaterialClass/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysMaterialClass/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysMaterialClass', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysMaterialClass',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysMaterialClass/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysMaterialClass/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

@ -1,30 +1,23 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16"> <el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="分类名称"> <el-form-item label="分类名称">
<el-input v-model="query.className" placeholder="请输入" clearable> </el-input> <el-input v-model="query.className" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="上级分类"> <el-form-item label="上级分类">
<el-input v-model="query.parentClassification" placeholder="请输入" clearable> </el-input> <el-input v-model="query.parentClassification" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
@ -36,432 +29,420 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" /> @click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod">
<el-table-column prop="classId" label="分类编码" align="center">
> </el-table-column>
<el-table-column <el-table-column prop="className" label="分类名称" align="center">
prop="classId" </el-table-column>
label="分类编码" align="left" <el-table-column prop="parentClassification" label="上级分类" align="center">
> </el-table-column>
</el-table-column> <el-table-column prop="enableStatus" label="启用状态" align="center">
<el-table-column <template slot-scope="scope">
prop="className" <el-tag v-if="scope.row.enableStatus == '禁用'"></el-tag>
label="分类名称" align="left" <el-tag type="success" v-else-if="scope.row.enableStatus == ''">启用</el-tag>
> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" fixed="right" width="150">
prop="parentClassification" <template slot-scope="scope">
label="上级分类" align="left" <el-button type="text" @click="addOrUpdateHandle(scope.row)">
> </el-button>
</el-table-column> <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
<el-table-column </el-button>
prop="enableStatus" <el-button type="text" @click="goDetail(scope.row.id)">
label="启用状态" align="left" </el-button>
> </template>
</el-table-column> </el-table-column>
<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>
</template>
</el-table-column>
</JNPF-table> </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"
</div> @pagination="initData" />
</div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <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" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
</div> </div>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user' import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox,ToFormDetail , SuperQuery ExportBox, ToFormDetail, SuperQuery
}, },
data() { data() {
return { return {
keyword:'', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible:false, toFormDetailVisible: false,
expandObj:{}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList:[], exportList: [],
columnList, columnList,
superQueryVisible: false, superQueryVisible: false,
superQueryJson, superQueryJson,
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
className:undefined, className: undefined,
parentClassification:undefined, parentClassification: undefined,
enableStatus:undefined, enableStatus: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
label: 'fullName', label: 'fullName',
value: 'id', value: 'id',
isLeaf: 'isLeaf' isLeaf: 'isLeaf'
}, },
list: [], list: [],
listLoading: true, listLoading: true,
total: 0, total: 0,
queryData: {}, queryData: {},
listQuery: { listQuery: {
superQueryJson: '', superQueryJson: '',
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: "desc",
sidx: "", sidx: "",
}, },
formVisible: false, formVisible: false,
flowVisible: false, flowVisible: false,
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
interfaceRes: { interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
}, },
toggleTreeExpand(expands) { }
this.refreshTree = false },
this.expandsTree = expands computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTree = true this.$refs.toFormDetail.init(formData, modelId, defaultValue)
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
}) })
}, })
filterNode(value, data) { },
if (!value) return true; toggleTreeExpand(expands) {
return data[this.treeProps.label].indexOf(value) !== -1; this.refreshTree = false
}, this.expandsTree = expands
loadNode(node, resolve) { this.$nextTick(() => {
const nodeData = node.data this.refreshTree = true
const config ={ this.$nextTick(() => {
treeInterfaceId:"", this.$refs.treeBox.setCurrentKey(null)
treeTemplateJson:[] })
} })
if (config.treeInterfaceId) { },
// filterNode(value, data) {
if (config.treeTemplateJson && config.treeTemplateJson.length) { if (!value) return true;
for (let i = 0; i < config.treeTemplateJson.length; i++) { return data[this.treeProps.label].indexOf(value) !== -1;
const element = config.treeTemplateJson[i]; },
element.defaultValue = nodeData[element.relationField] || '' loadNode(node, resolve) {
} const nodeData = node.data
} const config = {
// treeInterfaceId: "",
let query = { treeTemplateJson: []
paramList: config.treeTemplateJson || [], }
} if (config.treeInterfaceId) {
// //
getDataInterfaceRes(config.treeInterfaceId, query).then(res => { if (config.treeTemplateJson && config.treeTemplateJson.length) {
let data = res.data for (let i = 0; i < config.treeTemplateJson.length; i++) {
if (Array.isArray(data)) { const element = config.treeTemplateJson[i];
resolve(data); element.defaultValue = nodeData[element.relationField] || ''
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
} }
} }
this.getMergeList(list) //
this.getExportList(list) let query = {
return list paramList: config.treeTemplateJson || [],
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
} }
}, //
getMergeList(list) { getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let newList = JSON.parse(JSON.stringify(list)) let data = res.data
newList.forEach(item => { if (Array.isArray(data)) {
if (item.children && item.children.length) { resolve(data);
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else { } else {
this.mergeList.push({ resolve([]);
prop: item.prop,
rowspan: 1,
colspan: 1
})
} }
}) })
}, }
getExportList(list) { },
let exportList = [] getColumnList() {
for (let i = 0; i < list.length; i++) { //
if (list[i].jnpfKey === 'table') { this.columnOptions = this.transformColumnList(this.columnList)
for (let j = 0; j < list[i].children.length; j++) { },
exportList.push(list[i].children[j]) transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
} }
} else {
exportList.push(list[i])
} }
} }
this.exportList = exportList }
}, this.getMergeList(list)
goDetail(id){ this.getExportList(list)
this.detailVisible = true return list
this.$nextTick(() => { },
this.$refs.Detail.init(id) arraySpanMethod({ column }) {
}) for (let i = 0; i < this.mergeList.length; i++) {
}, if (column.property == this.mergeList[i].prop) {
sortChange({column, prop, order}) { return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' }
this.listQuery.sidx = !order ? '' : prop }
this.initData() },
}, getMergeList(list) {
async initSearchDataAndListData() { let newList = JSON.parse(JSON.stringify(list))
await this.initSearchData() newList.forEach(item => {
this.initData() if (item.children && item.children.length) {
}, let child = {
// prop: item.prop + '-child-first'
async initSearchData() { }
}, item.children.unshift(child)
initData() { }
this.listLoading = true; })
let _query = { newList.forEach(item => {
...this.listQuery, if (item.children && item.children.length) {
...this.query, item.children.forEach((child, index) => {
keyword: this.keyword, if (index == 0) {
dataType: 0, this.mergeList.push({
menuId:this.menuId, prop: child.prop,
moduleId:'591248879769358277', rowspan: 1,
type:1, colspan: item.children.length
}; })
request({ } else {
url: `/api/example/YysMaterialClass/getList`, this.mergeList.push({
method: 'post', prop: child.prop,
data: _query rowspan: 0,
}).then(res => { colspan: 0
var _list =res.data.list; })
this.list = _list.map(o => ({ }
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMaterialClass/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}) })
}).catch(() => { } else {
}); this.mergeList.push({
}, prop: item.prop,
handelUpload(){ rowspan: 1,
this.uploadBoxVisible = true colspan: 1
this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysMaterialClass")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
}) })
}, }
superQuery(queryJson) { })
this.listQuery.superQueryJson = queryJson },
this.listQuery.currentPage = 1 getExportList(list) {
this.initData() let exportList = []
}, for (let i = 0; i < list.length; i++) {
addOrUpdateHandle(row, isDetail) { if (list[i].jnpfKey === 'table') {
let id = row?row.id:"" for (let j = 0; j < list[i].children.length; j++) {
this.formVisible = true exportList.push(list[i].children[j])
this.$nextTick(() => { }
this.$refs.JNPFForm.init(id, isDetail,this.list) } else {
}) exportList.push(list[i])
}, }
exportData() { }
this.exportBoxVisible = true this.exportList = exportList
this.$nextTick(() => { },
this.$refs.ExportBox.init(this.exportList) goDetail(id) {
}) this.detailVisible = true
}, this.$nextTick(() => {
download(data) { this.$refs.Detail.init(id)
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} })
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '591248879769358277',
type: 1,
};
request({
url: `/api/example/YysMaterialClass/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({ request({
url: `/api/example/YysMaterialClass/Actions/Export`, url: `/api/example/YysMaterialClass/${id}`,
method: 'post', method: 'DELETE'
data: query
}).then(res => { }).then(res => {
if (!res.data.url) return this.$message({
this.jnpf.downloadFile(res.data.url) type: 'success',
this.$refs.ExportBox.visible = false message: res.msg,
this.exportBoxVisible = false onClose: () => {
this.initData()
}
});
}) })
}, }).catch(() => {
search() { });
this.listQuery.currentPage=1 },
this.listQuery.pageSize=20 handelUpload() {
this.listQuery.sort="desc" this.uploadBoxVisible = true
this.listQuery.sidx="" this.$nextTick(() => {
this.initData() this.$refs.UploadBox.init("", "example/YysMaterialClass")
}, })
refresh(isrRefresh) { },
this.formVisible = false openSuperQuery() {
if (isrRefresh) this.reset() this.superQueryVisible = true
}, this.$nextTick(() => {
reset() { this.$refs.SuperQuery.init()
this.query = JSON.parse(JSON.stringify(this.queryData)) })
this.search() },
}, superQuery(queryJson) {
colseFlow(isrRefresh) { this.listQuery.superQueryJson = queryJson
this.flowVisible = false this.listQuery.currentPage = 1
if (isrRefresh) this.reset() this.initData()
}, },
} addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/YysMaterialClass/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
} }
}
</script> </script>

@ -1,116 +1,106 @@
<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-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"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="物料编码" prop="materialId" > <jnpf-form-tip-item label="物料编码" prop="materialId">
<JnpfInput v-model="dataForm.materialId" @change="changeData('materialId',-1)" <JnpfInput v-model="dataForm.materialId" @change="changeData('materialId', -1)"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="物料名称" prop="materialName">
label="物料名称" prop="materialName" > <JnpfInput v-model="dataForm.materialName" @change="changeData('materialName', -1)"
<JnpfInput v-model="dataForm.materialName" @change="changeData('materialName',-1)" placeholder="请输入" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="物料分类" prop="materialClassification">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.materialClassification"
label="物料分类" prop="materialClassification" > @change="changeData('materialClassification', -1)" placeholder="请输入" clearable
<JnpfInput v-model="dataForm.materialClassification" @change="changeData('materialClassification',-1)" :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="计量单位" prop="unitMeasurement">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.unitMeasurement" @change="changeData('unitMeasurement', -1)"
label="计量单位" prop="unitMeasurement" > placeholder="请输入" clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.unitMeasurement" @change="changeData('unitMeasurement',-1)" </JnpfInput>
placeholder="请输入" clearable :style='{"width":"100%"}'> </jnpf-form-tip-item>
</JnpfInput> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="物料简称" prop="materialSname">
<el-col :span="24" > <JnpfInput v-model="dataForm.materialSname" @change="changeData('materialSname', -1)"
<jnpf-form-tip-item placeholder="请输入" clearable :style='{ "width": "100%" }'>
label="物料简称" prop="materialSname" > </JnpfInput>
<JnpfInput v-model="dataForm.materialSname" @change="changeData('materialSname',-1)" </jnpf-form-tip-item>
placeholder="请输入" clearable :style='{"width":"100%"}'> </el-col>
</JnpfInput> <el-col :span="24">
</jnpf-form-tip-item> <jnpf-form-tip-item label="规格/型号" prop="model">
</el-col> <JnpfInput v-model="dataForm.model" @change="changeData('model', -1)" placeholder="请输入"
<el-col :span="24" > clearable :style='{ "width": "100%" }'>
<jnpf-form-tip-item </JnpfInput>
label="规格/型号" prop="model" > </jnpf-form-tip-item>
<JnpfInput v-model="dataForm.model" @change="changeData('model',-1)" </el-col>
placeholder="请输入" clearable :style='{"width":"100%"}'> <el-col :span="24">
</JnpfInput> <jnpf-form-tip-item label="安全库存" prop="safetyStock">
</jnpf-form-tip-item> <JnpfInput v-model="dataForm.safetyStock" @change="changeData('safetyStock', -1)"
</el-col> placeholder="请输入" clearable :style='{ "width": "100%" }'>
<el-col :span="24" > </JnpfInput>
<jnpf-form-tip-item </jnpf-form-tip-item>
label="安全库存" prop="safetyStock" > </el-col>
<JnpfInput v-model="dataForm.safetyStock" @change="changeData('safetyStock',-1)" <el-col :span="24">
placeholder="请输入" clearable :style='{"width":"100%"}'> <jnpf-form-tip-item label="启用状态" prop="enableStatus">
</JnpfInput> <JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
</jnpf-form-tip-item> placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enableStatusOptions"
</el-col> :props="enableStatusProps">
<el-col :span="24" > </JnpfSelect>
<jnpf-form-tip-item </jnpf-form-tip-item>
label="启用状态" prop="enableStatus" > </el-col>
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)" <!-- 表单结束 -->
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enableStatusOptions" :props="enableStatusProps" > </template>
</JnpfSelect> </el-form>
</jnpf-form-tip-item> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
</el-col> @select="addForSelect" @close="selectDialogVisible = false" />
<!-- 表单结束 --> </el-row>
</template> <span slot="footer" class="dialog-footer">
</el-form> <!-- <div class="upAndDown-button" v-if="dataForm.id">
<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 @click="prev" :disabled='prevDis'>
{{'上一条'}} {{ '上一条' }}
</el-button> </el-button>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -122,340 +112,340 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
materialId : undefined, materialId: undefined,
materialName : undefined, materialName: undefined,
materialClassification : undefined, materialClassification: undefined,
unitMeasurement : undefined, unitMeasurement: undefined,
materialSname : undefined, materialSname: undefined,
model : undefined, model: undefined,
safetyStock : undefined, safetyStock: undefined,
enableStatus : "1", enableStatus: "1",
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
materialId:[] , materialId: [],
materialName:[] , materialName: [],
materialClassification:[] , materialClassification: [],
unitMeasurement:[] , unitMeasurement: [],
materialSname:[] , materialSname: [],
model:[] , model: [],
safetyStock:[] , safetyStock: [],
enableStatus:[] , enableStatus: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysMaterialInformation/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysMaterialInformation/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysMaterialInformation/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysMaterialInformation/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysMaterialInformation', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysMaterialInformation',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysMaterialInformation/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysMaterialInformation/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

@ -1,47 +1,40 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16"> <el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物料编码"> <el-form-item label="物料编码">
<el-input v-model="query.materialId" placeholder="请输入" clearable> </el-input> <el-input v-model="query.materialId" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物料名称"> <el-form-item label="物料名称">
<el-input v-model="query.materialName" placeholder="请输入" clearable> </el-input> <el-input v-model="query.materialName" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物料分类"> <el-form-item label="物料分类">
<el-input v-model="query.materialClassification" placeholder="请输入" clearable> </el-input> <el-input v-model="query.materialClassification" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="showAll"> <template v-if="showAll">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="启用状态"> <el-form-item label="启用状态">
<el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input> <el-input v-model="query.enableStatus" placeholder="请输入" clearable> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<el-col :span="6"> <el-col :span="6">
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button> <el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button> <el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
@ -49,454 +42,430 @@
<div class="JNPF-common-layout-main JNPF-flex-main"> <div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head"> <div class="JNPF-common-head">
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()"> <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true"> <el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" /> @click="openSuperQuery()" />
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top"> <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" /> @click="initData()" />
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod" border>
<el-table-column prop="materialId" label="物料编码" align="center">
> </el-table-column>
<el-table-column <el-table-column prop="materialName" label="物料名称" align="center">
prop="materialId" </el-table-column>
label="物料编码" align="left" <el-table-column prop="materialClassification" label="物料分类" align="center">
> </el-table-column>
</el-table-column> <el-table-column prop="unitMeasurement" label="计量单位" align="center">
<el-table-column </el-table-column>
prop="materialName" <el-table-column prop="materialSname" label="物料简称" align="center">
label="物料名称" align="left" </el-table-column>
> <el-table-column prop="model" label="规格/型号" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="safetyStock" label="安全库存" align="center">
prop="materialClassification" </el-table-column>
label="物料分类" align="left" <el-table-column prop="enableStatus" label="启用状态" align="center">
> <template slot-scope="scope">
</el-table-column> <el-tag v-if="scope.row.enableStatus == '禁用'"></el-tag>
<el-table-column <el-tag type="success" v-else-if="scope.row.enableStatus == ''">启用</el-tag>
prop="unitMeasurement" </template>
label="计量单位" align="left" </el-table-column>
> <el-table-column label="操作" fixed="right" width="150">
</el-table-column> <template slot-scope="scope">
<el-table-column <el-button type="text" @click="addOrUpdateHandle(scope.row)">
prop="materialSname" </el-button>
label="物料简称" align="left" <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">
> </el-button>
</el-table-column> <el-button type="text" @click="goDetail(scope.row.id)">
<el-table-column </el-button>
prop="model" </template>
label="规格/型号" align="left" </el-table-column>
>
</el-table-column>
<el-table-column
prop="safetyStock"
label="安全库存" align="left"
>
</el-table-column>
<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-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>
</template>
</el-table-column>
</JNPF-table> </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"
</div> @pagination="initData" />
</div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <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" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
</div> </div>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user' import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox,ToFormDetail , SuperQuery ExportBox, ToFormDetail, SuperQuery
}, },
data() { data() {
return { return {
keyword:'', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible:false, toFormDetailVisible: false,
expandObj:{}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList:[], exportList: [],
columnList, columnList,
showAll: false, showAll: false,
superQueryVisible: false, superQueryVisible: false,
superQueryJson, superQueryJson,
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
materialId:undefined, materialId: undefined,
materialName:undefined, materialName: undefined,
materialClassification:undefined, materialClassification: undefined,
enableStatus:undefined, enableStatus: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
label: 'fullName', label: 'fullName',
value: 'id', value: 'id',
isLeaf: 'isLeaf' isLeaf: 'isLeaf'
}, },
list: [], list: [],
listLoading: true, listLoading: true,
total: 0, total: 0,
queryData: {}, queryData: {},
listQuery: { listQuery: {
superQueryJson: '', superQueryJson: '',
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
sort: "desc", sort: "desc",
sidx: "", sidx: "",
}, },
formVisible: false, formVisible: false,
flowVisible: false, flowVisible: false,
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
interfaceRes: { interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
}, },
toggleTreeExpand(expands) { }
this.refreshTree = false },
this.expandsTree = expands computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.refreshTree = true this.$refs.toFormDetail.init(formData, modelId, defaultValue)
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
}) })
}, })
filterNode(value, data) { },
if (!value) return true; toggleTreeExpand(expands) {
return data[this.treeProps.label].indexOf(value) !== -1; this.refreshTree = false
}, this.expandsTree = expands
loadNode(node, resolve) { this.$nextTick(() => {
const nodeData = node.data this.refreshTree = true
const config ={ this.$nextTick(() => {
treeInterfaceId:"", this.$refs.treeBox.setCurrentKey(null)
treeTemplateJson:[] })
} })
if (config.treeInterfaceId) { },
// filterNode(value, data) {
if (config.treeTemplateJson && config.treeTemplateJson.length) { if (!value) return true;
for (let i = 0; i < config.treeTemplateJson.length; i++) { return data[this.treeProps.label].indexOf(value) !== -1;
const element = config.treeTemplateJson[i]; },
element.defaultValue = nodeData[element.relationField] || '' loadNode(node, resolve) {
} const nodeData = node.data
} const config = {
// treeInterfaceId: "",
let query = { treeTemplateJson: []
paramList: config.treeTemplateJson || [], }
} if (config.treeInterfaceId) {
// //
getDataInterfaceRes(config.treeInterfaceId, query).then(res => { if (config.treeTemplateJson && config.treeTemplateJson.length) {
let data = res.data for (let i = 0; i < config.treeTemplateJson.length; i++) {
if (Array.isArray(data)) { const element = config.treeTemplateJson[i];
resolve(data); element.defaultValue = nodeData[element.relationField] || ''
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
} }
} }
this.getMergeList(list) //
this.getExportList(list) let query = {
return list paramList: config.treeTemplateJson || [],
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
} }
}, //
getMergeList(list) { getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let newList = JSON.parse(JSON.stringify(list)) let data = res.data
newList.forEach(item => { if (Array.isArray(data)) {
if (item.children && item.children.length) { resolve(data);
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length ) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else { } else {
this.mergeList.push({ resolve([]);
prop: item.prop,
rowspan: 1,
colspan: 1
})
} }
}) })
}, }
getExportList(list) { },
let exportList = [] getColumnList() {
for (let i = 0; i < list.length; i++) { //
if (list[i].jnpfKey === 'table') { this.columnOptions = this.transformColumnList(this.columnList)
for (let j = 0; j < list[i].children.length; j++) { },
exportList.push(list[i].children[j]) transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
} }
} else {
exportList.push(list[i])
} }
} }
this.exportList = exportList }
}, this.getMergeList(list)
goDetail(id){ this.getExportList(list)
this.detailVisible = true return list
this.$nextTick(() => { },
this.$refs.Detail.init(id) arraySpanMethod({ column }) {
}) for (let i = 0; i < this.mergeList.length; i++) {
}, if (column.property == this.mergeList[i].prop) {
sortChange({column, prop, order}) { return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' }
this.listQuery.sidx = !order ? '' : prop }
this.initData() },
}, getMergeList(list) {
async initSearchDataAndListData() { let newList = JSON.parse(JSON.stringify(list))
await this.initSearchData() newList.forEach(item => {
this.initData() if (item.children && item.children.length) {
}, let child = {
// prop: item.prop + '-child-first'
async initSearchData() { }
}, item.children.unshift(child)
initData() { }
this.listLoading = true; })
let _query = { newList.forEach(item => {
...this.listQuery, if (item.children && item.children.length) {
...this.query, item.children.forEach((child, index) => {
keyword: this.keyword, if (index == 0) {
dataType: 0, this.mergeList.push({
menuId:this.menuId, prop: child.prop,
moduleId:'591246118818418565', rowspan: 1,
type:1, colspan: item.children.length
}; })
request({ } else {
url: `/api/example/YysMaterialInformation/getList`, this.mergeList.push({
method: 'post', prop: child.prop,
data: _query rowspan: 0,
}).then(res => { colspan: 0
var _list =res.data.list; })
this.list = _list.map(o => ({ }
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysMaterialInformation/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
}) })
}).catch(() => { } else {
}); this.mergeList.push({
}, prop: item.prop,
handelUpload(){ rowspan: 1,
this.uploadBoxVisible = true colspan: 1
this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysMaterialInformation")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
}) })
}, }
superQuery(queryJson) { })
this.listQuery.superQueryJson = queryJson },
this.listQuery.currentPage = 1 getExportList(list) {
this.initData() let exportList = []
}, for (let i = 0; i < list.length; i++) {
addOrUpdateHandle(row, isDetail) { if (list[i].jnpfKey === 'table') {
let id = row?row.id:"" for (let j = 0; j < list[i].children.length; j++) {
this.formVisible = true exportList.push(list[i].children[j])
this.$nextTick(() => { }
this.$refs.JNPFForm.init(id, isDetail,this.list) } else {
}) exportList.push(list[i])
}, }
exportData() { }
this.exportBoxVisible = true this.exportList = exportList
this.$nextTick(() => { },
this.$refs.ExportBox.init(this.exportList) goDetail(id) {
}) this.detailVisible = true
}, this.$nextTick(() => {
download(data) { this.$refs.Detail.init(id)
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} })
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '591246118818418565',
type: 1,
};
request({
url: `/api/example/YysMaterialInformation/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({ request({
url: `/api/example/YysMaterialInformation/Actions/Export`, url: `/api/example/YysMaterialInformation/${id}`,
method: 'post', method: 'DELETE'
data: query
}).then(res => { }).then(res => {
if (!res.data.url) return this.$message({
this.jnpf.downloadFile(res.data.url) type: 'success',
this.$refs.ExportBox.visible = false message: res.msg,
this.exportBoxVisible = false onClose: () => {
this.initData()
}
});
}) })
}, }).catch(() => {
search() { });
this.listQuery.currentPage=1 },
this.listQuery.pageSize=20 handelUpload() {
this.listQuery.sort="desc" this.uploadBoxVisible = true
this.listQuery.sidx="" this.$nextTick(() => {
this.initData() this.$refs.UploadBox.init("", "example/YysMaterialInformation")
}, })
refresh(isrRefresh) { },
this.formVisible = false openSuperQuery() {
if (isrRefresh) this.reset() this.superQueryVisible = true
}, this.$nextTick(() => {
reset() { this.$refs.SuperQuery.init()
this.query = JSON.parse(JSON.stringify(this.queryData)) })
this.search() },
}, superQuery(queryJson) {
colseFlow(isrRefresh) { this.listQuery.superQueryJson = queryJson
this.flowVisible = false this.listQuery.currentPage = 1
if (isrRefresh) this.reset() this.initData()
}, },
} addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/YysMaterialInformation/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
} }
}
</script> </script>

@ -0,0 +1,190 @@
<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" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="生产日期"
prop="manufactureTime" >
<p>{{dataForm.manufactureTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备编码"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="设备名称"
prop="deviceName" >
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="顺序号"
prop="sort" >
<JnpfNumber v-model="dataForm.sort"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="班次"
prop="post" >
<p>{{ dataForm.post }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="开始时间"
prop="startTime" >
<p>{{dataForm.startTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="结束时间"
prop="endTime" >
<p>{{dataForm.endTime}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="产品编码"
prop="productCode" >
<p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="产品名称"
prop="productName" >
<p>{{dataForm.productName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="规格型号"
prop="models" >
<p>{{dataForm.models}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="计量单位"
prop="measurementUnit" >
<p>{{dataForm.measurementUnit}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="报工成员"
prop="reportMember" >
<p>{{dataForm.reportMember}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="报工数量"
prop="qualifiedNum" >
<p>{{dataForm.qualifiedNum}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="补偿工时"
prop="compensatoryHour" >
<JnpfNumber v-model="dataForm.compensatoryHour"
placeholder="数字文本" disabled
:step="1" :precision="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
</span>
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
</el-dialog>
</template>
<script>
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},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
manufactureTime : '',
deviceCode : '',
deviceName : '',
sort : '',
post : "",
startTime : '',
endTime : '',
productCode : '',
productName : '',
models : '',
measurementUnit : '',
reportMember : '',
qualifiedNum : '',
compensatoryHour : '',
},
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
postProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDayLogs/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

File diff suppressed because one or more lines are too long

@ -0,0 +1,525 @@
<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" >
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8" >
<jnpf-form-tip-item
label="生产日期" prop="manufactureTime" >
<JnpfDatePicker v-model="dataForm.manufactureTime" @change="changeData('manufactureTime',-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="8" >
<jnpf-form-tip-item
label="设备编码" prop="deviceCode" >
<JnpfInput v-model="dataForm.deviceCode" @change="changeData('deviceCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="设备名称" prop="deviceName" >
<JnpfInput v-model="dataForm.deviceName" @change="changeData('deviceName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="顺序号" prop="sort" >
<JnpfInputNumber v-model="dataForm.sort" @change="changeData('sort',-1)"
placeholder="数字文本" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="班次" prop="post" >
<JnpfSelect v-model="dataForm.post" @change="changeData('post',-1)"
placeholder="请选择" clearable :style='{"width":"100%"}' :options="postOptions" :props="postProps" >
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="开始时间" prop="startTime" >
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="结束时间" prop="endTime" >
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime',-1)"
:startTime="time(false,1,1,'','HH:mm','')" :endTime="time(false,1,1,'','HH:mm','')" placeholder="请选择" clearable :style='{"width":"100%"}' format="HH:mm" >
</JnpfTimePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品编码" prop="productCode" >
<JnpfInput v-model="dataForm.productCode" @change="changeData('productCode',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="产品名称" prop="productName" >
<JnpfInput v-model="dataForm.productName" @change="changeData('productName',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<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="8" >
<jnpf-form-tip-item
label="计量单位" prop="measurementUnit" >
<JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工成员" prop="reportMember" >
<JnpfUserSelect v-model="dataForm.reportMember" @change="changeData('reportMember',-1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.reportMemberableIds" clearable :style='{"width":"100%"}'>
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="报工数量" prop="qualifiedNum" >
<JnpfInput v-model="dataForm.qualifiedNum" @change="changeData('qualifiedNum',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item
label="补偿工时" prop="compensatoryHour" >
<JnpfInputNumber v-model="dataForm.compensatoryHour" @change="changeData('compensatoryHour',-1)"
placeholder="数字文本" :precision="1" :step="1" >
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<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>
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span>
</el-dialog>
</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: { },
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting:{},
eventType: '',
userBoxVisible:false,
selectDialogVisible: false,
currTableConf:{},
dataValueAll:{},
addTableConf:{
},
//
ableAll:{
},
tableRows:{
},
Vmodel:"",
currVmodel:"",
dataForm: {
manufactureTime : undefined,
deviceCode : undefined,
deviceName : undefined,
sort : undefined,
post : undefined,
startTime : undefined,
endTime : undefined,
productCode : undefined,
productName : undefined,
models : undefined,
measurementUnit : undefined,
reportMember : undefined,
qualifiedNum : undefined,
compensatoryHour : undefined,
version: 0,
},
tableRequiredData: {},
dataRule:
{
},
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季夜班","id":"2"}],
postProps:{"label":"fullName","value":"id" },
childIndex:-1,
isEdit:false,
interfaceRes: {
manufactureTime:[] ,
deviceCode:[] ,
deviceName:[] ,
sort:[] ,
post:[] ,
startTime:[] ,
endTime:[] ,
productCode:[] ,
productName:[] ,
models:[] ,
measurementUnit:[] ,
reportMember:[] ,
qualifiedNum:[] ,
compensatoryHour:[] ,
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() {},
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysDayLogs/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
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) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/example/YysDayLogs/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
}else{
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysDayLogs',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}else{
request({
url: '/api/example/YysDayLogs/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(()=>{
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if(this['get'+this.currVmodel]){
this['get'+this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList(){
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex=-1
},
},
}
</script>

@ -0,0 +1,458 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="生产日期">
<JnpfDateRangePicker v-model="query.manufactureTime" format="yyyy-MM-dd"
startPlaceholder="开始日期" endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品编码">
<el-input v-model="query.productCode" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品名称">
<el-input v-model="query.productName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="设备名称">
<el-input v-model="query.deviceName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">
</el-table-column>
<el-table-column prop="productCode" label="产品编码" align="center">
</el-table-column>
<el-table-column prop="productName" label="产品名称" align="center">
</el-table-column>
<el-table-column prop="models" label="规格型号" align="center">
</el-table-column>
<el-table-column prop="measurementUnit" label="计量单位" align="center">
</el-table-column>
<el-table-column prop="qualifiedNum" label="生产数量" align="center">
</el-table-column>
</JNPF-table>
<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" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<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" />
</div>
</template>
<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'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
productType:'生产',
manufactureTime: undefined,
productCode: undefined,
productName: undefined,
deviceName: undefined,
reportMember: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季夜班", "id": "2" }],
postProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '591260101755544965',
type: 1,
};
request({
url: `/api/example/YysDayLogs/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
// var filteredList = _list.filter(o => o.productType == '');
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/example/YysDayLogs/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "example/YysDayLogs")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/example/YysDayLogs/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

File diff suppressed because one or more lines are too long

@ -1,84 +1,78 @@
<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-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"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="分类编码" prop="classId" > <jnpf-form-tip-item label="分类编码" prop="classId">
<JnpfInput v-model="dataForm.classId" @change="changeData('classId',-1)" <JnpfInput v-model="dataForm.classId" @change="changeData('classId', -1)" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="分类名称" prop="className">
label="分类名称" prop="className" > <JnpfInput v-model="dataForm.className" @change="changeData('className', -1)"
<JnpfInput v-model="dataForm.className" @change="changeData('className',-1)" placeholder="请输入" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="上级分类" prop="parentClassification">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.parentClassification"
label="上级分类" prop="parentClassification" > @change="changeData('parentClassification', -1)" placeholder="请输入" clearable
<JnpfInput v-model="dataForm.parentClassification" @change="changeData('parentClassification',-1)" :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="启用状态" prop="enableStatus">
<jnpf-form-tip-item <JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
label="启用状态" prop="enableStatus" > placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enableStatusOptions"
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)" :props="enableStatusProps">
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enableStatusOptions" :props="enableStatusProps" > </JnpfSelect>
</JnpfSelect> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <!-- 表单结束 -->
<!-- 表单结束 --> </template>
</template> </el-form>
</el-form> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" @select="addForSelect" @close="selectDialogVisible = false" />
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> </el-row>
</el-row> <span slot="footer" class="dialog-footer">
<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 @click="prev" :disabled='prevDis'>
{{'上一条'}} {{ '上一条' }}
</el-button> </el-button>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -90,332 +84,332 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
classId : undefined, classId: undefined,
className : undefined, className: undefined,
parentClassification : undefined, parentClassification: undefined,
enableStatus : "1", enableStatus: "1",
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
classId:[] , classId: [],
className:[] , className: [],
parentClassification:[] , parentClassification: [],
enableStatus:[] , enableStatus: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysSupplierClass/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysSupplierClass/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysSupplierClass/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysSupplierClass/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysSupplierClass', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysSupplierClass',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysSupplierClass/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysSupplierClass/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

@ -52,6 +52,10 @@
<el-table-column prop="parentClassification" label="上级分类" align="center"> <el-table-column prop="parentClassification" label="上级分类" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center"> <el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.enableStatus == '禁用'"></el-tag>
<el-tag type="success" v-else-if="scope.row.enableStatus == ''">启用</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

@ -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">
<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-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"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="供应商编码" prop="supplierId" > <jnpf-form-tip-item label="供应商编码" prop="supplierId">
<JnpfInput v-model="dataForm.supplierId" @change="changeData('supplierId',-1)" <JnpfInput v-model="dataForm.supplierId" @change="changeData('supplierId', -1)"
placeholder="请输入" clearable :style='{"width":"100%"}'> placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="供应商简称" prop="supplierSname">
label="供应商简称" prop="supplierSname" > <JnpfInput v-model="dataForm.supplierSname" @change="changeData('supplierSname', -1)"
<JnpfInput v-model="dataForm.supplierSname" @change="changeData('supplierSname',-1)" placeholder="请输入" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="供应商全称" prop="supplierCname">
<jnpf-form-tip-item <JnpfInput v-model="dataForm.supplierCname" @change="changeData('supplierCname', -1)"
label="供应商全称" prop="supplierCname" > placeholder="请输入" clearable :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.supplierCname" @change="changeData('supplierCname',-1)" </JnpfInput>
placeholder="请输入" clearable :style='{"width":"100%"}'> </jnpf-form-tip-item>
</JnpfInput> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="供应商分类" prop="supplierClassification">
<el-col :span="24" > <JnpfInput v-model="dataForm.supplierClassification"
<jnpf-form-tip-item @change="changeData('supplierClassification', -1)" placeholder="请输入" clearable
label="供应商分类" prop="supplierClassification" > :style='{ "width": "100%" }'>
<JnpfInput v-model="dataForm.supplierClassification" @change="changeData('supplierClassification',-1)" </JnpfInput>
placeholder="请输入" clearable :style='{"width":"100%"}'> </jnpf-form-tip-item>
</JnpfInput> </el-col>
</jnpf-form-tip-item> <el-col :span="24">
</el-col> <jnpf-form-tip-item label="启用状态" prop="enableStatus">
<el-col :span="24" > <JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
<jnpf-form-tip-item placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enableStatusOptions"
label="启用状态" prop="enableStatus" > :props="enableStatusProps">
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)" </JnpfSelect>
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enableStatusOptions" :props="enableStatusProps" > </jnpf-form-tip-item>
</JnpfSelect> </el-col>
</jnpf-form-tip-item> <!-- 表单结束 -->
</el-col> </template>
<!-- 表单结束 --> </el-form>
</template> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
</el-form> @select="addForSelect" @close="selectDialogVisible = false" />
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" </el-row>
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> <span slot="footer" class="dialog-footer">
</el-row> <!-- <div class="upAndDown-button" v-if="dataForm.id">
<span slot="footer" class="dialog-footer">
<div class="upAndDown-button" v-if="dataForm.id">
<el-button @click="prev" :disabled='prevDis'> <el-button @click="prev" :disabled='prevDis'>
{{'上一条'}} {{ '上一条' }}
</el-button> </el-button>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -98,334 +91,334 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
supplierId : undefined, supplierId: undefined,
supplierSname : undefined, supplierSname: undefined,
supplierCname : undefined, supplierCname: undefined,
supplierClassification : undefined, supplierClassification: undefined,
enableStatus : "1", enableStatus: "1",
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
supplierId:[] , supplierId: [],
supplierSname:[] , supplierSname: [],
supplierCname:[] , supplierCname: [],
supplierClassification:[] , supplierClassification: [],
enableStatus:[] , enableStatus: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysSupplierInformation/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysSupplierInformation/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysSupplierInformation/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysSupplierInformation/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysSupplierInformation', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysSupplierInformation',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysSupplierInformation/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysSupplierInformation/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

@ -54,6 +54,10 @@
<el-table-column prop="supplierClassification" label="供应商分类" align="center"> <el-table-column prop="supplierClassification" label="供应商分类" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center"> <el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.enableStatus == '禁用'"></el-tag>
<el-tag type="success" v-else-if="scope.row.enableStatus == ''">启用</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

@ -1,76 +1,70 @@
<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-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"
<template v-if="!loading"> label-position="right">
<!-- 具体表单 --> <template v-if="!loading">
<el-col :span="24" > <!-- 具体表单 -->
<jnpf-form-tip-item <el-col :span="24">
label="单位编码" prop="unitId" > <jnpf-form-tip-item label="单位编码" prop="unitId">
<JnpfInput v-model="dataForm.unitId" @change="changeData('unitId',-1)" <JnpfInput v-model="dataForm.unitId" @change="changeData('unitId', -1)" placeholder="请输入"
placeholder="请输入" clearable :style='{"width":"100%"}'> clearable :style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="24" > <el-col :span="24">
<jnpf-form-tip-item <jnpf-form-tip-item label="单位名称" prop="unitName">
label="单位名称" prop="unitName" > <JnpfInput v-model="dataForm.unitName" @change="changeData('unitName', -1)" placeholder="请输入"
<JnpfInput v-model="dataForm.unitName" @change="changeData('unitName',-1)" clearable :style='{ "width": "100%" }'>
placeholder="请输入" clearable :style='{"width":"100%"}'> </JnpfInput>
</JnpfInput> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <el-col :span="24">
<el-col :span="24" > <jnpf-form-tip-item label="启用状态" prop="enableStatus">
<jnpf-form-tip-item <JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus', -1)"
label="启用状态" prop="enableStatus" > placeholder="请选择" clearable :style='{ "width": "100%" }' :options="enableStatusOptions"
<JnpfSelect v-model="dataForm.enableStatus" @change="changeData('enableStatus',-1)" :props="enableStatusProps">
placeholder="请选择" clearable :style='{"width":"100%"}' :options="enableStatusOptions" :props="enableStatusProps" > </JnpfSelect>
</JnpfSelect> </jnpf-form-tip-item>
</jnpf-form-tip-item> </el-col>
</el-col> <!-- 表单结束 -->
<!-- 表单结束 --> </template>
</template> </el-form>
</el-form> <SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" @select="addForSelect" @close="selectDialogVisible = false" />
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false"/> </el-row>
</el-row> <span slot="footer" class="dialog-footer">
<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 @click="prev" :disabled='prevDis'>
{{'上一条'}} {{ '上一条' }}
</el-button> </el-button>
<el-button @click="next" :disabled='nextDis'> <el-button @click="next" :disabled='nextDis'>
{{'下一条'}} {{ '下一条' }}
</el-button> </el-button>
</div> </div>
<el-button type="primary" @click="dataFormSubmit(2)" :loading="continueBtnLoading"> <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 @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button> <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"> </el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user' import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js' import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { }, components: {},
props: [], props: [],
data() { data() {
return { return {
dataFormSubmitType: 0, dataFormSubmitType: 0,
continueBtnLoading: false, continueBtnLoading: false,
@ -82,330 +76,330 @@
loading: false, loading: false,
btnLoading: false, btnLoading: false,
formRef: 'formRef', formRef: 'formRef',
setting:{}, setting: {},
eventType: '', eventType: '',
userBoxVisible:false, userBoxVisible: false,
selectDialogVisible: false, selectDialogVisible: false,
currTableConf:{}, currTableConf: {},
dataValueAll:{}, dataValueAll: {},
addTableConf:{ addTableConf: {
}, },
// //
ableAll:{ ableAll: {
}, },
tableRows:{ tableRows: {
}, },
Vmodel:"", Vmodel: "",
currVmodel:"", currVmodel: "",
dataForm: { dataForm: {
unitId : undefined, unitId: undefined,
unitName : undefined, unitName: undefined,
enableStatus : "1", enableStatus: "1",
}, },
tableRequiredData: {}, tableRequiredData: {},
dataRule: dataRule:
{ {
}, },
enableStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}], enableStatusOptions: [{ "fullName": "启用", "id": "1" }, { "fullName": "禁用", "id": "2" }],
enableStatusProps:{"label":"fullName","value":"id" }, enableStatusProps: { "label": "fullName", "value": "id" },
childIndex:-1, childIndex: -1,
isEdit:false, isEdit: false,
interfaceRes: { interfaceRes: {
unitId:[] , unitId: [],
unitName:[] , unitName: [],
enableStatus:[] , enableStatus: [],
}, },
} }
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
computed: { next() {
...mapGetters(['userInfo']) this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
}, },
watch: {}, getInfo(id) {
created() { request({
this.dataAll() url: '/api/example/YysUnitInformation/' + id,
this.initDefaultData() method: 'get'
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm)) }).then(res => {
this.dataInfo(res.data)
});
}, },
mounted() {}, goBack() {
methods: { this.visible = false
prev() { this.$emit('refreshDataList', true)
this.index-- },
if (this.index === 0) { changeData(model, index) {
this.prevDis = true this.isEdit = false
} this.childIndex = index
this.nextDis = false let modelAll = model.split("-");
for (let index = 0; index < this.allList.length; index++) { let faceMode = "";
const element = this.allList[index]; for (let i = 0; i < modelAll.length; i++) {
if (this.index == index) { faceMode += modelAll[i];
this.getInfo(element.id) }
} for (let key in this.interfaceRes) {
} if (key != faceMode) {
}, let faceReList = this.interfaceRes[key]
next() { for (let i = 0; i < faceReList.length; i++) {
this.index++ if (faceReList[i].relationField == model) {
if (this.index === this.allList.length - 1) { let options = 'get' + key + 'Options';
this.nextDis = true if (this[options]) {
} this[options]()
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/example/YysUnitInformation/'+ id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if(this[options]){
this[options]()
}
this.changeData(key, index)
} }
this.changeData(key, index)
} }
} }
} }
}, }
changeDataFormData(type, data, model,index,defaultValue) { },
if(!this.isEdit) { changeDataFormData(type, data, model, index, defaultValue) {
if (type == 2) { if (!this.isEdit) {
for (let i = 0; i < this.dataForm[data].length; i++) { if (type == 2) {
if (index == -1) { for (let i = 0; i < this.dataForm[data].length; i++) {
this.dataForm[data][i][model] = defaultValue if (index == -1) {
} else if (index == i) { this.dataForm[data][i][model] = defaultValue
this.dataForm[data][i][model] = defaultValue } else if (index == i) {
} this.dataForm[data][i][model] = defaultValue
} }
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll(){
},
clearData(){
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id,isDetail,allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
} }
} else { } else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true this.nextDis = true
} }
this.dataForm.id = id || 0; } else {
this.visible = true; this.prevDis = true
this.$nextTick(() => { this.nextDis = true
if(this.dataForm.id){ }
this.loading = true this.dataForm.id = id || 0;
request({ this.visible = true;
url: '/api/example/YysUnitInformation/'+this.dataForm.id, this.$nextTick(() => {
method: 'get' if (this.dataForm.id) {
}).then(res => { this.loading = true
this.dataInfo(res.data) request({
this.loading = false url: '/api/example/YysUnitInformation/' + this.dataForm.id,
}); method: 'get'
}else{ }).then(res => {
this.clearData() this.dataInfo(res.data)
this.initDefaultData() this.loading = false
} });
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data =this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else { } else {
this.btnLoading = true this.clearData()
this.initDefaultData()
} }
if (!this.dataForm.id) { });
request({ this.$store.commit('generator/UPDATE_RELATION_DATA', {})
url: '/api/example/YysUnitInformation', },
method: 'post', //
data: _data initDefaultData() {
}).then((res) => {
this.$message({ },
message: res.msg, //
type: 'success', dataFormSubmit(type) {
duration: 1000, this.dataFormSubmitType = type ? type : 0
onClose: () => { this.$refs['formRef'].validate((valid) => {
if (this.dataFormSubmitType == 2) { if (valid) {
this.$nextTick(() => { this.request()
this.clearData() }
this.initDefaultData() })
}) },
this.continueBtnLoading = false request() {
return let _data = this.dataList()
} if (this.dataFormSubmitType == 2) {
this.visible = false this.continueBtnLoading = true
this.btnLoading = false } else {
this.$emit('refresh', true) this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/example/YysUnitInformation',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
} }
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
}else{ }).catch(() => {
request({ this.btnLoading = false
url: '/api/example/YysUnitInformation/'+this.dataForm.id, this.continueBtnLoading = false
method: 'PUT', })
data: _data } else {
}).then((res) => { request({
this.$message({ url: '/api/example/YysUnitInformation/' + this.dataForm.id,
message: res.msg, method: 'PUT',
type: 'success', data: _data
duration: 1000, }).then((res) => {
onClose: () => { this.$message({
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false message: res.msg,
this.visible = false type: 'success',
this.btnLoading = false duration: 1000,
this.$emit('refresh', true) onClose: () => {
} if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
}) this.visible = false
}).catch(()=>{ this.btnLoading = false
this.btnLoading = false this.$emit('refresh', true)
this.continueBtnLoading = false }
}) })
} }).catch(() => {
}, this.btnLoading = false
openSelectDialog(key) { this.continueBtnLoading = false
this.currTableConf=this.addTableConf[key]
this.currVmodel=key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
}) })
}, }
addForSelect(data) { },
for (let i = 0; i < data.length; i++) { openSelectDialog(key) {
let t = data[i] this.currTableConf = this.addTableConf[key]
if(this['get'+this.currVmodel]){ this.currVmodel = key
this['get'+this.currVmodel](t) this.selectDialogVisible = true
} this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
} }
}, }
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) { },
let timeDataValue = null; dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeValue = Number(timeValueData) let timeDataValue = null;
if (timeRule) { let timeValue = Number(timeValueData)
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue if (timeType == 1) {
} else if (timeType == 2) { timeDataValue = timeValue
timeDataValue = dataValue } else if (timeType == 2) {
} else if (timeType == 3) { timeDataValue = dataValue
timeDataValue = new Date().getTime() } else if (timeType == 3) {
} else if (timeType == 4) { timeDataValue = new Date().getTime()
let previousDate = ''; } else if (timeType == 4) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getBeforeData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getBeforeData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
} else if (timeType == 5) { }
let previousDate = ''; } else if (timeType == 5) {
if (timeTarget == 1 || timeTarget == 2) { let previousDate = '';
previousDate = getDateDay(timeTarget, timeType, timeValue) if (timeTarget == 1 || timeTarget == 2) {
timeDataValue = new Date(previousDate).getTime() previousDate = getDateDay(timeTarget, timeType, timeValue)
} else if (timeTarget == 3) { timeDataValue = new Date(previousDate).getTime()
previousDate = getLaterData(timeValue) } else if (timeTarget == 3) {
timeDataValue = new Date(previousDate).getTime() previousDate = getLaterData(timeValue)
} else { timeDataValue = new Date(previousDate).getTime()
timeDataValue = getLaterTime(timeTarget, timeValue).getTime() } else {
} timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
} }
} }
return timeDataValue; }
}, return timeDataValue;
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) { },
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let timeDataValue = null let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
if (timeRule) { let timeDataValue = null
if (timeType == 1) { if (timeRule) {
timeDataValue = timeValue || '00:00:00' if (timeType == 1) {
if (timeDataValue.split(':').length == 3) { timeDataValue = timeValue || '00:00:00'
timeDataValue = timeDataValue if (timeDataValue.split(':').length == 3) {
} else { timeDataValue = timeDataValue
timeDataValue = timeDataValue + ':00' } else {
} timeDataValue = timeDataValue + ':00'
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} }
return timeDataValue; }
}, return timeDataValue;
dataList(){ },
var _data = this.dataForm; dataList() {
return _data; var _data = this.dataForm;
}, return _data;
dataInfo(dataAll){ },
let _dataAll =dataAll dataInfo(dataAll) {
this.dataForm = _dataAll let _dataAll = dataAll
this.isEdit = true this.dataForm = _dataAll
this.dataAll() this.isEdit = true
this.childIndex=-1 this.dataAll()
}, this.childIndex = -1
}, },
} },
}
</script> </script>

@ -45,6 +45,10 @@
<el-table-column prop="unitName" label="单位名称" align="center"> <el-table-column prop="unitName" label="单位名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="enableStatus" label="启用状态" align="center"> <el-table-column prop="enableStatus" label="启用状态" align="center">
<template slot-scope="scope">
<el-tag v-if="scope.row.enableStatus == '禁用'"></el-tag>
<el-tag type="success" v-else-if="scope.row.enableStatus == ''">启用</el-tag>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="150"> <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

Loading…
Cancel
Save