|
|
@@ -27,8 +27,8 @@
|
|
|
<el-button type="primary" size="mini" style="margin-left: 8px"
|
|
|
v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5" @click="saveinfochange">保存
|
|
|
</el-button>
|
|
|
- <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitaudit"
|
|
|
- v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
|
|
|
+ <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
|
|
|
+ v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
|
|
|
</el-button>
|
|
|
<el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
|
|
|
v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
|
|
|
@@ -570,39 +570,6 @@
|
|
|
<span><i class="icon icon-table2"></i> 企业资质</span>
|
|
|
<el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" >添加</el-button>
|
|
|
</div>
|
|
|
- <!--<el-table :data="subfileList" size="mini" border>-->
|
|
|
- <!--<el-table-column label="操作" width="150" align="center" fixed>-->
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
- <!--<el-button type="primary" plain size="mini" title="上传" @click="openDialog(scope.row)"-->
|
|
|
- <!--:disabled="formData.Status > 0">上传-->
|
|
|
- <!--</el-button>-->
|
|
|
- <!--<el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"-->
|
|
|
- <!--v-if="scope.row.FileType == '66'" @click="newdeletedata(scope.row)">删除</el-button>-->
|
|
|
- <!--</template>-->
|
|
|
- <!--</el-table-column>-->
|
|
|
- <!--<el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>-->
|
|
|
- <!--<el-table-column label="贸易/制造" v-if="SupplierTypeCode == '01'" show-overflow-tooltip>-->
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
- <!--<span v-if="scope.row.IsManuf=='1'">制造商</span>-->
|
|
|
- <!--<span v-else-if="scope.row.IsManuf=='2'">贸易商</span>-->
|
|
|
- <!--<span v-else>通用</span>-->
|
|
|
- <!--</template>-->
|
|
|
- <!--</el-table-column>-->
|
|
|
- <!--<el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>-->
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
- <!--<div v-for="(tmpUrl, index) in scope.row.FileUrlList">-->
|
|
|
- <!--<a :href="fileurlcut(scope.row.FileUrl, index)" target="_blank"-->
|
|
|
- <!--class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>-->
|
|
|
- <!--</div>-->
|
|
|
- <!--</template>-->
|
|
|
- <!--</el-table-column>-->
|
|
|
- <!--<el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>-->
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
- <!--{{ jstimehandle(scope.row.EffectDate+'') }}-->
|
|
|
- <!--</template>-->
|
|
|
- <!--</el-table-column>-->
|
|
|
- <!--<el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>-->
|
|
|
- <!--</el-table>-->
|
|
|
<el-table size="mini" highlight-current-row :data="subfileList1" border>
|
|
|
<el-table-column label="操作" width="150" align="center" fixed>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -693,8 +660,8 @@
|
|
|
<el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
|
|
|
</el-table>
|
|
|
<div style="float: right; margin: 20px;">
|
|
|
- <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitaudit"
|
|
|
- v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
|
|
|
+ <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
|
|
|
+ v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
|
|
|
</el-button>
|
|
|
<el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
|
|
|
v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
|
|
|
@@ -972,14 +939,11 @@
|
|
|
<wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
|
|
|
+ <el-dialog title="提交初审" :visible.sync="dialogSeparateUnitAuditVisible" width="520px">
|
|
|
<el-form ref="searchForm" label-width="110px">
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="初审人员">
|
|
|
- <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
|
|
|
- <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>-->
|
|
|
- <!--</el-input>-->
|
|
|
<el-select ref="selectAuditer"
|
|
|
v-model="auditer"
|
|
|
placeholder="请选择初审人"
|
|
|
@@ -1023,12 +987,12 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button size="mini" @click="AuditdialogShow = false">取 消</el-button>
|
|
|
- <el-button size="mini" type="primary" @click="AuditEntity" :loading="btnloading">确定</el-button>
|
|
|
+ <el-button size="mini" @click="dialogSeparateUnitAuditVisible = false">取 消</el-button>
|
|
|
+ <el-button size="mini" type="primary" @click="separateUnitSubmitAuditMakeSure" :loading="btnloading">确定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog title="分办" :visible.sync="ComAuditdialogShow" width="520px">
|
|
|
+ <el-dialog title="分办" :visible.sync="dialogComSubmitToSeparateUnitVisible" width="520px">
|
|
|
<el-form ref="searchForm" label-width="100px">
|
|
|
<el-row>
|
|
|
<el-col :span="24">
|
|
|
@@ -1062,7 +1026,7 @@
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button size="mini" @click="ComAuditdialogShow = false">取 消</el-button>
|
|
|
+ <el-button size="mini" @click="dialogComSubmitToSeparateUnitVisible = false">取 消</el-button>
|
|
|
<el-button size="mini" type="primary" @click="SubpEntity" :loading="btnloading">确定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
@@ -1322,7 +1286,7 @@
|
|
|
keyword: '',
|
|
|
goodsList2019: [],
|
|
|
goodsDialog: false,
|
|
|
- tableloading:false,
|
|
|
+ tableloading: false,
|
|
|
|
|
|
UnitOrg: '',
|
|
|
allowpre: true,
|
|
|
@@ -1341,8 +1305,8 @@
|
|
|
secauditerOptions: [],
|
|
|
fushenauditer: '', // 复审人员
|
|
|
majorDept: [100000000, 100000001, 100000071], // 专业可是
|
|
|
- AuditdialogShow: false, // 提交审核弹框
|
|
|
- ComAuditdialogShow: false,
|
|
|
+ dialogSeparateUnitAuditVisible: false, // 二级单位分办提交审核弹框
|
|
|
+ dialogComSubmitToSeparateUnitVisible: false,
|
|
|
organizeOption: [], // 审批部门
|
|
|
auditerOption: [], // 审批人
|
|
|
SupplierformData: {},
|
|
|
@@ -2216,35 +2180,9 @@
|
|
|
this.getFirAuditerByDept()
|
|
|
this.changeOrgUnit(this.selectDept)
|
|
|
this.AuditdialogShow = true
|
|
|
- // if (this.subfileList && this.subfileList.length > 0) {
|
|
|
- // for (var i = 0; i < this.subfileList.length; i++) {
|
|
|
- // if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
|
|
|
- // this.$message({
|
|
|
- // type: 'warning',
|
|
|
- // message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
|
|
|
- // })
|
|
|
- // return
|
|
|
- // }
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // this.AuditdialogShow = true
|
|
|
- // }
|
|
|
},
|
|
|
commitfenban () {
|
|
|
- this.ComAuditdialogShow = true
|
|
|
- // if (this.subfileList && this.subfileList.length > 0) {
|
|
|
- // for (var i = 0; i < this.subfileList.length; i++) {
|
|
|
- // if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
|
|
|
- // this.$message({
|
|
|
- // type: 'warning',
|
|
|
- // message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
|
|
|
- // })
|
|
|
- // return
|
|
|
- // }
|
|
|
- // }
|
|
|
- // } else {
|
|
|
- // this.ComAuditdialogShow = true
|
|
|
- // }
|
|
|
+ this.dialogComSubmitToSeparateUnitVisible = true
|
|
|
},
|
|
|
|
|
|
// 根据分类Id获取Code
|
|
|
@@ -3355,7 +3293,100 @@
|
|
|
console.error(err)
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+ // 二级单位代为申请, 提交按钮
|
|
|
+ separateUnitSubmitClick () {
|
|
|
+ console.log('二级单位代为申请, 点击提交')
|
|
|
+ if ([2, 4, 6].includes(parseInt(this.formData.InStyle))) {
|
|
|
+ this.allowpre = false
|
|
|
+ } else {
|
|
|
+ this.changeOrgUnit(this.selectDept)
|
|
|
+ this.allowpre = true
|
|
|
+ }
|
|
|
+ this.getFirAuditerByDept()
|
|
|
+ this.dialogSeparateUnitAuditVisible = true
|
|
|
+ },
|
|
|
+ // 二级分办单位提交审批
|
|
|
+ separateUnitSubmitAuditMakeSure () {
|
|
|
+ console.log('二级分办单位，确认提交审批')
|
|
|
+ this.btnloading = true
|
|
|
+ this.separateUnitSubmitAuditParamsCheck()
|
|
|
+ let params = {
|
|
|
+ firstAudit: this.auditer,
|
|
|
+ SecondAudit: this.fushenauditer,
|
|
|
+ ThirdAudit: this.selectDept,
|
|
|
+ AuditRemark: this.auditform.AuditRemark
|
|
|
+ }
|
|
|
+ api2.SeparateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
|
|
|
+ if (res.data.code === 0) {
|
|
|
+ // 保存成功后，初始化数据，变成修改
|
|
|
+ this.getEntityById()
|
|
|
+ this.dialogSeparateUnitAuditVisible = false
|
|
|
+ this.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: res.data.message
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: res.data.message
|
|
|
+ })
|
|
|
+ }
|
|
|
+ this.btnloading = false
|
|
|
+ }).catch(err => {
|
|
|
+ console.error(err)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 二级分办单位提交审批参数检查
|
|
|
+ separateUnitSubmitAuditParamsCheck () {
|
|
|
+ if (this.myentityList == null || this.myentityList.length <= 0) {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '没有新增准入项，不能提交！'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ for (let idx in this.subfileList1) {
|
|
|
+ if (this.subfileList1[idx].OldFileUrl === '' && this.subfileList1[idx].FileUrl === '') {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: this.subfileList1[idx].NeedFileType + '没有上传，不能提交！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (this.auditer === '') {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '请选择初审人！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.fushenauditer === '') {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '请选择复审人！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if (this.formData.InStyle === '1' || this.formData.InStyle === '5') {
|
|
|
+ if (this.selectDept === 0 || this.selectDept === '') {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '请选择专业处室！'
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (this.formData.InStyle === '1' || this.formData.InStyle === '5') {
|
|
|
+ if (this.userOptions == null || this.userOptions.length === 0) {
|
|
|
+ this.$message({
|
|
|
+ type: 'warning',
|
|
|
+ message: '该专业科室未配置接收人！'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
SubpEntity () {
|
|
|
if (this.myentityList == null || this.myentityList.length <= 0) {
|
|
|
this.$message({
|
|
|
@@ -3395,7 +3426,7 @@
|
|
|
if (res.data.code === 0) {
|
|
|
// 保存成功后，初始化数据，变成修改
|
|
|
this.getEntityById()
|
|
|
- this.ComAuditdialogShow = false
|
|
|
+ this.dialogComSubmitToSeparateUnitVisible = false
|
|
|
this.$message({
|
|
|
type: 'success',
|
|
|
message: res.data.message
|
baichengfei