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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!69
This commit is contained in:
高嵩
2023-04-28 17:31:06 +08:00
parent 4884c9752e 6b5d91ffe8
commit a1779a631f
9 changed files with 170 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/verify/index.js
+2 -2
View File
@@ -35,9 +35,9 @@ export default {
validateStandardItem2 (rule, value, callback) {
// return callback()
let testval = /^[A-Za-z0-9/]+$/
let testval1 = /[.-;；]+/
let testval1 = /[.-;；()（）]+/
if (value && !value.match(testval) && !value.match(testval1)) {
return callback(new Error('只能为（字母、数字、.、-、;、；）'))
return callback(new Error('只能为（字母数字()（）.-;；）'))
} else {
callback()
}
src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+18 -10
View File
@@ -434,14 +434,14 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="verifySort() !== '' && !verifySort()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
<el-form-item v-if="form.reviewResults === '1' && verifySort3()" label="初稿完成日期" prop="draftTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.draftTime"
:editable="false"
placeholder="请选择初稿完成日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<el-form-item v-if="verifySort() !== '' && verifySort() && opinionsShow2" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
<el-form-item v-if="form.reviewResults === '1' && !verifySort3()" label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.expirationDate"
:editable="false"
placeholder="请选择截止日期"
@@ -461,23 +461,23 @@
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item v-if="form.reviewResults === '1' && opinionsShow2" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-input v-show="!opinionsShow2" v-model="form.QCRBUSS" :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
<el-input v-show="opinionsShow2"
<el-form-item v-if="form.reviewResults === '1'" label="主起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<!--<el-input v-show="!opinionsShow2" v-model="form.QCRBUSS" :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>-->
<el-input
v-model="form.QCRBUSS"
placeholder="选择主起草人"
readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择主起草人', form.QCRBUSS)">
</el-input>
</el-form-item>
<el-form-item v-if="verifySort() !== '' && !verifySort()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
<el-form-item v-if="form.reviewResults === '1' && verifySort3()" label="计划标准发布日期" prop="releaseTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.releaseTime"
:editable="false"
placeholder="请选择计划标准发布日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<el-form-item v-if="(form.reviewResults === '1' || form.reviewResults === '2' || form.reviewResults === '3') && !opinionsShow2" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
<el-form-item v-if="(form.reviewResults === '1' || form.reviewResults === '2' || form.reviewResults === '3') && !opinionsShow2 && verifySort3()" label="复审单" prop="FSDName" class="add-form-item form-item-disabled">
<div v-if="FSDList.length > 0" v-for="(item,index) in FSDList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreviewNew(item,'preview','fs')" :title="item.name">{{ item.name | ellipsis2 }}</span>
<!-- <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">-->
@@ -490,7 +490,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item v-show="(form.reviewResults === '2' || form.reviewResults === '3') && opinionsShow2" label="理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-form-item v-show="(form.reviewResults === '2' || form.reviewResults === '3')" label="理由" prop="reviewResultsContent" style="margin-left: 0;margin-bottom:0;" class="add-form-item form-item-disabled">
<el-input
type="textarea"
:rows="3"
@@ -738,16 +738,24 @@ export default {
showDrawerClose () {
this.showDrawer = false
},
verifySort3(){
// 技术标准返回true 产品标准返回false
if(this.form.standSort){
return this.form.standSort.indexOf("Q/QCBFC") === -1 && this.form.standSort.indexOf("Q/FT X") === -1
}
return false
},
verifySort2(){
if(this.showForm.reviewResults && this.showForm.reviewResults === '1'){
return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
// 修订 && 产品标准true
return !!(this.form.standSort && (this.form.standSort.indexOf("Q/QCBFC") !== -1 || this.form.standSort.indexOf("Q/FT X") !== -1 ));
}else {
return ""
}
},
verifySort(){
if(this.form.reviewResults && this.form.reviewResults === '1'){
return !!(this.form.standSort && this.form.standSort.indexOf("Q/QCBFC") !== -1);
return !!(this.form.standSort && (this.form.standSort.indexOf("Q/QCBFC") !== -1 || this.form.standSort.indexOf("Q/FT X") !== -1 ));
}else {
return ""
}
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
+4 -4
View File
@@ -591,12 +591,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser5Name" style="margin-bottom: 0">
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT</h4>
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1413,7 +1413,7 @@ export default {
{ required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' },
],
bussUser5Name: [
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' },
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' },
],
bussUser7Name: [
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbfs/step7.vue
+4 -4
View File
@@ -596,12 +596,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName" placeholder="选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName" placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师" readonly="readonly" @click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1578,7 +1578,7 @@ export default {
{ required: true, message: '选择总院各中心兼职标准化员/各事业部标准化员', trigger: 'change' },
],
hqUserName: [
{ required: true, message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' },
{ required: true, message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', trigger: 'change' },
],
fggcsUserName: [
{ required: true, message: '选择标准法规工程师', trigger: 'change' },
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+4 -4
View File
@@ -591,12 +591,12 @@
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-timeline-item timestamp="征求意见（各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT）" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="bussUser5Name" style="margin-bottom: 0">
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT</h4>
<h4>各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.bussUser5Name" readonly="readonly" placeholder="选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT" @click.native="choiceZRRList('bussUser5', '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT', roleForm.bussUser5)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1414,7 +1414,7 @@
{ required: true, message: '选择标准法规工程师/事业部标准化员', trigger: 'blur' },
],
bussUser5Name: [
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-尧燕、图雅诺-耿红静、欧辉-赵淑珍、普罗科-符清萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' },
{ required: true, message: '选择各事业部标准化员（时代-苏杰贵、奥铃-蒋敏、欧航欧马可-吴娟、皮卡-王晶9、图雅诺-耿红静、欧辉-张蕾61、普罗科-符青萍、雷萨-杨卫利），项目组各PMT/PAT', trigger: 'blur' },
],
bussUser7Name: [
{ required: true, message: '选择标准法规工程师', trigger: 'blur' },
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+5 -5
View File
@@ -670,16 +670,16 @@
</el-card>
</el-timeline-item>
<el-timeline-item
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName"
placeholder="选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
readonly="readonly"
@click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
@click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1705,7 +1705,7 @@
hqUserName: [
{
required: true,
message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师',
message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师',
trigger: 'blur'
},
],
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+122 -16
View File
@@ -666,16 +666,16 @@
</el-card>
</el-timeline-item>
<el-timeline-item
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
timestamp="征求意见（张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师）"
prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="hqUserName" style="margin-bottom: 0">
<h4>张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<h4>张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.hqUserName"
placeholder="选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
placeholder="选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师"
readonly="readonly"
@click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
@click.native="choiceZRRList('hqUserId', '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师', roleForm.hqUserId)"></el-input>
</div>
</el-form-item>
</el-card>
@@ -1685,7 +1685,7 @@
hqUserName: [
{
required: true,
message: '选择张建芳、蒋敏、吴娟、李中立、尧燕、耿红静、赵淑珍、符清萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师',
message: '选择张建芳、蒋敏、吴娟、李中立、王晶9、耿红静、张蕾61、符青萍、杨卫利、技术委员会相关成员、总院相关中心总工及四五级工程师',
trigger: 'blur'
},
],
@@ -2250,7 +2250,6 @@
this.form.SYCXCLASS = res.data.attrInfoMap.SYCXCLASS ? res.data.attrInfoMap.SYCXCLASS.split(',') : []
this.form.CYCVPPSBMBUSS = res.data.attrInfoMap.CYCVPPSBMBUSS
this.form.KCVPPSBMBUSS = res.data.attrInfoMap.KCVPPSBMBUSS
this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS, res.data.attrInfoMap.LSBBBUSSName);
this.form.SYCPXCLASS = res.data.attrInfoMap.SYCPXCLASS ? res.data.attrInfoMap.SYCPXCLASS.split(',') : []
this.form.CYCD = res.data.attrInfoMap.CYCD ? res.data.attrInfoMap.CYCD.split(',') : []
this.form.TXLBBUSS = res.data.attrInfoMap.TXLBBUSS
@@ -2261,17 +2260,58 @@
this.form.CYBZ = res.data.attrInfoMap.CYBZ
this.form.YYBZ = res.data.attrInfoMap.YYBZ
this.form.XCSJBUSS = res.data.attrInfoMap.XCSJBUSS
let FBGBUSSLast = res.data.attrInfoMap.FBGBUSS.substring(0, res.data.attrInfoMap.FBGBUSS.lastIndexOf(','))
if (this.form.standName) {
this.fileName = this.form.standName
}
let FBGBUSS = this.fileId + ',' + FBGBUSSLast
let FBGBUSSName = this.fileName + ',' + res.data.attrInfoMap.FBGBUSSName
this.BZSMBUSSFileList = this.assemble(res.data.attrInfoMap.BZSMBUSS.substring(0, res.data.attrInfoMap.BZSMBUSS.lastIndexOf(',')), res.data.attrInfoMap.BZSMBUSSName);
this.FBGBUSSFileList = this.assemble(FBGBUSS, FBGBUSSName);
this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')), res.data.attrInfoMap.LSBBBUSSName);
this.QTWJBUSSFileList = this.assemble(res.data.attrInfoMap.QTWJBUSS.substring(0, res.data.attrInfoMap.QTWJBUSS.lastIndexOf(',')), res.data.attrInfoMap.QTWJBUSSName);
this.GLWJBUSSFileList = this.assemble(res.data.attrInfoMap.GLWJBUSS.substring(0, res.data.attrInfoMap.GLWJBUSS.lastIndexOf(',')), res.data.attrInfoMap.GLWJBUSSName);
let FBGBUSS = this.fileId
let FBGBUSSName = this.fileName
try {
this.FBGBUSSFileList = []
this.BZSMBUSSFileList = []
this.QTWJBUSSFileList = []
this.GLWJBUSSFileList = []
if(res.data.attrInfoMap.BZSMBUSS && res.data.attrInfoMap.BZSMBUSS !== ''){
this.BZSMBUSSFileList = this.assemble(this.subComma(res.data.attrInfoMap.BZSMBUSS), this.subComma(res.data.attrInfoMap.BZSMBUSSName));
}
this.FBGBUSSFileList = this.assemble(FBGBUSS, FBGBUSSName);
// this.LSBBBUSSFileList = this.assemble(res.data.attrInfoMap.LSBBBUSS.substring(0, res.data.attrInfoMap.LSBBBUSS.lastIndexOf(',')), res.data.attrInfoMap.LSBBBUSSName);
let FBGBUSSLast = ''
if(res.data.attrInfoMap.FBGBUSS && res.data.attrInfoMap.FBGBUSS !== ''){
FBGBUSSLast = this.subComma(res.data.attrInfoMap.FBGBUSS)
}
let LSBBBUSS = FBGBUSSLast
if(res.data.attrInfoMap.LSBBBUSS && res.data.attrInfoMap.LSBBBUSS !== ''){
if(FBGBUSSLast === ''){
LSBBBUSS = this.subComma(res.data.attrInfoMap.LSBBBUSS)
}else{
LSBBBUSS = FBGBUSSLast + ',' + this.subComma(res.data.attrInfoMap.LSBBBUSS)
}
}
let LSBBBUSSName = this.subComma(res.data.attrInfoMap.FBGBUSSName) + ',' + this.subComma(res.data.attrInfoMap.LSBBBUSSName)
// 发布稿空 只取历史版本
if(res.data.attrInfoMap.FBGBUSSName === null || res.data.attrInfoMap.FBGBUSSName === ''){
LSBBBUSSName = this.subComma(res.data.attrInfoMap.LSBBBUSSName)
}
// 历史版本空 只取发布稿
if(res.data.attrInfoMap.LSBBBUSSName === null || res.data.attrInfoMap.LSBBBUSSName === ''){
LSBBBUSSName = this.subComma(res.data.attrInfoMap.FBGBUSSName)
}
// 存放带入的历史版本文件名、文件id
this.LSBBBUSS = LSBBBUSS
this.LSBBBUSSName = LSBBBUSSName
this.LSBBBUSSFileList = this.assemble(LSBBBUSS, LSBBBUSSName);
if(res.data.attrInfoMap.QTWJBUSS)
this.QTWJBUSSFileList = this.assemble(this.subComma(res.data.attrInfoMap.QTWJBUSS), this.subComma(res.data.attrInfoMap.QTWJBUSSName));
if(res.data.attrInfoMap.GLWJBUSS)
this.GLWJBUSSFileList = this.assemble(this.subComma(res.data.attrInfoMap.GLWJBUSS), this.subComma(res.data.attrInfoMap.GLWJBUSSName));
}catch (e) {
console.log(e)
}
})
// 起草部门带入
this.form.QCDW = this.filterStringDate(this.standardCheckedList[0].unitName)
@@ -2298,6 +2338,20 @@
break
}
},
// 截取字符前后的逗号
subComma(str){
if(str && str!== ''){
if(str.indexOf(',') === 0){
str = str.slice(1)
}
if(str.lastIndexOf(',') === str.length - 1){
str = str.slice(0, -1)
}
return str
}else{
return ''
}
},
initializeFileList(property, value) {
switch (property) {
case 'xgd':
@@ -2746,8 +2800,9 @@
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if (this.replaceLawType === 'DTQBBHBUSS') {
let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
this.form.DTQBBHBUSS = this.filterSetData(arr1)
// let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
// this.form.DTQBBHBUSS = this.filterSetData(arr1)
this.form.DTQBBHBUSS = textArr.join(',')
this.form.standNum = this.filterSetData(textArr2.join(','))
} else if (this.replaceLawType === 'CYBZ') {
let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' + textArr.join(',') : textArr.join(',')
@@ -2761,8 +2816,59 @@
this.form.byybj = this.form.byybj ? this.form.byybj + ',' + textArr.join(',') : textArr.join(',')
}
// this.$emit('input', textArr.join(','))
// 修订、修改 时 手动查找代替企标编号 发布稿放到历史版本
if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.reviseStatus === '2' || this.form.reviseStatus === '3') && this.selectedListRep.length){
let ids = this.selectedListRep.reduce((init,item,index,arr)=>{
let result
if(index === arr.length - 1){
result = init + item.id
}else{
result = init + item.id + ','
}
return result
},'')
this.selectByIdAtt(ids).then(res =>{
if (res && res.data && res.data.fbgbuss !== '') {
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbussNmae
}else{
init = init + ',' + item.fbgbussNmae
}
return init
},'')
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{
if(index === 0){
init = item.fbgbuss
}else{
init = init + ',' + item.fbgbuss
}
return init
},'')
// 带入的历史版本即选择的代替企标编号中的历史版本合并
if(this.LSBBBUSS !== ''){
this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS
this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName
}
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
}
})
}
this.$refs.selections.clearSelection()
},
selectByIdAtt(id){
return new Promise((resolve,reject)=>{
this.$http.get('/lawss/sarBussionessStand/selectByIdAtt', {
id
}, {
_this: this
}, res => {
resolve(res)
})
})
},
filterSetData(data) {
const arr = new Set()
let permission = data.split(",");
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+4 -1
View File
@@ -2980,8 +2980,11 @@
this.summaryName=this.summaryList.map(item => item.name).join(",")
this.form.commentText = this.formTongGuo.commentText
if(!this.form.modelData){
this.form.modelData = []
}
// 会签意见存储
// 会签意见存储
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue
+7 -7
View File
@@ -52,13 +52,13 @@
</span>
</div>
</el-form-item>
<van-field v-if="type === '1'" label="合并原因" v-model="qbfsForm.mergeReason" placeholder="请输入合并原因" readonly />
<van-field v-if="type === '2'" label="延期后初稿完成时间" v-model="qbfsForm.yqDraftTime" placeholder="请选择延期后初稿完成时间" readonly />
<van-field v-if="type === '2'" label="延期后标准发布时间" v-model="qbfsForm.yqReleaseTime" placeholder="请选择延期后标准发布时间" readonly />
<van-field v-if="type === '2'" label="延期原因" v-model="qbfsForm.delayReason" placeholder="请输入延期原因" readonly />
<van-field v-if="type === '3'" label="取消原因" v-model="qbfsForm.cancelReason" placeholder="请输入取消原因" readonly />
<van-field v-if="type === '4'" label="更名后企标名称" v-model="qbfsForm.renameEs" placeholder="请输入更名后企标名称" readonly />
<van-field v-if="type === '4'" label="更名原因" v-model="qbfsForm.renameReason" placeholder="请输入更名原因" readonly />
<van-field v-if="type === '1'" type="textarea" autosize label="合并原因" v-model="qbfsForm.mergeReason" placeholder="请输入合并原因" readonly />
<van-field v-if="type === '2'" type="textarea" autosize label="延期后初稿完成时间" v-model="qbfsForm.yqDraftTime" placeholder="请选择延期后初稿完成时间" readonly />
<van-field v-if="type === '2'" type="textarea" autosize label="延期后标准发布时间" v-model="qbfsForm.yqReleaseTime" placeholder="请选择延期后标准发布时间" readonly />
<van-field v-if="type === '2'" type="textarea" autosize label="延期原因" v-model="qbfsForm.delayReason" placeholder="请输入延期原因" readonly />
<van-field v-if="type === '3'" type="textarea" autosize label="取消原因" v-model="qbfsForm.cancelReason" placeholder="请输入取消原因" readonly />
<van-field v-if="type === '4'" type="textarea" autosize label="更名后企标名称" v-model="qbfsForm.renameEs" placeholder="请输入更名后企标名称" readonly />
<van-field v-if="type === '4'" type="textarea" autosize label="更名原因" v-model="qbfsForm.renameReason" placeholder="请输入更名原因" readonly />
</el-form>
</div>
<div>