Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【无】扩展字段如果是text类型就不弹出提示及弹框 See merge request !918
Showing
5 changed files
with
207 additions
and
137 deletions
@@ -132,9 +132,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | @@ -132,9 +132,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | ||
132 | if(item.list && item.list.length>0){ | 132 | if(item.list && item.list.length>0){ |
133 | listStr=item.list.join(',') | 133 | listStr=item.list.join(',') |
134 | } | 134 | } |
135 | + let layTips=''; | ||
136 | + if(item.fieldSourceType == 'text'){ | ||
137 | + layTips='' | ||
138 | + }else{ | ||
139 | + layTips='lay-tips="点击修改/删除"' | ||
140 | + } | ||
135 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 141 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
136 | templet:` <div> | 142 | templet:` <div> |
137 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 143 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
138 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 144 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
139 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 145 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
140 | </div></div>`}) | 146 | </div></div>`}) |
@@ -266,9 +272,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | @@ -266,9 +272,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | ||
266 | if(item.list && item.list.length>0){ | 272 | if(item.list && item.list.length>0){ |
267 | listStr=item.list.join(',') | 273 | listStr=item.list.join(',') |
268 | } | 274 | } |
275 | + let layTips=''; | ||
276 | + if(item.fieldSourceType == 'text'){ | ||
277 | + layTips='' | ||
278 | + }else{ | ||
279 | + layTips='lay-tips="点击修改/删除"' | ||
280 | + } | ||
269 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 281 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
270 | templet:` <div> | 282 | templet:` <div> |
271 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 283 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
272 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 284 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
273 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 285 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
274 | </div></div>`}) | 286 | </div></div>`}) |
@@ -5286,75 +5286,77 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | @@ -5286,75 +5286,77 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', | ||
5286 | promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>` | 5286 | promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>` |
5287 | } | 5287 | } |
5288 | let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`; | 5288 | let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`; |
5289 | - layer.open({ | ||
5290 | - title: [titleName+tplType, 'font-size:14px;'], | ||
5291 | - type: 1, | ||
5292 | - area: ['280px','170px'], | ||
5293 | - content: html_tpl, | ||
5294 | - success: function () { | ||
5295 | - $('#promptInput').val(old_T3Dom) | ||
5296 | - } | ||
5297 | - , id: 'lay_T3_IOP' //设定一个id,防止重复弹出 | ||
5298 | - , btn: ['清空', '保存'] | ||
5299 | - , yes: function (index, layero) { | ||
5300 | - layer.confirm('确认要删除吗?', {icon: 3, title: '提示'}, function (index1) { | ||
5301 | - layer.load(2); | ||
5302 | - admin.req({ | ||
5303 | - //删除T3值 | ||
5304 | - url: common.domainName + url, | ||
5305 | - data: { | ||
5306 | - resId:resId, | ||
5307 | - fieldValue:'', | ||
5308 | - expandId:expandId,//扩展字段id | ||
5309 | - | ||
5310 | - }, | ||
5311 | - }).done(function (response) { | ||
5312 | - layer.closeAll('loading'); | ||
5313 | - if (response.success) { | ||
5314 | - layer.msg('删除成功!', {icon: 1, time: 3000}); | ||
5315 | - $T3Dom.text(''); | ||
5316 | - } else { | ||
5317 | - layer.msg('删除失败!', {icon: 2, time: 3000}); | ||
5318 | - } | ||
5319 | - layer.close(index); | ||
5320 | - }); | ||
5321 | - }) | ||
5322 | - } | ||
5323 | - , btn2:function(index, layero){ | ||
5324 | - var value = $('#promptInput').val(); | ||
5325 | - if (value !== old_T3Dom) { | ||
5326 | - layer.load(2); | ||
5327 | - | ||
5328 | - admin.req({ | ||
5329 | - //修改扩展字段T3/IOp值 | ||
5330 | - url: common.domainName + url, | ||
5331 | - data: { | ||
5332 | - resId:resId, | ||
5333 | - fieldValue:value, | ||
5334 | - expandId:expandId,//扩展字段id | 5289 | + if(fieldSourceType != 'text'){ |
5290 | + layer.open({ | ||
5291 | + title: [titleName+tplType, 'font-size:14px;'], | ||
5292 | + type: 1, | ||
5293 | + area: ['280px','170px'], | ||
5294 | + content: html_tpl, | ||
5295 | + success: function () { | ||
5296 | + $('#promptInput').val(old_T3Dom) | ||
5297 | + } | ||
5298 | + , id: 'lay_T3_IOP' //设定一个id,防止重复弹出 | ||
5299 | + , btn: ['清空', '保存'] | ||
5300 | + , yes: function (index, layero) { | ||
5301 | + layer.confirm('确认要删除吗?', {icon: 3, title: '提示'}, function (index1) { | ||
5302 | + layer.load(2); | ||
5303 | + admin.req({ | ||
5304 | + //删除T3值 | ||
5305 | + url: common.domainName + url, | ||
5306 | + data: { | ||
5307 | + resId:resId, | ||
5308 | + fieldValue:'', | ||
5309 | + expandId:expandId,//扩展字段id | ||
5335 | 5310 | ||
5336 | - }, | ||
5337 | - success: function (response) { | 5311 | + }, |
5312 | + }).done(function (response) { | ||
5338 | layer.closeAll('loading'); | 5313 | layer.closeAll('loading'); |
5339 | - if (response && response.success) { | ||
5340 | - layer.msg('修改成功', {icon: 1}); | ||
5341 | - $T3Dom.text(value); | 5314 | + if (response.success) { |
5315 | + layer.msg('删除成功!', {icon: 1, time: 3000}); | ||
5316 | + $T3Dom.text(''); | ||
5342 | } else { | 5317 | } else { |
5343 | - layer.msg('修改失败', {icon: 2}); | 5318 | + layer.msg('删除失败!', {icon: 2, time: 3000}); |
5344 | } | 5319 | } |
5345 | layer.close(index); | 5320 | layer.close(index); |
5346 | - | ||
5347 | - }, | ||
5348 | - error: function (err) { | ||
5349 | - layer.closeAll('loading'); | ||
5350 | - layer.msg('修改失败', {icon: 2}); | ||
5351 | - } | ||
5352 | - }); | ||
5353 | - } else { | ||
5354 | - layer.close(index); | 5321 | + }); |
5322 | + }) | ||
5355 | } | 5323 | } |
5356 | - }, | ||
5357 | - }); | 5324 | + , btn2:function(index, layero){ |
5325 | + var value = $('#promptInput').val(); | ||
5326 | + if (value !== old_T3Dom) { | ||
5327 | + layer.load(2); | ||
5328 | + | ||
5329 | + admin.req({ | ||
5330 | + //修改扩展字段T3/IOp值 | ||
5331 | + url: common.domainName + url, | ||
5332 | + data: { | ||
5333 | + resId:resId, | ||
5334 | + fieldValue:value, | ||
5335 | + expandId:expandId,//扩展字段id | ||
5336 | + | ||
5337 | + }, | ||
5338 | + success: function (response) { | ||
5339 | + layer.closeAll('loading'); | ||
5340 | + if (response && response.success) { | ||
5341 | + layer.msg('修改成功', {icon: 1}); | ||
5342 | + $T3Dom.text(value); | ||
5343 | + } else { | ||
5344 | + layer.msg('修改失败', {icon: 2}); | ||
5345 | + } | ||
5346 | + layer.close(index); | ||
5347 | + | ||
5348 | + }, | ||
5349 | + error: function (err) { | ||
5350 | + layer.closeAll('loading'); | ||
5351 | + layer.msg('修改失败', {icon: 2}); | ||
5352 | + } | ||
5353 | + }); | ||
5354 | + } else { | ||
5355 | + layer.close(index); | ||
5356 | + } | ||
5357 | + }, | ||
5358 | + }); | ||
5359 | + } | ||
5358 | }) | 5360 | }) |
5359 | //end lsq T3和IOP点击修改/删除 2022-08-04 | 5361 | //end lsq T3和IOP点击修改/删除 2022-08-04 |
5360 | function showTips(id, message, state) { | 5362 | function showTips(id, message, state) { |
@@ -852,9 +852,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -852,9 +852,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
852 | if(item.list && item.list.length>0){ | 852 | if(item.list && item.list.length>0){ |
853 | listStr=item.list.join(',') | 853 | listStr=item.list.join(',') |
854 | } | 854 | } |
855 | + let layTips=''; | ||
856 | + if(item.fieldSourceType == 'text'){ | ||
857 | + layTips='' | ||
858 | + }else{ | ||
859 | + layTips='lay-tips="点击修改/删除"' | ||
860 | + } | ||
855 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 861 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
856 | templet:` <div> | 862 | templet:` <div> |
857 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 863 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
858 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 864 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
859 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 865 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
860 | </div></div>`}) | 866 | </div></div>`}) |
@@ -1205,75 +1211,77 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | @@ -1205,75 +1211,77 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
1205 | promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>` | 1211 | promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>` |
1206 | } | 1212 | } |
1207 | let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`; | 1213 | let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`; |
1208 | - layer.open({ | ||
1209 | - title: [titleName+tplType, 'font-size:14px;'], | ||
1210 | - type: 1, | ||
1211 | - area: ['280px','170px'], | ||
1212 | - content: html_tpl, | ||
1213 | - success: function () { | ||
1214 | - $('#promptInput').val(old_T3Dom) | ||
1215 | - } | ||
1216 | - , id: 'lay_T3_IOP' //设定一个id,防止重复弹出 | ||
1217 | - , btn: ['清空', '保存'] | ||
1218 | - , yes: function (index, layero) { | ||
1219 | - layer.confirm('确认要删除吗?', {icon: 3, title: '提示'}, function (index1) { | ||
1220 | - layer.load(2); | ||
1221 | - admin.req({ | ||
1222 | - //删除T3值 | ||
1223 | - url: common.domainName + url, | ||
1224 | - data: { | ||
1225 | - resId:resId, | ||
1226 | - fieldValue:'', | ||
1227 | - expandId:expandId,//扩展字段id | ||
1228 | - | ||
1229 | - }, | ||
1230 | - }).done(function (response) { | ||
1231 | - layer.closeAll('loading'); | ||
1232 | - if (response.success) { | ||
1233 | - layer.msg('删除成功!', {icon: 1, time: 3000}); | ||
1234 | - $T3Dom.text(''); | ||
1235 | - } else { | ||
1236 | - layer.msg('删除失败!', {icon: 2, time: 3000}); | ||
1237 | - } | ||
1238 | - layer.close(index); | ||
1239 | - }); | ||
1240 | - }) | ||
1241 | - } | ||
1242 | - , btn2:function(index, layero){ | ||
1243 | - var value = $('#promptInput').val(); | ||
1244 | - if (value !== old_T3Dom) { | ||
1245 | - layer.load(2); | 1214 | + if(fieldSourceType != 'text'){ |
1215 | + layer.open({ | ||
1216 | + title: [titleName+tplType, 'font-size:14px;'], | ||
1217 | + type: 1, | ||
1218 | + area: ['280px','170px'], | ||
1219 | + content: html_tpl, | ||
1220 | + success: function () { | ||
1221 | + $('#promptInput').val(old_T3Dom) | ||
1222 | + } | ||
1223 | + , id: 'lay_T3_IOP' //设定一个id,防止重复弹出 | ||
1224 | + , btn: ['清空', '保存'] | ||
1225 | + , yes: function (index, layero) { | ||
1226 | + layer.confirm('确认要删除吗?', {icon: 3, title: '提示'}, function (index1) { | ||
1227 | + layer.load(2); | ||
1228 | + admin.req({ | ||
1229 | + //删除T3值 | ||
1230 | + url: common.domainName + url, | ||
1231 | + data: { | ||
1232 | + resId:resId, | ||
1233 | + fieldValue:'', | ||
1234 | + expandId:expandId,//扩展字段id | ||
1246 | 1235 | ||
1247 | - admin.req({ | ||
1248 | - //修改扩展字段T3/IOp值 | ||
1249 | - url: common.domainName + url, | ||
1250 | - data: { | ||
1251 | - resId:resId, | ||
1252 | - fieldValue:value, | ||
1253 | - expandId:expandId,//扩展字段id | ||
1254 | - | ||
1255 | - }, | ||
1256 | - success: function (response) { | 1236 | + }, |
1237 | + }).done(function (response) { | ||
1257 | layer.closeAll('loading'); | 1238 | layer.closeAll('loading'); |
1258 | - if (response && response.success) { | ||
1259 | - layer.msg('修改成功', {icon: 1}); | ||
1260 | - $T3Dom.text(value); | 1239 | + if (response.success) { |
1240 | + layer.msg('删除成功!', {icon: 1, time: 3000}); | ||
1241 | + $T3Dom.text(''); | ||
1261 | } else { | 1242 | } else { |
1262 | - layer.msg('修改失败', {icon: 2}); | 1243 | + layer.msg('删除失败!', {icon: 2, time: 3000}); |
1263 | } | 1244 | } |
1264 | layer.close(index); | 1245 | layer.close(index); |
1265 | - | ||
1266 | - }, | ||
1267 | - error: function (err) { | ||
1268 | - layer.closeAll('loading'); | ||
1269 | - layer.msg('修改失败', {icon: 2}); | ||
1270 | - } | ||
1271 | - }); | ||
1272 | - } else { | ||
1273 | - layer.close(index); | 1246 | + }); |
1247 | + }) | ||
1274 | } | 1248 | } |
1275 | - }, | ||
1276 | - }); | 1249 | + , btn2:function(index, layero){ |
1250 | + var value = $('#promptInput').val(); | ||
1251 | + if (value !== old_T3Dom) { | ||
1252 | + layer.load(2); | ||
1253 | + | ||
1254 | + admin.req({ | ||
1255 | + //修改扩展字段T3/IOp值 | ||
1256 | + url: common.domainName + url, | ||
1257 | + data: { | ||
1258 | + resId:resId, | ||
1259 | + fieldValue:value, | ||
1260 | + expandId:expandId,//扩展字段id | ||
1261 | + | ||
1262 | + }, | ||
1263 | + success: function (response) { | ||
1264 | + layer.closeAll('loading'); | ||
1265 | + if (response && response.success) { | ||
1266 | + layer.msg('修改成功', {icon: 1}); | ||
1267 | + $T3Dom.text(value); | ||
1268 | + } else { | ||
1269 | + layer.msg('修改失败', {icon: 2}); | ||
1270 | + } | ||
1271 | + layer.close(index); | ||
1272 | + | ||
1273 | + }, | ||
1274 | + error: function (err) { | ||
1275 | + layer.closeAll('loading'); | ||
1276 | + layer.msg('修改失败', {icon: 2}); | ||
1277 | + } | ||
1278 | + }); | ||
1279 | + } else { | ||
1280 | + layer.close(index); | ||
1281 | + } | ||
1282 | + }, | ||
1283 | + }); | ||
1284 | + } | ||
1277 | } | 1285 | } |
1278 | }) | 1286 | }) |
1279 | //end lsq T3和IOP点击修改/删除 2022-08-04 | 1287 | //end lsq T3和IOP点击修改/删除 2022-08-04 |
@@ -456,9 +456,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -456,9 +456,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
456 | if(item.list && item.list.length>0){ | 456 | if(item.list && item.list.length>0){ |
457 | listStr=item.list.join(',') | 457 | listStr=item.list.join(',') |
458 | } | 458 | } |
459 | + let layTips=''; | ||
460 | + if(item.fieldSourceType == 'text'){ | ||
461 | + layTips='' | ||
462 | + }else{ | ||
463 | + layTips='lay-tips="点击修改/删除"' | ||
464 | + } | ||
459 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 465 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
460 | templet:` <div> | 466 | templet:` <div> |
461 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 467 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
462 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 468 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
463 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 469 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
464 | </div></div>`}) | 470 | </div></div>`}) |
@@ -595,9 +601,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -595,9 +601,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
595 | if(item.list && item.list.length>0){ | 601 | if(item.list && item.list.length>0){ |
596 | listStr=item.list.join(',') | 602 | listStr=item.list.join(',') |
597 | } | 603 | } |
604 | + let layTips=''; | ||
605 | + if(item.fieldSourceType == 'text'){ | ||
606 | + layTips='' | ||
607 | + }else{ | ||
608 | + layTips='lay-tips="点击修改/删除"' | ||
609 | + } | ||
598 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 610 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
599 | templet:` <div> | 611 | templet:` <div> |
600 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 612 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
601 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 613 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
602 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 614 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
603 | </div></div>`}) | 615 | </div></div>`}) |
@@ -709,9 +721,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -709,9 +721,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
709 | if(item.list && item.list.length>0){ | 721 | if(item.list && item.list.length>0){ |
710 | listStr=item.list.join(',') | 722 | listStr=item.list.join(',') |
711 | } | 723 | } |
724 | + let layTips=''; | ||
725 | + if(item.fieldSourceType == 'text'){ | ||
726 | + layTips='' | ||
727 | + }else{ | ||
728 | + layTips='lay-tips="点击修改/删除"' | ||
729 | + } | ||
712 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 730 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
713 | templet:` <div> | 731 | templet:` <div> |
714 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 732 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
715 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 733 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
716 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 734 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
717 | </div></div>`}) | 735 | </div></div>`}) |
@@ -836,9 +854,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -836,9 +854,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
836 | if(item.list && item.list.length>0){ | 854 | if(item.list && item.list.length>0){ |
837 | listStr=item.list.join(',') | 855 | listStr=item.list.join(',') |
838 | } | 856 | } |
857 | + let layTips=''; | ||
858 | + if(item.fieldSourceType == 'text'){ | ||
859 | + layTips='' | ||
860 | + }else{ | ||
861 | + layTips='lay-tips="点击修改/删除"' | ||
862 | + } | ||
839 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 863 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
840 | templet:` <div> | 864 | templet:` <div> |
841 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 865 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
842 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 866 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
843 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 867 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
844 | </div></div>`}) | 868 | </div></div>`}) |
@@ -220,9 +220,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -220,9 +220,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
220 | if(item.list && item.list.length>0){ | 220 | if(item.list && item.list.length>0){ |
221 | listStr=item.list.join(',') | 221 | listStr=item.list.join(',') |
222 | } | 222 | } |
223 | + let layTips=''; | ||
224 | + if(item.fieldSourceType == 'text'){ | ||
225 | + layTips='' | ||
226 | + }else{ | ||
227 | + layTips='lay-tips="点击修改/删除"' | ||
228 | + } | ||
223 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 229 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
224 | templet:` <div> | 230 | templet:` <div> |
225 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 231 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
226 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 232 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
227 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 233 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
228 | </div></div>`}) | 234 | </div></div>`}) |
@@ -842,9 +848,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -842,9 +848,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
842 | if(item.list && item.list.length>0){ | 848 | if(item.list && item.list.length>0){ |
843 | listStr=item.list.join(',') | 849 | listStr=item.list.join(',') |
844 | } | 850 | } |
851 | + let layTips=''; | ||
852 | + if(item.fieldSourceType == 'text'){ | ||
853 | + layTips='' | ||
854 | + }else{ | ||
855 | + layTips='lay-tips="点击修改/删除"' | ||
856 | + } | ||
845 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 857 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
846 | templet:` <div> | 858 | templet:` <div> |
847 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 859 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
848 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 860 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
849 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 861 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
850 | </div></div>`}) | 862 | </div></div>`}) |
@@ -1073,9 +1085,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -1073,9 +1085,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
1073 | if(item.list && item.list.length>0){ | 1085 | if(item.list && item.list.length>0){ |
1074 | listStr=item.list.join(',') | 1086 | listStr=item.list.join(',') |
1075 | } | 1087 | } |
1088 | + let layTips=''; | ||
1089 | + if(item.fieldSourceType == 'text'){ | ||
1090 | + layTips='' | ||
1091 | + }else{ | ||
1092 | + layTips='lay-tips="点击修改/删除"' | ||
1093 | + } | ||
1076 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 1094 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
1077 | templet:` <div> | 1095 | templet:` <div> |
1078 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 1096 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
1079 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 1097 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
1080 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 1098 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
1081 | </div></div>`}) | 1099 | </div></div>`}) |
@@ -1231,9 +1249,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | @@ -1231,9 +1249,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
1231 | if(item.list && item.list.length>0){ | 1249 | if(item.list && item.list.length>0){ |
1232 | listStr=item.list.join(',') | 1250 | listStr=item.list.join(',') |
1233 | } | 1251 | } |
1252 | + let layTips=''; | ||
1253 | + if(item.fieldSourceType == 'text'){ | ||
1254 | + layTips='' | ||
1255 | + }else{ | ||
1256 | + layTips='lay-tips="点击修改/删除"' | ||
1257 | + } | ||
1234 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 1258 | cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, |
1235 | templet:` <div> | 1259 | templet:` <div> |
1236 | - <div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`" | 1260 | + <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
1237 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 1261 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
1238 | {{d.`+item.field+` ? d.`+item.field+` : ''}} | 1262 | {{d.`+item.field+` ? d.`+item.field+` : ''}} |
1239 | </div></div>`}) | 1263 | </div></div>`}) |
-
Please register or login to post a comment