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

报废下拉

dev
0.0 2 years ago
parent
7909723e09
commit
4c793b6090
3 changed files with 197 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 185
      src/components/jeecg/MBBEditableTable.vue
  2. 12
      src/components/jeecgbiz/JSelectDepart.vue
  3. 33
      src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue

185
src/components/jeecg/MBBEditableTable.vue
Unescape View File

@ -137,7 +137,7 @@
<!-- 右侧动态生成td -->
<div
class="td"
v-for="col in columns"
v-for="(col,index) in columns"
v-show="col.type !== formTypes.hidden"
:key="col.key"
:style="buildTdStyle(col)">
@ -521,12 +521,14 @@
<template v-else-if="col.type === formTypes.sel_search">
<a-tooltip v-bind="buildTooltipProps(row, col, id)">
<a-select
ref = "sel"
v-if="isEditRow(row, col)"
:id="id"
:key="i"
showSearch
@search="searchOption($event,col,index)"
optionFilterProp="children"
:filterOption="filterOption"
:autoClearSearchValue = false
v-bind="buildProps(row,col)"
style="width: 100%;"
:value="searchSelectValues[id]"
@ -535,12 +537,15 @@
:placeholder="replaceProps(col, col.placeholder)"
@change="(v)=>handleSearchSelectChange(v,id,row,col)"
allowClear
:filterOption="false"
/>
<!-- :filterOption="filterOption"-->
<span
v-else
class="j-td-span no-edit"
:class="{disabled: buildProps(row,col).disabled}"
@click="handleEditRow(row, col)"
@focus="a"
>{{ getSelectTranslateText(searchSelectValues[id], row, col) }}</span>
</a-tooltip>
</template>
@ -626,7 +631,7 @@ import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
import { cloneObject, randomString, randomNumber, getEventPath } from '@/utils/util'
import JDate from '@/components/jeecg/JDate'
import { filterDictText, initDictOptions } from '@/components/dict/JDictSelectUtil'
import { getFileAccessHttpUrl } from '@/api/manage';
import { getAction, getFileAccessHttpUrl } from '@/api/manage'
import JInputPop from '@/components/jeecg/minipop/JInputPop'
import JFilePop from '@/components/jeecg/minipop/JFilePop'
@ -634,7 +639,7 @@ import JFilePop from '@/components/jeecg/minipop/JFilePop'
let rowHeight = 61
export default {
name: 'MBBEditableTable',
name: 'BEditableTable',
components: { JDate, Draggable, JInputPop, JFilePop },
provide() {
return {
@ -686,6 +691,18 @@ export default {
return {}
}
},
// 部门信息
sections: {
type: Object,
default() {
return {}
}
},
// 资产类型
materialNature: {
type: String,
},
// 是否禁用全部组件
disabled: {
type: Boolean,
@ -696,6 +713,10 @@ export default {
type: Boolean,
default: false
},
// 是否禁用新增按钮
appropriationPlan: {
type: String
},
// 是否可拖拽排序
dragSort: {
type: Boolean,
@ -705,6 +726,18 @@ export default {
type: String,
default: 'orderNum'
},
//查询类型
dragSortType: {
type: String
},
//归口部门
// putUnder: {
// type: String,
// },
//切换
qeihuan: {
type: String,
},
// 是否一直显示编辑框，如果为false则只有点击的时候才出现输入框
alwaysEdit: {
type: Boolean,
@ -781,9 +814,15 @@ export default {
// 上次push数据的事件，用于判断是否点击过快
lastPushTimeMap: new Map(),
number:0,
url:{
descriptionRakeUrl: "/description/processDescription/list",
merchandiseNewsList: '/merchandisenews/processMerchandiseNews/merchandiseNewsList',
merchandiseNewsListDB: '/wastematerials/processWasteMaterials/merchandiseNewsName',
}
}
},
created() {
console.log(this.disabled);
this.inputValues = []
// 当前显示的tr
this.visibleTrEls = []
@ -876,6 +915,15 @@ export default {
// console.log('watch.rows:', cloneObject({ val, old }))
}
},
qeihuan:{
immediate: true,
handler: function (newValue) {
// console.log(newValue,"监听到了");
this.$nextTick( () =>{
this.getClone();
});
}
},
dataSource: {
immediate: true,
handler: function (newValue) {
@ -945,6 +993,29 @@ export default {
},
methods: {
shuChange(val,b,c){
// console.log("sdtgfsd",val,b,c)
},
//清除数据
getClone(){
let ids= [];
this.getValues((a,b,c)=>{
b.forEach(it => {
ids.push(it.id);
});
this.removeRows(ids);
});
},
a(){
// console.log("执行l");
// this.getSelection((a,b,c)=>{
// console.log(a,b,c);
// // b.forEach(item =>{
// // console.log(item);
// // });
// });
},
getElement(id, noCaseId = false) {
if (!this.el[id]) {
@ -1345,8 +1416,9 @@ export default {
},
/** 删除被选中的行 */
removeSelectedRows() {
this.removeRows(this.selectedRowIds)
this.selectedRowIds = []
this.removeRows(this.selectedRowIds);
this.selectedRowIds = [];
this.$emit("bumen",true);
},
/** 删除一行或多行 */
removeRows(id) {
@ -1965,6 +2037,7 @@ export default {
},
handleClickAdd() {
this.$emit('descriptionFetch');
this.add()
},
handleConfirmDelete() {
@ -2125,7 +2198,23 @@ export default {
}
}
// 存储输入的值
this.inputValues[index][column.key] = value
this.inputValues[index][column.key] = value;
// console.log("-=-=-=",value)
// this.searchOption(value,null,index);
// console.log("sadfgasdf",value);
// //查询信息
// let pam ={
// descriptionNam: value,
//
// }
// getAction(this.url.descriptionRakeUrl,pam).then(res=>{
// if(){
//
// }
// })
// 做单个表单验证
this.validateOneInput(value, row, column, this.notPassedIds, true, 'input')
@ -2510,7 +2599,7 @@ export default {
},
/** view辅助方法：构造props */
buildProps(row, col) {
// console.log("buildProps=========================")
// console.log("buildProps============",)
let props = {}
// 解析props
if (typeof col.props === 'object') {
@ -2638,11 +2727,85 @@ export default {
this.elemValueChange(FormTypes.sel_search, row, column, value)
},
filterOption(input, option) {
console.log("filterOption=========",input,option);
// console.log("filterOption=========",input,option);
console.log("option.componentOptions.children[0]",option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0)
// console.log("option.componentOptions.children[0]",option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0)
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
searchOption (input,pro,index){
// console.log("searchOption=========",input,index);
return new Promise(async (resolve, reject) => {
if(index == 1 && !input || index == 3 && !input){
return;
}
let ib = false;
let par = {
materialsNumber: input,
materialType: this.dragSortType,
// materialDepart: this.putUnder
}
let pattern = new RegExp("[\u4E00-\u9FA5]+");
if(pattern.test(input) && index == 1 || pattern.test(input) && index == 3){
ib = true;
}
let url = '' ;
if(!!this.appropriationPlan){
//总库
// url = this.url.merchandiseNewsList;
// console.log("222222222");
}else{
//账外
// console.log("111",this.sections);
if(!!this.materialNature){
console.log("执行了");
par.materialNature = this.materialNature;
}
if(!!this.sections){
if(this.sections.orgType == "2"){
par.departId = this.sections.departIds;
}
if(this.sections.orgType == "3"){
par.departId = this.sections.parentId;
}
}
url = this.url.merchandiseNewsListDB;
}
await getAction(url,par).then( (res)=>{
let a= [];
if(res.success){
console.log("222222222222222===",res.result);
let pam = res.result.records||res.result;
pam.forEach( item => {
let isb = false;
let val = '';
if(!!this.appropriationPlan){
val = item.id
}else{
val = item.merchandiseNewsId
}
let name = null;
if(ib){
name = item.merchandiseName;
}else{
name = item.materialsNumber;
}
a.push({
title : name,
value : val,
disabled: isb
})
})
this.columns[index].options = a;
this.$emit("shifu",true);
resolve( );
}
});
})
},
getEllipsisWord(content, len){
if(!content || content.length === 0){
return ''
@ -2657,7 +2820,7 @@ export default {
/** 获取Select等组件翻译后的文本 */
getSelectTranslateText(value, row, col) {
// console.log("getSelectTranslateText====================")
console.log("getSelectTranslateText====================")
// 翻译支持单选和多选（数组、逗号分割）
return filterDictText(col.options, value)
},

12
src/components/jeecgbiz/JSelectDepart.vue
Unescape View File

@ -29,17 +29,17 @@
props:{
modalWidth:{
type:Number,
initialValue:500,
default:500,
required:false
},
multi:{
type:Boolean,
initialValue:false,
default:false,
required:false
},
rootOpened:{
type:Boolean,
initialValue:true,
default:true,
required:false
},
value:{
@ -50,17 +50,17 @@
disabled:{
type: Boolean,
required: false,
initialValue: false
default: false
},
treeOpera:{
type: Boolean,
required: false,
initialValue: true
default: true
},
checkStrictly:{
type: Boolean,
required: false,
initialValue: true
default: true
},
// 自定义返回字段，默认返回 id
customReturnField: {

33
src/views/burst/form/purchase/ProcessIndustrialScrapsForm.vue
Unescape View File

@ -164,6 +164,14 @@ export default {
// placeholder: '请输入${title}',
// defaultValue: ''
// },
{
title: '民爆物资编号',
key: 'industrialId',
type: FormTypes.sel_search,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '请求数量',
key: 'quantity',
@ -188,14 +196,7 @@ export default {
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '民爆物资id',
key: 'industrialId',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '民爆物资名称',
key: 'industrialName',
@ -212,14 +213,14 @@ export default {
placeholder: '请输入${title}',
defaultValue: ''
},
{
title: '删除标识',
key: 'delFlag',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
// {
// title: '删除标识',
// key: 'delFlag',
// type: FormTypes.input,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
{
title: '报废金额',
key: 'money',

Write Preview
Loading…
Cancel
Save