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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-29 17:01:29 +08:00
parent 2bbf4875ff 9cff5a5070
commit e7e80b9a06
19 changed files with 709 additions and 237 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/newProcess/index.vue
+10 -9
View File
@@ -4,7 +4,7 @@
<div v-if="bzfggllc">
<el-divider content-position="left"><h2>标准法规管理流程</h2></el-divider>
<div class="process-box">
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'9adff72ab464793564c5d1de20b45620'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('1')">
<div class="card-top">
@@ -22,7 +22,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'f4eeb9ed48eac5686a456a5582508d9c'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('2')">
<div class="card-top">
@@ -40,7 +40,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'fc25b770ad3752cdec52f3bd7b35a6a1'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('3')">
<div class="card-top">
@@ -58,7 +58,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'2d0f99ba961c551b1d8cad8ad5223731'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('6')">
<div class="card-top">
@@ -76,7 +76,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'90c7bae6308595f053c6f6f90167e493'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('7')">
<div class="card-top">
@@ -94,7 +94,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'a151f5e2ee44f8df81e201b8696fca31'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('8')">
<div class="card-top">
@@ -112,7 +112,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'2564bd61852551b99e0fe3d49a89b288'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('9')">
<div class="card-top">
@@ -130,7 +130,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-col :span="size ? 6 : 8" v-btn-permission="'7751d25f72d0a6515e4110ae41837db8'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('10')">
<div class="card-top">
@@ -281,7 +281,8 @@ export default {
* @returns {boolean}
*/
bzfggllc() {
return true
const idArray = ['2564bd61852551b99e0fe3d49a89b288', '2d0f99ba961c551b1d8cad8ad5223731', '7751d25f72d0a6515e4110ae41837db8', '90c7bae6308595f053c6f6f90167e493', '9adff72ab464793564c5d1de20b45620', 'a151f5e2ee44f8df81e201b8696fca31', 'f4eeb9ed48eac5686a456a5582508d9c', 'fc25b770ad3752cdec52f3bd7b35a6a1']
return this.checkPermission(idArray)
},
/**
* 政策管理流程
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
-1
View File
@@ -216,7 +216,6 @@ export default {
dealWith (row) { // 办理
this.setHandleInfo(JSON.stringify(row))
const prcType = row.prcType
console.log(prcType);
switch(prcType) {
case '1':
if (row.taskInfo === '标准法规业务经理审批') {