xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-04-18 16:21:53 +08:00
parent bea2959dd7
commit d4fb949c08
4 changed files with 1353 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
View File

@ -104,7 +104,7 @@ public class QuotJsqrController extends BaseController
/**
* 操作人确认事件
*/
@PreAuthorize("@ss.hasPermi('jsqr:jsqr:query')")
@PreAuthorize("@ss.hasAnyPermi('jsqr:jsqr:operate,jsqr:jsqr:check,jsqr:jsqr:leader')")
@Log(title = "报价单-技术确认单协助操作", businessType = BusinessType.UPDATE)
@PostMapping("/doOperate")
public AjaxResult doOperate(HttpServletResponse response, @RequestBody QuotJsqrXzDetail info)

29
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -347,7 +347,7 @@
<el-row :gutter="8">
<el-col :span="12">
<el-form-item label="技术确认单号" prop="quotJsxzConfirmCode">
<el-input v-model="form.quotJsxzConfirmCode" :disabled="true" />
<el-link :underline="false" type="primary" @click="showJsqrDialog">{{form.quotJsxzConfirmCode}}</el-link>
</el-form-item>
</el-col>
<el-col :span="12">
@ -670,6 +670,11 @@
<span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'">驳回</el-button></span>
</div>
</el-dialog>
<!-- 技术确认单详情对话框 -->
<el-dialog :title="jsqrTitle" :visible.sync="jsqrDialogOpen" width="1000px" append-to-body>
<jsqrDialog :quotJsqrIdProp="quotJsqrIdProp"></jsqrDialog>
</el-dialog>
</div>
</template>
<style>
@ -708,8 +713,15 @@ import { listQuot, getQuot, delQuot, addQuot, updateQuot, quotFileList, quotFile
import { getToken } from "@/utils/auth";
import { checkPermi } from '@/utils/permission';// 权限判断函数
// 导入技术确认单详情组件
import jsqrDialog from '@/views/technicalConfirm/technicalConfirm/jsxzInfo.vue';
export default {
name: "Quot",
components: {
// 注册组件
'jsqrDialog': jsqrDialog
},
dicts: ['quot_approval_status','quot_jsxz_group','quot_jsxz_chapter','quot_jsxz_approval_status','quot_jsxz_standard','quot_hj_approval_status'],
data() {
return {
@ -796,6 +808,11 @@ export default {
showDy: false,
showZy: false,
showQt: false,
//调用公共技术确认单页面参数
jsqrTitle: "",
jsqrDialogOpen: false,
quotJsqrIdProp: ""
};
},
created() {
@ -1012,7 +1029,6 @@ export default {
});
},
/** 删除按钮操作 */
handleDelete(row) {
const quotIds = row.quotId || this.ids;
@ -1168,8 +1184,15 @@ export default {
this.getQuotFkFileList();
}
});
}
},
/*********************************附件上传*****************************************/
//技术确认单 详细信息
showJsqrDialog(){
this.jsqrTitle = "技术确认单信息";
this.jsqrDialogOpen = true;
this.quotJsqrIdProp = this.form.quotJsxzConfirmId;//传参设置
}
}
};
</script>

56
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
View File

