bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领料审批权限

This commit is contained in:
zhouzy062 2024-02-26 18:43:14 +08:00
parent 1856249b0e
commit d4c9beff5e
46 changed files with 169 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-ui/src/api/cost/cost.js
View File

@ -1,6 +1,6 @@
import request from '@/utils/request'
// 查询费用结算列表
// 查询费用结算申请列表
export function getSltAgreementInfo(query) {
return request({
url: '/material/sltAgreementInfo/getSltAgreementInfo',
@ -10,7 +10,14 @@ export function getSltAgreementInfo(query) {
}
// 查询费用结算申请详情
export function getSltInfo(query) {
return request({
url: '/material/sltAgreementInfo/getSltInfo',
method: 'get',
params: query
})
}

2
sgzb-ui/src/views/base/comeAndGo/index.vue
View File

@ -165,7 +165,7 @@
<el-select
v-model="form.typeId"
placeholder="请选择单位类型"
style="width: 100%"
style="width: 100%" filterable
@change="selecType"
>
<el-option

6
sgzb-ui/src/views/base/comeAndGo/people.vue
View File

@ -259,7 +259,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-select v-model="form.sex" filterable placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
@ -287,7 +287,7 @@
<el-form-item label="岗位">
<el-select
v-model="form.postIds"
multiple
multiple filterable
placeholder="请选择岗位"
>
<el-option
@ -304,7 +304,7 @@
<el-form-item label="角色">
<el-select
v-model="form.roleIds"
multiple
multiple filterable
placeholder="请选择角色"
>
<el-option

2
sgzb-ui/src/views/base/project/index.vue
View File

@ -93,7 +93,7 @@
</el-form-item>
<el-form-item label="工程类型" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select v-model="form.typeId" placeholder="请选择工程类型" style="width: 100%;" @change="selecType">
<el-select v-model="form.typeId" filterable placeholder="请选择工程类型" style="width: 100%;" @change="selecType">
<el-option
v-for="item in typeList"
:key="item.id"

4
sgzb-ui/src/views/base/section/index.vue
View File

@ -153,7 +153,7 @@
<el-form-item label="所属工程项目" prop="ownPro">
<!-- <el-input v-model="form.ownPro" placeholder="请输入所属工程项目" /> -->
<el-select
v-model="form.ownPro"
v-model="form.ownPro" filterable
placeholder="请选择所属工程项目"
style="width: 100%"
>
@ -169,7 +169,7 @@
<el-form-item label="工程类型" prop="typeId">
<!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
<el-select
v-model="form.typeId"
v-model="form.typeId" filterable
placeholder="请选择工程类型"
style="width: 100%"
@change="selecType"

10
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -23,14 +23,14 @@
<el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable>
<el-option
v-for="item in unitList"
:key="item.unitId"
:key="item.unitId" filterable
:label="item.unitName"
:value="item.unitId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable>
<el-select v-model="queryParams.projectId" filterable placeholder="请选择工程名称" clearable>
<el-option
v-for="item in projectList"
:key="item.projectId"
@ -138,7 +138,7 @@
<el-input v-model="form.contractCode" placeholder="合同编号" />
</el-form-item>
<el-form-item label="往来单位:" prop="unitId">
<el-select v-model="form.unitId" placeholder="请选择往来单位" style="width: 100%;" >
<el-select v-model="form.unitId" filterable placeholder="请选择往来单位" style="width: 100%;" >
<el-option
v-for="item in unitList"
:key="item.unitId"
@ -148,7 +148,7 @@
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="projectId">
<el-select v-model="form.projectId" placeholder="请选择工程名称" style="width: 100%;" >
<el-select v-model="form.projectId" filterable placeholder="请选择工程名称" style="width: 100%;" >
<el-option
v-for="item in projectList"
:key="item.projectId"
@ -158,7 +158,7 @@
</el-select>
</el-form-item>
<el-form-item label="协议类型" prop="protocol">
<el-select v-model="form.protocol" placeholder="请选择协议类型" style="width: 100%;" >
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" style="width: 100%;" >
<el-option
v-for="item in protocolList"
:key="item.protocolId"

4
sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue
View File

@ -12,7 +12,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="往来单位">
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-select v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in unitList"
:key="item.id"
@ -22,7 +22,7 @@
</el-select>
</el-form-item>
<el-form-item label="工程名称">
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in proList"
:key="item.id"

4
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -3,7 +3,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :rules="queryRules" :inline="true" v-show="showSearch">
<el-row>
<el-form-item label="领料单位" prop="unitId">
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-select v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in unitList"
:key="item.id"
@ -13,7 +13,7 @@
</el-select>
</el-form-item>
<el-form-item label="领料工程" prop="proId">
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in proList"
:key="item.id"

80
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -125,16 +125,26 @@
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px">
<el-input placeholder="请输入审核意见" type="textarea" maxlength="50" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer">
<el-button @click="handelExamine(false)">取 消</el-button>
<el-button type="primary" @click="handelExamine(true)">确 定</el-button>
<el-button @click="examineVisible=false">取 消</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(5)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定5</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(7)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定7</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定1</el-button>
<el-button type="primary" @click="subAuditLeaseByCompany(3)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定3</el-button>
</div>
</el-dialog>
<!-- 驳回 -->
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px">
<el-input placeholder="请输入审核意见" type="textarea" maxlength="50" :autosize="{ minRows: 4, maxRows: 6}" v-model="queryParams.companyAuditRemarks"></el-input>
<div slot="footer" class="dialog-footer">
<el-button @click="handelRefuse(false)">取 消</el-button>
<el-button type="primary" @click="handelRefuse(true)">确 定</el-button>
<el-button @click="refuseVisible=false">取 消</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany()" v-if="queryParams.taskStatus==30" v-hasPermi="['receive:examine:fgs']">确 定</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(6)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:sgb']">确 定5</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(8)" v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:ajb']">确 定7</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-jjfgs']">确 定1</el-button>
<el-button type="primary" @click="refuseAuditLeaseByCompany(4)" v-if="queryParams.taskStatus==32" v-hasPermi="['receive:examine:nbry-sbfgs']">确 定3</el-button>
</div>
</el-dialog>
</div>
@ -256,34 +266,26 @@ export default {
this.examineVisible = true
this.queryParams.companyAuditRemarks = '同意'
},
handelExamine(type){
if(type){
this.subAuditLeaseByCompany()
}else {
this.queryParams.companyAuditRemarks = ''
}
this.examineVisible = type
},
// handelExamine(type){
// if(type){
// this.subAuditLeaseByCompany()
// }else {
// this.queryParams.companyAuditRemarks = ''
// }
// this.examineVisible = type
// },
//审核 同意
async subAuditLeaseByCompany(){
async subAuditLeaseByCompany(type){
console.log(type)
const params = JSON.parse(JSON.stringify(this.queryParams))
// if(params.taskStatus<32){
// params.taskStatus = params.taskStatus+1
// }
params.taskStatus = params.taskStatus+1
params.leaseApplyInfoList.forEach(v => {
console.log(v)
this.$set(v,'companyAuditRemark',params.companyAuditRemarks)
this.$set(v,'companyAuditBy',this.user.id)
this.$set(v,'examineStatusId',params.examineStatusId)
if(params.examineStatusId=='32'){
if(v.companyId==101){
this.$set(v,'status',1)
}
if(v.companyId==102){
this.$set(v,'status',3)
}
}
this.$set(v,'examineStatusId',Number(params.examineStatusId))
this.$set(v,'status',type)
})
params.updateTime = params.updateTimes
params.createTime = params.createTimes
@ -301,20 +303,20 @@ export default {
this.refuseVisible = true
this.queryParams.companyAuditRemarks = '驳回'
},
handelRefuse(type){
if (this.queryParams.companyAuditRemarks=='') {
this.$message.error('驳回时审核意见不能为空！');
return;
}
if(type){
this.refuseAuditLeaseByCompany()
}else {
this.queryParams.companyAuditRemarks = ''
}
this.refuseVisible = type
},
// handelRefuse(type){
// if (this.queryParams.companyAuditRemarks=='') {
// this.$message.error('驳回时审核意见不能为空！');
// return;
// }
// if(type){
// this.refuseAuditLeaseByCompany()
// }else {
// this.queryParams.companyAuditRemarks = ''
// }
// this.refuseVisible = type
// },
//审核 驳回
async refuseAuditLeaseByCompany(){
async refuseAuditLeaseByCompany(type){
const params = JSON.parse(JSON.stringify(this.queryParams))
if(params.taskStatus==30){
params.taskStatus=98;

19
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -12,7 +12,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="往来单位" prop="dictName">
<el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-select v-model="queryParams.unitId" filterable clearable @change="GetProData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in unitList"
:key="item.id"
@ -22,7 +22,7 @@
</el-select>
</el-form-item>
<el-form-item label="工程名称" prop="dictName">
<el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-select v-model="queryParams.proId" filterable clearable @change="GetUnitData" style="width: 240px" placeholder="请选择">
<el-option
v-for="item in proList"
:key="item.id"
@ -111,20 +111,27 @@
size="mini"
type="primary"
@click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:fgy']"
v-hasPermi="['receive:examine:sgb']"
v-if="Number(scope.row.examineStatusId)==31"
>审批</el-button>
>施管审批</el-button>
<el-button
size="mini"
type="primary"
@click="handleExamine(scope.row)"
v-hasPermi="['receive:examine:ajb']"
v-if="Number(scope.row.examineStatusId)==31"
>安监审批</el-button>
<el-button
size="mini"
type="primary"
@click="handleExamine(scope.row,'jjfgs')"
v-hasPermi="['receive:examine:nbry-jjfgs']"
v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
>机具审批</el-button>
<el-button
size="mini"
type="primary"
@click="handleExamine(scope.row)"
@click="handleExamine(scope.row,'sbfgs')"
v-hasPermi="['receive:examine:nbry-sbfgs']"
v-if="Number(scope.row.examineStatusId)==32 && scope.row.showExamineBtn"
>调试审批</el-button>
@ -394,7 +401,7 @@ export default {
// this.open = true;
// this.title = "添加字典类型";
},
handleExamine(row) {
handleExamine(row,type) {
this.$tab.closeOpenPage({
path:"/claimAndRefund/receive/receiveExamine",
query: {

6
sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue
View File

@ -15,7 +15,7 @@
<el-select
v-model="queryParams.status"
placeholder="领料工程"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -30,7 +30,7 @@
<el-select
v-model="queryParams.status"
placeholder="物品类型"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -193,7 +193,7 @@
<el-input v-model="form.roleKey" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope" @change="dataScopeSelectChange">
<el-select v-model="form.dataScope" filterable @change="dataScopeSelectChange">
<el-option
v-for="item in dataScopeOptions"
:key="item.value"

6
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -19,7 +19,7 @@
<el-form-item label="单位名称" prop="unitId">
<el-select
v-model="queryParams.unitId"
clearable
clearable filterable
@change="getAgreementByUnit"
style="width: 240px"
placeholder="请选择"
@ -36,7 +36,7 @@
<el-form-item label="工程名称" prop="proId">
<el-select
v-model="queryParams.proId"
clearable
clearable filterable
@change="getAgreementByProId"
style="width: 240px"
placeholder="请选择"
@ -79,7 +79,7 @@
<el-form-item label="退料状态" prop="taskStatus">
<el-select
v-model="queryParams.taskStatus"
clearable
clearable filterable
style="width: 240px"
placeholder="请选择"
>

4
sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
View File

@ -12,7 +12,7 @@
<el-form-item label="退料单位" prop="unitId">
<el-select
v-model="queryParams.unitId"
clearable
clearable filterable
@change="GetProData"
style="width: 240px"
placeholder="请选择"
@ -29,7 +29,7 @@
<el-form-item label="退料工程" prop="proId">
<el-select
v-model="queryParams.proId"
clearable
clearable filterable
@change="GetUnitData"
style="width: 240px"
placeholder="请选择"

6
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -19,7 +19,7 @@
<el-form-item label="单位名称" prop="unitId">
<el-select
v-model="queryParams.unitId"
clearable
clearable filterable
@change="getAgreementByUnit"
style="width: 240px"
placeholder="请选择"
@ -36,7 +36,7 @@
<el-form-item label="工程名称" prop="proId">
<el-select
v-model="queryParams.proId"
clearable
clearable filterable
@change="getAgreementByProId"
style="width: 240px"
placeholder="请选择"
@ -76,7 +76,7 @@
<el-form-item label="退料状态" prop="taskStatus">
<el-select
v-model="queryParams.taskStatus"
clearable
clearable filterable
style="width: 240px"
placeholder="请选择"
>

2
sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue
View File

@ -127,6 +127,8 @@
<script>
import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
import { getSltInfo } from "@/api/cost/cost";
export default {
name: "Agreement",
dicts: ['sys_normal_disable'],

8
sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
View File

@ -2,7 +2,7 @@
<div class="app-container" id="agreement">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="结算单位" prop="unitId">
<el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable>
<el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable filterable>
<el-option
v-for="item in unitList"
:key="item.unitId"
@ -12,7 +12,7 @@
</el-select>
</el-form-item>
<el-form-item label="结算工程" prop="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable>
<el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable filterable>
<el-option
v-for="item in projectList"
:key="item.projectId"
@ -22,7 +22,7 @@
</el-select>
</el-form-item>
<el-form-item label="结算状态" prop="sltStatus">
<el-select v-model="queryParams.sltStatus" placeholder="请选择结算状态" clearable>
<el-select v-model="queryParams.sltStatus" placeholder="请选择结算状态" clearable filterable>
<el-option
v-for="item in statusList"
:key="item.id"
@ -112,7 +112,7 @@ export default {
unitList: [],
// 工程数据
projectList: [],
statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
statusList:[{id:'0',name:'请选择'},{id:'1',name:'未结算'},{id:'2',name:'已结算'},{id:'3',name:'待审核'}], //集合
// 表格数据
agreementList: [],
// 弹出层标题

6
sgzb-ui/src/views/cost/csotSettlement/costList.vue
View File

@ -2,7 +2,7 @@
<div class="app-container" id="agreement">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="结算单位" prop="unitId">
<el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable>
<el-select v-model="queryParams.unitId" placeholder="请选择往来单位" clearable filterable>
<el-option
v-for="item in unitList"
:key="item.unitId"
@ -12,7 +12,7 @@
</el-select>
</el-form-item>
<el-form-item label="结算工程" prop="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable>
<el-select v-model="queryParams.projectId" placeholder="请选择工程名称" clearable filterable>
<el-option
v-for="item in projectList"
:key="item.projectId"
@ -22,7 +22,7 @@
</el-select>
</el-form-item>
<el-form-item label="结算状态" prop="projectId">
<el-select v-model="queryParams.projectId" placeholder="请选择结算状态" clearable>
<el-select v-model="queryParams.projectId" placeholder="请选择结算状态" clearable filterable>
<el-option
v-for="item in statusList"
:key="item.id"

2
sgzb-ui/src/views/index.vue
View File

@ -23,7 +23,7 @@
<el-select
v-model="queryParams.taskTypeId"
placeholder="待办事件"
clearable
clearable filterable
style="width: 240px"
>
<el-option

6
sgzb-ui/src/views/monitor/job/index.vue
View File

@ -10,7 +10,7 @@
/>
</el-form-item>
<el-form-item label="任务组名" prop="jobGroup">
<el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
<el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable filterable>
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"
@ -20,7 +20,7 @@
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable filterable>
<el-option
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
@ -162,7 +162,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="任务分组" prop="jobGroup">
<el-select v-model="form.jobGroup" placeholder="请选择任务分组">
<el-select v-model="form.jobGroup" filterable placeholder="请选择任务分组">
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"

4
sgzb-ui/src/views/monitor/job/log.vue
View File

@ -14,7 +14,7 @@
<el-select
v-model="queryParams.jobGroup"
placeholder="请选择任务组名"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -29,7 +29,7 @@
<el-select
v-model="queryParams.status"
placeholder="请选择执行状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

6
sgzb-ui/src/views/repairTest/brokenExamine/index.vue
View File

@ -21,7 +21,7 @@
<el-select
v-model="queryParams.backUnit"
placeholder="请选择单位名称"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -36,7 +36,7 @@
<el-select
v-model="queryParams.backPro"
placeholder="请选择工程名称"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -83,7 +83,7 @@
<el-select
v-model="queryParams.repairStatus"
placeholder="请选择报废状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

4
sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
View File

@ -44,7 +44,7 @@
<el-select
v-model="domain.repairer"
placeholder="请选择"
size="small"
size="small" filterable
style="width: 350px"
>
<el-option
@ -175,7 +175,7 @@
<el-select
v-model="domain.repairer"
placeholder="请选择"
size="small"
size="small" filterable
style="width: 350px"
>
<el-option

13
sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue
View File

@ -62,7 +62,7 @@
<el-select
v-model="domain.supplierId"
placeholder="请选择"
size="small"
size="small" filterable
style="width: 350px"
>
<el-option
@ -207,7 +207,7 @@
<el-select
v-model="domain.supplierId"
placeholder="请选择"
size="small"
size="small" filterable
style="width: 350px"
>
<el-option
@ -504,6 +504,10 @@ export default {
submit() {
this.$refs["dynamicValidateForm"].validate(valid => {
if (valid) {
this.dynamicValidateForm.premiumList.forEach(item=>{
item.partCost = item.partPrice;
})
// this.dynamicValidateForm.premiumList[0].partCost = this.dynamicValidateForm.premiumList[0].partPrice;
// 编码管理传递参数
console.log('this.dynamicValidateForm.premiumList1111)', this.dynamicValidateForm.premiumList);
@ -537,6 +541,11 @@ export default {
submitTwo() {
this.$refs["dynamicValidateFormTwo"].validate(valid => {
if (valid) {
// this.dynamicValidateFormTwo.premiumListTwo[0].partCost = this.dynamicValidateFormTwo.premiumListTwo[0].partPrice;
this.dynamicValidateFormTwo.premiumListTwo.forEach(item=>{
item.partCost = item.partPrice;
})
console.log('this.dynamicValidateFormTwo.premiumListTwo2222', this.dynamicValidateFormTwo.premiumListTwo);
// 数量管理传递参数
let params = {

6
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -21,7 +21,7 @@
<el-select
v-model="queryParams.backUnit"
placeholder="请选择单位名称"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -36,7 +36,7 @@
<el-select
v-model="queryParams.backPro"
placeholder="请选择工程名称"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -83,7 +83,7 @@
<el-select
v-model="queryParams.repairStatus"
placeholder="请选择维修状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

6
sgzb-ui/src/views/repairTest/testExamine/index.vue
View File

@ -21,7 +21,7 @@
<el-select
v-model="queryParams.backUnit"
placeholder="请选择单位名称"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -36,7 +36,7 @@
<el-select
v-model="queryParams.backPro"
placeholder="请选择工程名称"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -83,7 +83,7 @@
<el-select
v-model="queryParams.taskStatus"
placeholder="请选择修试审核状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

10
sgzb-ui/src/views/store/label/labelBinding.vue
View File

@ -39,7 +39,7 @@
<el-select
v-model="queryParams.modelId"
placeholder="请选择规格型号"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -54,7 +54,7 @@
<el-select
v-model="queryParams.isBind"
placeholder="请选择绑定状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option label="已绑定" value="1" />
@ -254,7 +254,7 @@
v-model="form.labelType"
placeholder="请选择标签类型"
style="width: 100%"
disabled
disabled filterable
>
<el-option
v-for="item in labelTypeList"
@ -270,7 +270,7 @@
v-model="form.labelCode"
placeholder="请选择标签编号"
style="width: 100%"
disabled
disabled filterable
>
<el-option
v-for="item in labelCodeList"
@ -318,7 +318,7 @@
<el-select
v-model="cform.labelType"
placeholder="请选择标签类型"
style="width: 100%"
style="width: 100%" filterable
>
<el-option
v-for="item in labelTypeList"

2
sgzb-ui/src/views/store/label/labelBindingHistory.vue
View File

@ -36,7 +36,7 @@
<el-select
v-model="queryParams.modelId"
placeholder="请选择规格型号"
clearable
clearable filterable
style="width: 240px"
>
<el-option

6
sgzb-ui/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
View File

@ -27,7 +27,7 @@
></el-date-picker>
</el-form-item>
<el-form-item label="采购员" prop="purchaser">
<el-select v-model="maForm.purchaser" placeholder="请选择采购员" style="width: 100%;" :disabled="isCheck||isView">
<el-select v-model="maForm.purchaser" filterable placeholder="请选择采购员" style="width: 100%;" :disabled="isCheck||isView">
<el-option label="请选择" :value="0" ></el-option>
<el-option
v-for="item in userList"
@ -59,7 +59,7 @@
<el-select
v-model="addForm.supplierId"
placeholder="配件厂家"
clearable :disabled="isCheck||isView"
clearable filterable :disabled="isCheck||isView"
style="width: 240px"
@change="changeSupplier"
>
@ -147,7 +147,7 @@
<el-table-column label="厂家" align="center" prop="supplierId" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.supplierId" placeholder="厂家" clearable style="width: 180px" :disabled="isCheck||isView" >
<el-select v-model="scope.row.supplierId" filterable placeholder="厂家" clearable style="width: 180px" :disabled="isCheck||isView" >
<el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier" :value="item.supplierId" />
</el-select>
</template>

6
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
View File

@ -34,7 +34,7 @@
<el-select
v-model="queryParams.supplierId"
placeholder="机具厂家"
clearable
clearable filterable
style="width: 240px"
@change="changeSupplier"
>
@ -75,7 +75,7 @@
></el-date-picker>
</el-form-item>
<el-form-item label="采购员" prop="purchaser">
<el-select v-model="maForm.purchaser" placeholder="请选择采购员" style="width: 100%;">
<el-select v-model="maForm.purchaser" filterable placeholder="请选择采购员" style="width: 100%;">
<el-option label="请选择" :value="0" ></el-option>
<el-option
v-for="item in userList"
@ -162,7 +162,7 @@
</el-table-column>
<el-table-column label="机具厂家" prop="supplierId" width="200" >
<template slot-scope="scope">
<el-select v-model="scope.row.supplierId" placeholder="机具厂家" clearable style="width: 180px">
<el-select v-model="scope.row.supplierId" placeholder="机具厂家" filterable clearable style="width: 180px">
<el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier" :value="item.supplierId" />
</el-select>

117
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -10,46 +10,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="提交入库时间">
<el-date-picker
v-model="queryParams.submitStorageTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="date"
range-separator="-"
placeholder="提交入库时间"
></el-date-picker>
</el-form-item>
<el-form-item label="设备类型" prop="typeId">
<el-select
v-model="queryParams.typeId"
placeholder="请选择设备类型"
clearable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="规格型号" prop="modelId">
<el-select
v-model="queryParams.modelId"
placeholder="请选择规格型号"
clearable
style="width: 240px"
>
<el-option
v-for="model in modelList"
:key="model.typeId"
:label="model.typeName"
:value="model.typeId"
/>
</el-select>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@ -58,38 +18,6 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
:disabled="single"
v-hasPermi="['system:dict:add']"
>入库审核</el-button>
</el-col> -->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:dict:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@ -106,8 +34,6 @@
<el-table v-loading="loading" :data="tableList" >
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="序号" align="center" type="index" width="55px"/>
<el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" />
<el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" />
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
@ -177,48 +103,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="状态" prop="status">
<el-select
v-model="query.status"
placeholder="审核状态"
clearable
style="width: 240px"
>
<el-option label="未审核" value="0" />
<el-option label="已入库" value="1" />
<el-option label="驳回" value="2" />
</el-select>
</el-form-item> -->
<!-- <el-form-item label="设备类型" prop="typeId">
<el-select
v-model="query.typeId"
placeholder="请选择设备类型"
clearable
style="width: 240px"
>
<el-option
v-for="typeItem in typeList"
:key="typeItem.typeId"
:label="typeItem.typeName"
:value="typeItem.typeId"
/>
</el-select>
</el-form-item>
<el-form-item label="规格型号" prop="modelId">
<el-select
v-model="query.modelId"
placeholder="请选择规格型号"
clearable
style="width: 240px"
>
<el-option
v-for="model in modelList"
:key="model.typeId"
:label="model.typeName"
:value="model.typeId"
/>
</el-select>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->

6
sgzb-ui/src/views/store/newBuy/newTools/newToolsArrival.vue
View File

@ -49,7 +49,7 @@
<el-select
v-model="queryParams.status"
placeholder="机具厂家"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -75,7 +75,7 @@
<el-select
v-model="queryParams.status"
placeholder="工器具类型"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -252,7 +252,7 @@
<el-input v-model="form.roleKey" :disabled="true" />
</el-form-item>
<el-form-item label="权限范围">
<el-select v-model="form.dataScope" @change="dataScopeSelectChange">
<el-select v-model="form.dataScope" filterable @change="dataScopeSelectChange">
<el-option
v-for="item in dataScopeOptions"
:key="item.value"

64
sgzb-ui/src/views/store/newBuy/newTools/newToolsWarehousing.vue
View File

@ -10,48 +10,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="提交入库时间">-->
<!-- <el-date-picker-->
<!-- v-model="dateRange"-->
<!-- style="width: 240px"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- type="daterange"-->
<!-- range-separator="-"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- ></el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="规格型号" prop="status">-->
<!-- <el-select-->
<!-- v-model="queryParams.status"-->
<!-- placeholder="请选择规格型号"-->
<!-- clearable-->
<!-- style="width: 240px"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.sys_normal_disable"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="设备类型" prop="status">-->
<!-- <el-select-->
<!-- v-model="queryParams.status"-->
<!-- placeholder="请选择设备类型"-->
<!-- clearable-->
<!-- style="width: 240px"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.sys_normal_disable"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -70,28 +28,6 @@
v-hasPermi="['system:dict:add']"
>入库审核</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['system:dict:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['system:dict:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"

4
sgzb-ui/src/views/store/shelves/shelvesConfig.vue
View File

@ -219,7 +219,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-select v-model="form.postIds" filterable multiple placeholder="请选择岗位">
<el-option
v-for="item in postOptions"
:key="item.postId"
@ -232,7 +232,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-select v-model="form.roleIds" filterable multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.roleId"

4
sgzb-ui/src/views/store/tools/keeper.vue
View File

@ -214,7 +214,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-select v-model="form.postIds" filterable multiple placeholder="请选择岗位">
<el-option
v-for="item in postOptions"
:key="item.postId"
@ -227,7 +227,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-select v-model="form.roleIds" filterable multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.roleId"

8
sgzb-ui/src/views/store/tools/toolsType.vue
View File

@ -179,7 +179,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="维修员" prop="repairUserId">
<el-select v-model="form.repairUserId" placeholder="请选择维修员">
<el-select v-model="form.repairUserId" filterable placeholder="请选择维修员">
<el-option
v-for="keeper in repairUserList"
:key="keeper.userId"
@ -198,7 +198,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="管理模式" prop="manageType">
<el-select v-model="form.manageType" placeholder="请选择管理模式">
<el-select v-model="form.manageType" filterable placeholder="请选择管理模式">
<el-option value="0" label="编码管理">编码管理</el-option>
<el-option value="1" label="数量管理">数量管理</el-option>
</el-select>
@ -237,7 +237,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="资产属性" prop="propId">
<el-select v-model="form.propId" placeholder="请选择资产属性">
<el-select v-model="form.propId" filterable placeholder="请选择资产属性">
<el-option
v-for="keeper in propList"
:key="keeper.propId"
@ -250,7 +250,7 @@
<el-col :span="12">
<el-form-item label="库管员" prop="keeperUserId">
<el-select v-model="form.keeperUserId" placeholder="请选择库管员" filterable>
<el-select v-model="form.keeperUserId" filterable placeholder="请选择库管员" filterable>
<el-option
v-for="keeper in keeperList"
:key="keeper.userId"

2
sgzb-ui/src/views/store/warehousing/accessoryWarehousing.vue
View File

@ -176,7 +176,7 @@
<el-select
v-model="query.status"
placeholder="审核状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option label="未审核" value="0" />

6
sgzb-ui/src/views/store/warehousing/devicesWarehousing.vue
View File

@ -167,7 +167,7 @@
<el-select
v-model="queryParams.status"
placeholder="请选择规格型号"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -182,7 +182,7 @@
<el-select
v-model="queryParams.status"
placeholder="请选择规格型号"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -197,7 +197,7 @@
<el-select
v-model="queryParams.status"
placeholder="请选择设备类型"
clearable
clearable filterable
style="width: 240px"
>
<el-option

2
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -174,7 +174,7 @@
<el-select
v-model="query.status"
placeholder="审核状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option label="未审核" value="0" />

2
sgzb-ui/src/views/system/config/index.vue
View File

@ -20,7 +20,7 @@
/>
</el-form-item>
<el-form-item label="系统内置" prop="configType">
<el-select v-model="queryParams.configType" placeholder="系统内置" clearable>
<el-select v-model="queryParams.configType" filterable placeholder="系统内置" clearable>
<el-option
v-for="dict in dict.type.sys_yes_no"
:key="dict.value"

2
sgzb-ui/src/views/system/dept/index.vue
View File

@ -10,7 +10,7 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="部门状态" clearable>
<el-select v-model="queryParams.status" filterable placeholder="部门状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"

2
sgzb-ui/src/views/system/dict/index.vue
View File

@ -23,7 +23,7 @@
<el-select
v-model="queryParams.status"
placeholder="字典状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

2
sgzb-ui/src/views/system/logininfor/index.vue
View File

@ -23,7 +23,7 @@
<el-select
v-model="queryParams.status"
placeholder="登录状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

4
sgzb-ui/src/views/system/notice/index.vue
View File

@ -18,7 +18,7 @@
/>
</el-form-item>
<el-form-item label="类型" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
<el-select v-model="queryParams.noticeType" filterable placeholder="公告类型" clearable>
<el-option
v-for="dict in dict.type.sys_notice_type"
:key="dict.value"
@ -133,7 +133,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="公告类型" prop="noticeType">
<el-select v-model="form.noticeType" placeholder="请选择公告类型">
<el-select v-model="form.noticeType" filterable placeholder="请选择公告类型">
<el-option
v-for="dict in dict.type.sys_notice_type"
:key="dict.value"

4
sgzb-ui/src/views/system/operlog/index.vue
View File

@ -32,7 +32,7 @@
<el-select
v-model="queryParams.businessType"
placeholder="操作类型"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -47,7 +47,7 @@
<el-select
v-model="queryParams.status"
placeholder="操作状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option

2
sgzb-ui/src/views/system/post/index.vue
View File

@ -18,7 +18,7 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
<el-select v-model="queryParams.status" filterable placeholder="岗位状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"

8
sgzb-ui/src/views/system/user/index.vue
View File

@ -52,7 +52,7 @@
<el-select
v-model="queryParams.status"
placeholder="用户状态"
clearable
clearable filterable
style="width: 240px"
>
<el-option
@ -244,7 +244,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="用户性别">
<el-select v-model="form.sex" placeholder="请选择性别">
<el-select v-model="form.sex" filterable placeholder="请选择性别">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
@ -269,7 +269,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="岗位">
<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
<el-select v-model="form.postIds" filterable multiple placeholder="请选择岗位">
<el-option
v-for="item in postOptions"
:key="item.postId"
@ -282,7 +282,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
<el-select v-model="form.roleIds" filterable multiple placeholder="请选择角色">
<el-option
v-for="item in roleOptions"
:key="item.roleId"