FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2021-07-19 15:27:40 +08:00
parent 4ae7335a24 b925bc6f3e
commit dc0935ff8e
28 changed files with 733 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+75 -2
View File
@@ -577,6 +577,51 @@
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="类型" class="search-item search-item-last">
<el-select
@change="typeChange"
v-model="standardSearch.standType"
placeholder="请选择"
filterable
>
<el-option
v-for="item in standardTypeOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准号/标准名称" class="search-item search-item-last">
<el-input
v-model="standardSearch.standNumber"
placeholder="请输入标准号或标准名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="addList">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="standardData"
tooltip-effect="dark"
@@ -729,13 +774,20 @@ export default {
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
searching: false,
// 查询相关参数
// 查询选择清单相关参数
sarSarAccessEOSearch: {
countryArea: "",
detailedListName: "",
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
//查询添加标准相关数据
standardSearch: {
standType: '',
standNumber:'',
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent
},
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
@@ -823,6 +875,18 @@ export default {
},
choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据
standardTypeOptions: [
{
value: 'INLAND',
label: '国内标准法规',
item:'INLAND',
},
{
value: 'FOREIGN',
label: '海外标准法规',
item:'FOREIGN',
},
],
user1: "",
user2: "",
user3: "",
@@ -878,7 +942,6 @@ export default {
// //判断当前选中的是哪个清单
selectionList(type) {
type = this.listType
console.log(type);
if (type === "project") {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
@@ -925,11 +988,18 @@ export default {
countryArea: "",
detailedListName: ""
};
this.standardSearch ={
standType:'',
standNumber: '',
}
this.selectionList();
this.addList()
},
//点击添加事件
addList() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
page: this.pageNo,
pageSize: this.pageSizeNo
}, {
@@ -1126,6 +1196,9 @@ export default {
closeDrawer() {
this.ListModel = false;
},
typeChange(type) {
this.standardSearch.standType = type
},
//添加标准取消事件
cancelStand() {
this.standModel = false;
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
-42
View File
@@ -135,46 +135,6 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active == '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
<el-card>
<h4>标准/政策法规工程师</h4>
<div style="margin-top: 10px;">
<el-input v-model="user1" placeholder="请输入"></el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
<el-card>
<h4>责任人</h4>
<div style="margin-top: 10px;">
<el-input v-model="user2" placeholder="请输入">
</el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
<el-card>
<h4>标准/政策法规工程师</h4>
<div style="margin-top: 10px;">
<el-input v-model="user3" placeholder="请输入"></el-input>
</div>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
<el-card>
<h4>业务经理</h4>
<div style="margin-top: 10px;">
<el-input v-model="user5" placeholder="请输入"></el-input>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
@@ -197,14 +157,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
-2
View File
@@ -161,14 +161,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
-2
View File
@@ -158,14 +158,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+21 -8
View File
@@ -490,7 +490,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -532,11 +532,15 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input
v-model="form.qcdw"
placeholder="请选择起草单位"
clearable
></el-input>
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -552,7 +556,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -743,7 +747,7 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择会签责任人" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="选择会签责任人" v-if="form.signFlag === '1'" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="zrUserName" style="margin-bottom: 0">
<h4>会签责任人</h4>
@@ -1331,6 +1335,8 @@
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
@@ -1859,6 +1865,9 @@
}else if(this.fileType === 'ca'){
this.form.ca = response.data.id;
this.form.caName = response.data.name;
}else if(this.fileType === 'zbjbd'){
this.form.zbjbd = response.data.id;
this.form.zbjbdName = response.data.name;
}
this.$message({
showClose: true,
@@ -1943,6 +1952,7 @@
if (valid) {
this.$refs['userForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
@@ -1963,6 +1973,7 @@
}, res => {
if (res.success) {
this.$message.success(res.message)
this.isSubmit = false
}
})
}
@@ -2006,6 +2017,8 @@
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 我司署名人
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+26 -10
View File
@@ -315,7 +315,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -361,12 +361,15 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.qcdw"
placeholder="请选择起草单位"
clearable
></el-input>
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -382,7 +385,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -437,8 +440,13 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
<el-option label="署名人1" value="1"></el-option>
<el-option label="署名人2" value="2"></el-option>
<el-option
v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -811,6 +819,8 @@
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
@@ -943,6 +953,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
@@ -957,6 +968,7 @@
if (res.success) {
if(this.approvalOpinion === '1'){
this.$message.warning("驳回成功")
this.isSubmit = false
}else{
this.processCreateStand(json)
}
@@ -980,8 +992,10 @@
name: 'ProcessCenter'
})
}, 100)
this.isSubmit = false
} else {
this.$message.warning(res.message)
this.isSubmit = false
}
})
},
@@ -1002,6 +1016,8 @@
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+24 -11
View File
@@ -308,7 +308,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -354,12 +354,15 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.qcdw"
placeholder="请选择起草单位"
clearable
></el-input>
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
@@ -375,7 +378,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -430,8 +433,13 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
<el-option label="署名人1" value="1"></el-option>
<el-option label="署名人2" value="2"></el-option>
<el-option
v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -803,6 +811,8 @@ export default {
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
@@ -935,10 +945,10 @@ export default {
},
handleSave() {},
handleSubmit() {
this.isSubmit = false
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -951,6 +961,7 @@ export default {
}else {
this.$message.success(res.message)
}
this.isSubmit = false
})
},
@@ -993,6 +1004,8 @@ export default {
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+24 -9
View File
@@ -477,7 +477,7 @@
</el-select>
</el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
@@ -519,11 +519,15 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-input
v-model="form.qcdw"
placeholder="请选择起草单位"
clearable
></el-input>
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
@@ -539,7 +543,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple>
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
@@ -594,8 +598,13 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option label="署名人1" value="1"></el-option>
<el-option label="署名人2" value="2"></el-option>
<el-option
v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -1173,6 +1182,8 @@ export default {
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
qcdwOptions: [], // 起草单位
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
@@ -1542,6 +1553,7 @@ export default {
handleSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
@@ -1557,6 +1569,7 @@ export default {
}else {
this.$message.success(res.message)
}
this.isSubmit = false
})
}
})
@@ -1600,6 +1613,8 @@ export default {
this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
this.cysdOptions = res.data.WSCYSD // 我司参与深度
this.wssmrOptions = res.data.WSSMR // 我司署名人
this.qcdwOptions = res.data.QCDW // 起草单位
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+3 -3
View File
@@ -340,7 +340,7 @@ export default {
// 点击批量删除事件
deleteList() {
if (this.selectList.length < 1) {
if (this.selectedList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
@@ -350,7 +350,7 @@ export default {
type: "warning"
}).then(() => {
let exits = [];
this.selectList.map(item => {
this.selectedList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
@@ -360,7 +360,7 @@ export default {
}
exits.push(item);
});
this.selectList = [];
this.selectedList = [];
}).catch(() => {
});
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+14 -2
View File
@@ -92,8 +92,10 @@
<el-table-column prop="planCloseTime" label="整改完成时间"/>
<el-table-column prop="responsibleUnit" label="责任部门"/>
<el-table-column prop="dutyEngineer" label="负责人"/>
<el-table-column label="佐证材料">
<div class="div-text">{{ 11 || '暂无数据' }}</div>
<el-table-column label="佐证材料" show-overflow-tooltip>
<template slot-scope="scope">
<el-button type="text" @click="download" >{{scope.row.fileText}}</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
@@ -263,6 +265,16 @@ export default {
}
this.getData()
},
download(row) {
// window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
var name = row.fileText;
var url = row.fileTextPath;
const a = document.createElement('a')
a.setAttribute('download', name)
a.setAttribute('target', '_blank')
a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
a.click()
},
// 分页事件
pageChange (page) {
this.pageNo = page
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+82 -7
View File
@@ -65,7 +65,7 @@
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
<el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
<el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
</div>
</div>
<el-table
@@ -163,6 +163,41 @@
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<!-- <div class="left">-->
<!-- <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">-->
<!-- <el-form-item label="标准号" class="search-item search-item-last">-->
<!-- <el-input-->
<!-- v-model="sarSarAccessEOSearch.standName"-->
<!-- placeholder="请输入标准号"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="标准名称" class="search-item search-item-last">-->
<!-- <el-input-->
<!-- v-model="sarSarAccessEOSearch.standNumber"-->
<!-- placeholder="请输入标准名称"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="search-item btn-box">-->
<!-- <el-button-->
<!-- :loading="searching"-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="small"-->
<!-- v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"-->
<!-- @click="getStandData">-->
<!-- 查询-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<!-- <el-form-item class="search-item btn-box">-->
<!-- <el-button-->
<!-- class="common-button-default"-->
<!-- size="small"-->
<!-- v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"-->
<!-- @click="clearSearch">清空-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<el-table
:data="sarAccessListDatas"
tooltip-effect="dark"
@@ -344,6 +379,14 @@ export default {
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
sarSarAccessEOSearch: {
standName:'',
standNumber:'',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
nodeList: [],
defaultProps: {
children: "children",
@@ -386,6 +429,7 @@ export default {
},
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
selectList: [], //选择标准的选择框
isSubmit: false,
saveLoading: false,
selectedList: [], //拆分标准的选择框
@@ -497,6 +541,32 @@ export default {
addList() {
this.standModel = true;
},
// 点击批量删除事件
deleteList() {
console.log(this.selectList.length);
if(this.selectList.length < 1){
this.$message.warning('请选择一条数据进行删除')
}else {
this.$confirm('您确认删除这些数据？', '提示', {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}). then(() => {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item
})
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.selectList = [];
}).catch(() => {
})
}
},
//取消添加事件
cancelStand() {
this.standModel = false;
@@ -590,6 +660,7 @@ export default {
}, {
_this: this
}, res => {
console.log(res.data);
this.listForm.breakdownList = res.data;
this.ListModel = false;
}, e => {
@@ -609,7 +680,7 @@ export default {
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
this.selectList.push(data[i].productLine);
}
},
//添加产品线select的改变
@@ -655,7 +726,7 @@ export default {
}, {
_this: this
}, res => {
this.productData = res.data;
this.productData = res.data.records;
this.totalNo = res.data.total;
}, e => {
@@ -663,20 +734,24 @@ export default {
},
//获取标准数据
getStandData() {
console.log(this.page);
console.log(this.pageSize);
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
page: this.page,
pageSize: this.pageSize,
}, {
_this: this
}, res => {
console.log(res.data);
this.sarAccessListDatas = res.data.list;
this.total = res.data.count;
}, e => {
});
}
},
clearSearch() {
this.sarSarAccessEOSearch = {
standName: "",
standNumber: ""
};
this.getStandData();
},
},
computed: {},
mounted() {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
-2
View File
@@ -132,14 +132,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
-2
View File
@@ -177,14 +177,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
-2
View File
@@ -286,14 +286,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
-2
View File
@@ -243,14 +243,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
-2
View File
@@ -243,14 +243,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-2
View File
@@ -243,14 +243,12 @@
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column