@ -196,16 +196,16 @@
<el-divider content-position="center">特缆协助</el-divider>
<div style="margin-bottom: 10px;text-align:right">
<div v-if="this.form.quotJsqrTlOperateState == 0 && this.form.quotJsqrTlCheckState != 2 && this.form.quotJsqrTlLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('TL','operater','2')">操作人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('TL','operater','3')">操作人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="success" plain @click="doOperate('TL','operater','2')">操作人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="danger" plain @click="doOperate('TL','operater','3')">操作人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrTlOperateState == 2 && this.form.quotJsqrTlCheckState != 2 && this.form.quotJsqrTlLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('TL','checker','2')">审核人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('TL','checker','3')">审核人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="success" plain @click="doOperate('TL','checker','2')">审核人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="danger" plain @click="doOperate('TL','checker','3')">审核人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrTlOperateState == 2 && this.form.quotJsqrTlCheckState == 2 && this.form.quotJsqrTlLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('TL','leader','2')">组长通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('TL','leader','3')">组长驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="success" plain @click="doOperate('TL','leader','2')">组长通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="danger" plain @click="doOperate('TL','leader','3')">组长驳回</el-button>
</div>
</div>
<el-row :gutter="8">
@ -225,7 +225,7 @@
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="特缆反馈附件">
<el-button size="mini" type="primary" @click="handleAddFile('quotJsqrTl')">上传文件 ({{this.quotJsqrTlFileNum}})</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operateUploadFile']" size="mini" type="primary" @click="handleAddFile('quotJsqrTl')">上传文件 ({{this.quotJsqrTlFileNum}})</el-button>
<!--已上传: {{this.quotJsqrTlFileNum}} 个-->
</el-form-item>
</el-col>
@ -327,16 +327,16 @@
<el-divider content-position="center">低压协助</el-divider>
<div style="margin-bottom: 10px;text-align:right">
<div v-if="this.form.quotJsqrDyOperateState == 0 && this.form.quotJsqrDyCheckState != 2 && this.form.quotJsqrDyLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('DY','operater','2')">操作人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('DY','operater','3')">操作人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="success" plain @click="doOperate('DY','operater','2')">操作人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="danger" plain @click="doOperate('DY','operater','3')">操作人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrDyOperateState == 2 && this.form.quotJsqrDyCheckState != 2 && this.form.quotJsqrDyLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('DY','checker','2')">审核人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('DY','checker','3')">审核人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="success" plain @click="doOperate('DY','checker','2')">审核人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="danger" plain @click="doOperate('DY','checker','3')">审核人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrDyOperateState == 2 && this.form.quotJsqrDyCheckState == 2 && this.form.quotJsqrDyLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('DY','leader','2')">组长通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('DY','leader','3')">组长驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="success" plain @click="doOperate('DY','leader','2')">组长通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="danger" plain @click="doOperate('DY','leader','3')">组长驳回</el-button>
</div>
</div>
<el-row :gutter="8">
@ -356,7 +356,7 @@
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="低压反馈附件">
<el-button size="mini" type="primary" @click="handleAddFile('quotJsqrDy')">上传文件 ({{this.quotJsqrDyFileNum}})</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operateUploadFile']" size="mini" type="primary" @click="handleAddFile('quotJsqrDy')">上传文件 ({{this.quotJsqrDyFileNum}})</el-button>
</el-form-item>
</el-col>
<el-col :span="16">
@ -457,16 +457,16 @@
<el-divider content-position="center">中压协助</el-divider>
<div style="margin-bottom: 10px;text-align:right">
<div v-if="this.form.quotJsqrZyOperateState == 0 && this.form.quotJsqrZyCheckState != 2 && this.form.quotJsqrZyLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('ZY','operater','2')">操作人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('ZY','operater','3')">操作人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="success" plain @click="doOperate('ZY','operater','2')">操作人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="danger" plain @click="doOperate('ZY','operater','3')">操作人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrZyOperateState == 2 && this.form.quotJsqrZyCheckState != 2 && this.form.quotJsqrZyLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('ZY','checker','2')">审核人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('ZY','checker','3')">审核人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="success" plain @click="doOperate('ZY','checker','2')">审核人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="danger" plain @click="doOperate('ZY','checker','3')">审核人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrZyOperateState == 2 && this.form.quotJsqrZyCheckState == 2 && this.form.quotJsqrZyLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('ZY','leader','2')">组长通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('ZY','leader','3')">组长驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="success" plain @click="doOperate('ZY','leader','2')">组长通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="danger" plain @click="doOperate('ZY','leader','3')">组长驳回</el-button>
</div>
</div>
<el-row :gutter="8">
@ -486,7 +486,7 @@
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="中压反馈附件">
<el-button size="mini" type="primary" @click="handleAddFile('quotJsqrZy')">上传文件 ({{this.quotJsqrZyFileNum}})</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operateUploadFile']" size="mini" type="primary" @click="handleAddFile('quotJsqrZy')">上传文件 ({{this.quotJsqrZyFileNum}})</el-button>
</el-form-item>
</el-col>
<el-col :span="16">
@ -587,16 +587,16 @@
<el-divider content-position="center">其他协助(防火、轨道、架空)</el-divider>
<div style="margin-bottom: 10px;text-align:right">
<div v-if="this.form.quotJsqrQtOperateState == 0 && this.form.quotJsqrQtCheckState != 2 && this.form.quotJsqrQtLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('QT','operater','2')">操作人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('QT','operater','3')">操作人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="success" plain @click="doOperate('QT','operater','2')">操作人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operate']" size="mini" type="danger" plain @click="doOperate('QT','operater','3')">操作人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrQtOperateState == 2 && this.form.quotJsqrQtCheckState != 2 && this.form.quotJsqrQtLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('QT','checker','2')">审核人通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('QT','checker','3')">审核人驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="success" plain @click="doOperate('QT','checker','2')">审核人通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:check']" size="mini" type="danger" plain @click="doOperate('QT','checker','3')">审核人驳回</el-button>
</div>
<div v-if="this.form.quotJsqrQtOperateState == 2 && this.form.quotJsqrQtCheckState == 2 && this.form.quotJsqrQtLeaderState != 2">
<el-button size="mini" type="success" plain @click="doOperate('QT','leader','2')">组长通过</el-button>
<el-button size="mini" type="danger" plain @click="doOperate('QT','leader','3')">组长驳回</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="success" plain @click="doOperate('QT','leader','2')">组长通过</el-button>
<el-button v-hasPermi="['jsqr:jsqr:leader']" size="mini" type="danger" plain @click="doOperate('QT','leader','3')">组长驳回</el-button>
</div>
</div>
<el-row :gutter="8">
@ -616,7 +616,7 @@
<el-row :gutter="8">
<el-col :span="8">
<el-form-item label="其他反馈附件">
<el-button size="mini" type="primary" @click="handleAddFile('quotJsqrQt')">上传文件 ({{this.quotJsqrQtFileNum}})</el-button>
<el-button v-hasPermi="['jsqr:jsqr:operateUploadFile']" size="mini" type="primary" @click="handleAddFile('quotJsqrQt')">上传文件 ({{this.quotJsqrQtFileNum}})</el-button>
</el-form-item>
</el-col>
<el-col :span="16">

1298
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue Normal file
View File

File diff suppressed because it is too large Load Diff