|
|
@@ -100,7 +100,7 @@
|
|
|
</dg-col>
|
|
|
<dg-col :span="12" v-if="isDetail">
|
|
|
<el-form-item label="创建时间：">
|
|
|
- {{ sizeForm.createTime }}
|
|
|
+ {{ sizeForm.createTime }}
|
|
|
</el-form-item>
|
|
|
</dg-col>
|
|
|
<dg-col :span="12" v-if="sizeForm.applyType == 'SERVICE_AUTH'">
|
|
|
@@ -119,7 +119,9 @@
|
|
|
<el-form-item label="审批内容：" class="self-form-item" prop="flowContent">
|
|
|
<div style="display: flex" v-if="!isDetail">
|
|
|
<el-input type="textarea" :autosize="{ minRows: 5 }" :value="flowContentStr" :disabled="true"></el-input>
|
|
|
- <dg-button style="margin-left: 10px" @click="handleChoice" v-if="sizeForm.applyType">选择</dg-button>
|
|
|
+ <dg-button style="margin-left: 10px" @click="handleChoice" v-if="sizeForm.applyType && !this.repeatApply"
|
|
|
+ >选择</dg-button
|
|
|
+ >
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
{{ flowContentStr }}
|
|
|
@@ -201,7 +203,7 @@
|
|
|
range-separator="至"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
v-show="sizeForm.permissionValidType !== '02'"
|
|
|
:picker-options="pickerOptions"
|
|
|
clearable
|
|
|
@@ -252,6 +254,19 @@
|
|
|
<dg-button type="primary" @click="handleSubmit">提交</dg-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- 重复申请提示框 -->
|
|
|
+ <dg-dialog title="提示" :visible.sync="visible" width="450px" :modal="false">
|
|
|
+ <p class="repeatContent">
|
|
|
+ 您存在待审批的审批单，审批单号：
|
|
|
+ <span @click="handleOpenDetail">
|
|
|
+ {{ repeatApply }}
|
|
|
+ </span>
|
|
|
+ ，无法申请，请等待审批后再进行资源申请。
|
|
|
+ </p>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <dg-button @click="visible = false">关闭</dg-button>
|
|
|
+ </span>
|
|
|
+ </dg-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -356,7 +371,9 @@ export default {
|
|
|
cancelText: '申请撤销服务：'
|
|
|
}
|
|
|
},
|
|
|
- needFilter: true
|
|
|
+ needFilter: true,
|
|
|
+ visible: false,
|
|
|
+ repeatApply: ''
|
|
|
};
|
|
|
},
|
|
|
components: {},
|
|
|
@@ -379,19 +396,40 @@ export default {
|
|
|
watch: {
|
|
|
'sizeForm.applyType': {
|
|
|
handler(val) {
|
|
|
- let component;
|
|
|
- if (val == 'DATA_AUTH') {
|
|
|
- component = dataSourceForm;
|
|
|
- } else if (val == 'SERVICE_AUTH') {
|
|
|
- component = serviceSourceForm;
|
|
|
- } else {
|
|
|
- component = appFuncForm;
|
|
|
+ if (val) {
|
|
|
+ let component;
|
|
|
+ if (val == 'DATA_AUTH') {
|
|
|
+ component = dataSourceForm;
|
|
|
+ } else if (val == 'SERVICE_AUTH') {
|
|
|
+ component = serviceSourceForm;
|
|
|
+ } else {
|
|
|
+ component = appFuncForm;
|
|
|
+ }
|
|
|
+ this.applyContentCom = component;
|
|
|
}
|
|
|
- this.applyContentCom = component;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ handleOpenDetail() {
|
|
|
+ const layer = this.$dgLayer({
|
|
|
+ title: '详情',
|
|
|
+ props: {
|
|
|
+ applyOrdNo: this.repeatApply,
|
|
|
+ type: 'detail'
|
|
|
+ },
|
|
|
+ content: require('./detail.vue'),
|
|
|
+ area: ['1280px', '900px'],
|
|
|
+ on: {
|
|
|
+ success(params) {
|
|
|
+ layer.close(layer.dialogIndex);
|
|
|
+ },
|
|
|
+ close() {
|
|
|
+ layer.close(layer.dialogIndex);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
// 获取流程名称
|
|
|
getProcessName(val) {
|
|
|
Api.getFlowDefine(val).then((res) => {
|
|
|
@@ -409,8 +447,21 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- // 切换审批类型,清空审批内容
|
|
|
+ // 切换审批类型,判断是否存在未审批的单,清空审批内容
|
|
|
handleChangeApplyType(val) {
|
|
|
+ const params = {
|
|
|
+ applyType: val,
|
|
|
+ applicantIdcard: this.$store.getters.user.idcard
|
|
|
+ };
|
|
|
+ // Api.checkAppFunRepeat(params).then((res) => {
|
|
|
+ // const { result, msg } = res.data;
|
|
|
+ // if (result == '300') {
|
|
|
+ // this.repeatApply = msg;
|
|
|
+ // this.visible = true;
|
|
|
+ // } else {
|
|
|
+ // this.repeatApply = '';
|
|
|
+ // }
|
|
|
+ // });
|
|
|
this.sizeForm.flowContent = '';
|
|
|
this.sizeForm.resourceInfos = [];
|
|
|
this.applySelectKeys = [];
|
|
|
@@ -448,11 +499,12 @@ export default {
|
|
|
params['workFlow'] = otherInfo;
|
|
|
api = 'savePermissionApply';
|
|
|
} else {
|
|
|
- const { permissionValidType, operateType, applicantPhoneNo, applyReason, startTime, endTime, flowContent } =
|
|
|
+ const { permissionValidType, operateType, applicantPhoneNo, applyReason, startTime, endTime, flowContent,delResourceInfos } =
|
|
|
this.sizeForm;
|
|
|
// 只选可编辑的字段
|
|
|
params = {
|
|
|
resourceInfos,
|
|
|
+ delResourceInfos,
|
|
|
permissionValidType,
|
|
|
operateType,
|
|
|
applicantPhoneNo,
|
|
|
@@ -490,8 +542,9 @@ export default {
|
|
|
content: this.applyContentCom,
|
|
|
area: ['1200px', '700px'],
|
|
|
on: {
|
|
|
- success(visitResourceName, cancelResourceName, selectKeys, resourceInfos = []) {
|
|
|
+ success(visitResourceName, cancelResourceName, selectKeys, resourceInfos = [], delResourceInfos = []) {
|
|
|
vm.sizeForm.resourceInfos = resourceInfos;
|
|
|
+ vm.sizeForm.delResourceInfos = delResourceInfos;
|
|
|
vm.applySelectKeys = selectKeys;
|
|
|
const visitorName =
|
|
|
vm.sizeForm.applyType !== 'SERVICE_AUTH' ? vm.sizeForm.applicantName : vm.sizeForm.applyId;
|
|
|
@@ -549,13 +602,13 @@ export default {
|
|
|
needFlowInfo: true
|
|
|
};
|
|
|
Api.applyDetail(params).then((res) => {
|
|
|
- const { workFlow, resourceInfos, ...otherInfo } = res.data.content;
|
|
|
+ const { workFlow, resourceInfos, existResourceInfos , ...otherInfo } = res.data.content;
|
|
|
this.sizeForm = {
|
|
|
...workFlow,
|
|
|
resourceInfos,
|
|
|
...otherInfo
|
|
|
};
|
|
|
- this.applySelectKeys = this.sizeForm.resourceInfos.map((item) => item.funId);
|
|
|
+ this.applySelectKeys = [...resourceInfos, ...existResourceInfos].map((item) => item.funId);
|
|
|
this.show = true;
|
|
|
});
|
|
|
}
|
|
|
@@ -581,6 +634,7 @@ export default {
|
|
|
startTime: '',
|
|
|
endTime: '',
|
|
|
resourceInfos: [],
|
|
|
+ delResourceInfos: [],
|
|
|
applyId: '', // 应用方
|
|
|
userType: '',
|
|
|
userName: '',
|
|
|
@@ -598,5 +652,11 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
<style scoped lang="scss">
|
|
|
-// @import './index.scss';
|
|
|
+.repeatContent {
|
|
|
+ color: rgba(0, 0, 0, 0.85);
|
|
|
+ span {
|
|
|
+ color: #1890ff;
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
林倩