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-30 11:30:21 +08:00
parent 21e4742aa7 41eac6574e
commit bb0069f373
20 changed files with 369 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+24 -2
View File
@@ -638,8 +638,13 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" 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">
@@ -711,6 +716,20 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.yybj"
@@ -1332,6 +1351,7 @@
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
bfbdtbzh: '', // 部分代替标准号
byybj: '', // 被引用标准
glwj: '', // 关联文件
xglc: '', // 相关流程
@@ -1875,6 +1895,8 @@
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'bfbdtbzh'){
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
}else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+10 -1
View File
@@ -473,7 +473,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.yybj"
@@ -749,6 +757,7 @@
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
bfbdtbzh: '', // 增补件
kwj: '', // 勘误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+8
View File
@@ -466,6 +466,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+18
View File
@@ -695,6 +695,21 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{'手动查找'}}</el-button>
</el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.yybj"
@@ -1173,6 +1188,7 @@ export default {
kwj: '', // 勘误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
bfbdtbzh: '', // 发布稿
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
@@ -1411,6 +1427,8 @@ export default {
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'bfbdtbzh'){
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
} else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
}
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+49 -27
View File
@@ -93,22 +93,23 @@
<el-table-column
prop="distributePerson"
label="分发责任人">
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.distributePerson"-->
<!-- placeholder="请选择分发负责人"-->
<!-- readonly-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- v-if="!scope.row.distributePerson"></el-input>-->
<!-- </template>-->
<template slot-scope="scope,text" v-if="showColumn">
<div>
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson
}}
</div>
</div>
<template slot-scope="scope">
<el-input
v-model="scope.row.distributePerson"
placeholder="请选择分发负责人"
readonly
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
v-if="!scope.row.distributePerson"></el-input>
<span v-else>{{ scope.row.distributePerson }}</span>
</template>
<!-- <template slot-scope="scope,text" v-if="showColumn">-->
<!-- <div>-->
<!-- <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
<!-- {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
<!-- }}-->
<!-- </div>-->
<!-- </div>-->
<!-- </template>-->
</el-table-column>
</el-table>
</div>
@@ -445,6 +446,7 @@ export default {
ListModel: false, //选择拆分标准抽屉状态
treeData: [], // 人员数据
selectList: [], //选择标准的选择框
currentIndex: -1, // 当前操作行索引
isSubmit: false,
saveLoading: false,
selectedList: [], //拆分标准的选择框
@@ -520,19 +522,29 @@ export default {
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
this.dataList.distributePersonId = data[0].id;
this.dataList.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
console.log(this.dataList)
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true;
});
// 如果有勾选,则视为批量选择责任人
if (this.selectList.length) {
this.dataList.forEach((item, index) => {
if (this.selectList.includes(item.productLine)) {
const newItem = JSON.parse(JSON.stringify(item))
newItem.distributePersonId = data[0].id
newItem.distributePerson = data[0].name
this.$set(this.dataList, index, newItem)
}
})
} else {
const newItem = JSON.parse(JSON.stringify(this.dataList[this.currentIndex]))
newItem.distributePersonId = data[0].id
newItem.distributePerson = data[0].name
this.$set(this.dataList, this.currentIndex, newItem)
this.listForm.dataList[this.currentIndex].distributePersonId = data[0].id;
this.listForm.dataList[this.currentIndex].distributePerson = data[0].name;
this.currentIndex = -1
}
}
this.modalshowflag = false;
},
cancleUserInfo() {
cancelUserInfo() {
this.modalshowflag = false;
},
//tab发生变化
@@ -561,7 +573,9 @@ export default {
//点击添加事件
addList() {
this.standModel = true;
this.$refs.projectTable.clearSelection();
this.$nextTick(() => {
this.$refs.projectTable.clearSelection();
})
},
// 点击批量删除事件
deleteList() {
@@ -743,7 +757,7 @@ export default {
},
choiceZRR(scope, type, title, id) {
if (scope != null) {
this.dsadadadsada = scope.$index;
this.currentIndex = scope.$index;
}
this.nodeList = [];
this.nodeList.push(id);
@@ -810,6 +824,14 @@ export default {
}
},
computed: {},
watch: {
dataList: {
deep: true,
handler (val) {
console.log('dataList update', val)
}
}
},
mounted() {
this.getTree();
this.getProductData();
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
-2
View File
@@ -324,8 +324,6 @@ export default {
this.listForm.breakdownList = item.breakdownList
})
},
//驳回事件
beforeBack () {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){