|
@@ -368,10 +368,10 @@ export default {
|
|
flowContentStr() {
|
|
flowContentStr() {
|
|
let str = '';
|
|
let str = '';
|
|
if (this.sizeForm.flowContent) {
|
|
if (this.sizeForm.flowContent) {
|
|
- const { visitorName, visitResourceName, cancelResourceName } = JSON.parse(this.sizeForm.flowContent);
|
|
|
|
|
|
+ const { visitorName, visitResourceName, removeVisitResourceNames } = JSON.parse(this.sizeForm.flowContent);
|
|
const { applyText, cancelText } = this.applyContentOperateObj[this.sizeForm.businessCode] || {};
|
|
const { applyText, cancelText } = this.applyContentOperateObj[this.sizeForm.businessCode] || {};
|
|
const applyContent = visitResourceName ? `${applyText}${visitResourceName}。\n` : '';
|
|
const applyContent = visitResourceName ? `${applyText}${visitResourceName}。\n` : '';
|
|
- const cancelContent = cancelResourceName ? `${cancelText}${cancelResourceName}。` : '';
|
|
|
|
|
|
+ const cancelContent = removeVisitResourceNames ? `${cancelText}${removeVisitResourceNames}。` : '';
|
|
str = `${visitorName}${applyContent}${cancelContent}`;
|
|
str = `${visitorName}${applyContent}${cancelContent}`;
|
|
}
|
|
}
|
|
return str;
|
|
return str;
|
|
@@ -489,12 +489,12 @@ export default {
|
|
content: this.applyContentCom,
|
|
content: this.applyContentCom,
|
|
area: ['1200px', '700px'],
|
|
area: ['1200px', '700px'],
|
|
on: {
|
|
on: {
|
|
- success(visitResourceName, cancelResourceName, selectKeys, resourceInfos = []) {
|
|
|
|
|
|
+ success(visitResourceName, removeVisitResourceNames, selectKeys, resourceInfos = []) {
|
|
vm.sizeForm.resourceInfos = resourceInfos;
|
|
vm.sizeForm.resourceInfos = resourceInfos;
|
|
vm.applySelectKeys = selectKeys;
|
|
vm.applySelectKeys = selectKeys;
|
|
const visitorName =
|
|
const visitorName =
|
|
vm.sizeForm.applyType !== 'SERVICE_AUTH' ? vm.sizeForm.applicantName : vm.sizeForm.applyId;
|
|
vm.sizeForm.applyType !== 'SERVICE_AUTH' ? vm.sizeForm.applicantName : vm.sizeForm.applyId;
|
|
- const resourceObj = { visitorName, visitResourceName, cancelResourceName };
|
|
|
|
|
|
+ const resourceObj = { visitorName, visitResourceName, removeVisitResourceNames };
|
|
vm.sizeForm.flowContent = JSON.stringify(resourceObj);
|
|
vm.sizeForm.flowContent = JSON.stringify(resourceObj);
|
|
vm.needFilter = false;
|
|
vm.needFilter = false;
|
|
layer.close(layer.dialogIndex);
|
|
layer.close(layer.dialogIndex);
|