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

feat: There is no way the, bug #52453 #52324

Browse Source
This commit is contained in:
super_liu
2022-04-08 17:52:02 +08:00
parent 9287d29f77
commit 8e48896581
7 changed files with 260 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+25
View File
@@ -105,6 +105,31 @@ export default {
}) })
} }
break break
case 'laws1':
if (row.taskInfo === '政策入库审批') {
this.$router.push({
name: 'zcrkStep2',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}else if (row.taskInfo === '重新发起入库流程'){
this.$router.push({
name: 'zcrkStep3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
case 'buss1': case 'buss1':
if (row.taskInfo === '企标编写') { if (row.taskInfo === '企标编写') {
this.$router.push({ this.$router.push({
src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+70 -101
View File
@@ -202,32 +202,47 @@
<div class="prc-content-border" v-show="verifySarStandard" > <div class="prc-content-border" v-show="verifySarStandard" >
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker :config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}"
v-model="form.SSRQLAWS" v-model="form.SSRQLAWS"
type="date" :disabled="false"
placeholder="请选择标准实施日期(标准文本)" ></cus-tom-data-picker-group>
value-format="yyyy-MM-dd"> <!-- <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">-->
</el-date-picker> <!-- <el-date-picker-->
</el-form-item> <!-- v-model="form.SSRQLAWS"-->
<el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled"> <!-- type="date"-->
<el-date-picker <!-- placeholder="请选择标准实施日期(标准文本)"-->
v-model="form.ZCXSSRQLAWS" <!-- value-format="yyyy-MM-dd">-->
type="date" <!-- </el-date-picker>-->
placeholder="请选择在产车实施日期(标准文本)" <!-- </el-form-item>-->
value-format="yyyy-MM-dd"> <cus-tom-data-picker-group
</el-date-picker> :config="{attrName:'请选择在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
</el-form-item> v-model="form.ZCXSSRQLAWS"
:disabled="false"
></cus-tom-data-picker-group>
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ZCXSSRQLAWS"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker :config="{attrName:'请选择新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
v-model="form.XCXSSRQLAWS" v-model="form.XCXSSRQLAWS"
type="date" :disabled="false"
placeholder="请选择新车型实施日期(标准文本" ></cus-tom-data-picker-group>
value-format="yyyy-MM-dd"> <!-- <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">-->
</el-date-picker> <!-- <el-date-picker-->
</el-form-item> <!-- v-model="form.XCXSSRQLAWS"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(标准文本"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"--> <!-- v-model="form.ssrqgj"-->
@@ -891,17 +906,20 @@
class="common-button-primary" class="common-button-primary"
icon="el-icon-check" icon="el-icon-check"
type="primary" type="primary"
:loading="drLoading"
@click="handleProcessStandardNext(1)">新增</el-button> @click="handleProcessStandardNext(1)">新增</el-button>
<el-button <el-button
round round
class="common-button-primary" class="common-button-primary"
icon="el-icon-check" icon="el-icon-check"
type="primary" type="primary"
:loading="drLoading"
@click="handleProcessStandardNext(2)">带入</el-button> @click="handleProcessStandardNext(2)">带入</el-button>
<el-button <el-button
round round
class="common-button-default" class="common-button-default"
icon="el-icon-close" icon="el-icon-close"
:loading="drLoading"
@click="handleProcessStandardNext(3)">取消</el-button> @click="handleProcessStandardNext(3)">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
@@ -917,6 +935,8 @@
import {saveTaskFirst, queryTaskFirst, taskDel} from "api/process"; import {saveTaskFirst, queryTaskFirst, taskDel} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default { export default {
name: "zcrkStep1", name: "zcrkStep1",
@@ -925,7 +945,8 @@
ProcessFooter, ProcessFooter,
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew TreeSelectNew,
CusTomDataPickerGroup
}, },
data () { data () {
const validateQcdw = (rule, value, callback) => { const validateQcdw = (rule, value, callback) => {
@@ -977,6 +998,7 @@
}] }]
}, },
bpnId: this.$route.query.bpnId, bpnId: this.$route.query.bpnId,
drLoading:false,
dataLoading:false, dataLoading:false,
fileList: [], fileList: [],
caFileList: [], caFileList: [],
@@ -1104,73 +1126,6 @@
form: { form: {
// 基础信息 // 基础信息
country:[], country:[],
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: '0', // 标准类型
standSort: '', // 标准类别
standNumber: '', // 标准编号
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
standSystem: '',// 标准体系
standSystemName: '',// 标准体系名称
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
FBGBJBD: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
kwj: '', // 勘 误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
zqyjgName: '', // 征求意见稿
jdwjName: '', // 解读文件
zbjbdName: '', // 增补件
kwjName: '', // 勘误件
glwjName: '', // 关联文件
// 适用范围
txlb: '', // 体系类别
gkdw: '', // 归口管理部门
qcdw: [], // 起草单位
wssmr: [], // 我司署名人
cysd: '', // 我司参与深度
cllx: [], // 适用车型
nylx: [],// 能源类型
sycpx: [],// 适用产品线
syrz: [], // 适用认证
zrbm: [], // 责任部门
zrgcs: [], // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
bfbdtbzh: '', // 部分代替标准号
byybj: '', // 被引用标准
glwj: '', // 关联文件
xglc: '', // 相关流程
chjl: '', // 参会记录
// 基础信息 // 基础信息
lawsType: '', lawsType: '',
lawsNumber: '', lawsNumber: '',
@@ -1449,6 +1404,8 @@
this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS']) this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS']) this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS']) this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
this.form['ZRBMLAWS'] = this.filterObj(this.form['ZRBMLAWS'])
this.form['TGDWLAWS'] = this.filterObj(this.form['TGDWLAWS'])
this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName); this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName);
this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName); this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName);
this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName); this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName);
@@ -1567,6 +1524,7 @@
// 带入 // 带入
case 2: case 2:
if (this.standardCheckedList.length === 1) { if (this.standardCheckedList.length === 1) {
this.drLoading = true
this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, { this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
_this: this _this: this
}, res => { }, res => {
@@ -1575,17 +1533,30 @@
const json = Object.assign(bringData, bringData.attrInfoMap); const json = Object.assign(bringData, bringData.attrInfoMap);
this.form = JSON.parse(JSON.stringify(json)) this.form = JSON.parse(JSON.stringify(json))
this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : [] const dateArr = []
this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : [] if(this.form.commentCycleStart && this.form.commentCycleEnd){
this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : [] dateArr[0] = this.form.commentCycleStart
this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : [] dateArr[1] = this.form.commentCycleEnd
this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : [] this.commentCycleDate = dateArr
this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : [] }
this.form['lawsSyqy'] = this.filterObj(this.form['lawsSyqy'])
this.form['lawsSycx'] = this.filterObj(this.form['lawsSycx'])
this.form['lawsLabel'] = this.filterObj(this.form['lawsLabel'])
this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
this.form['ZRBMLAWS'] = this.filterObj(this.form['ZRBMLAWS'])
this.form['TGDWLAWS'] = this.filterObj(this.form['TGDWLAWS'])
this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName);
this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName);
this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName);
this.GLWJLAWSFileList=this.assemble(this.form.GLWJLAWS,this.form.GLWJLAWSName);
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = bringData.id this.form['id'] = bringData.id
this.standardDrawer = false this.standardDrawer = false
this.verifySarStandard = true this.verifySarStandard = true
this.drLoading = false
this.$forceUpdate() this.$forceUpdate()
} }
// 遍历对象初始化文件信息 // 遍历对象初始化文件信息
@@ -2257,9 +2228,7 @@
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.country=this.countryArr; this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm) const json = Object.assign(this.form, this.roleForm);
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
json.commentText = this.commentText json.commentText = this.commentText
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
+53 -100
View File
@@ -188,29 +188,47 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker disabled :key="'SSRQLAWS'"
v-model="form.SSRQLAWS" :config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}"
type="date" v-model="form.SSRQLAWS"
value-format="yyyy-MM-dd"> :disabled="true"
</el-date-picker> ></cus-tom-data-picker-group>
</el-form-item> <!-- <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">-->
<el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled"> <!-- <el-date-picker disabled-->
<el-date-picker disabled <!-- v-model="form.SSRQLAWS"-->
v-model="form.ZCXSSRQLAWS" <!-- type="date"-->
type="date" <!-- value-format="yyyy-MM-dd">-->
value-format="yyyy-MM-dd"> <!-- </el-date-picker>-->
</el-date-picker> <!-- </el-form-item>-->
</el-form-item> <cus-tom-data-picker-group
:key="'ZCXSSRQLAWS'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
v-model="form.ZCXSSRQLAWS"
:disabled="true"
></cus-tom-data-picker-group>
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker disabled-->
<!-- v-model="form.ZCXSSRQLAWS"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker disabled :key="'XCXSSRQLAWS'"
v-model="form.XCXSSRQLAWS" :config="{attrName:'新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
type="date" v-model="form.XCXSSRQLAWS"
value-format="yyyy-MM-dd"> :disabled="true"
</el-date-picker> ></cus-tom-data-picker-group>
</el-form-item> <!-- <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker disabled-->
<!-- v-model="form.XCXSSRQLAWS"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"--> <!-- v-model="form.ssrqgj"-->
@@ -571,9 +589,18 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateLaws,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail,processCreateLaws,changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default { export default {
name: "bzrkStep2", name: "bzrkStep2",
components:{
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect,
CusTomDataPickerGroup
},
data () { data () {
return { return {
loading: false, loading: false,
@@ -639,76 +666,6 @@
defaultCheckedKeys: [], defaultCheckedKeys: [],
commentCycleDate:'', commentCycleDate:'',
form: { form: {
// 基础信息
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: '0', // 标准类型
standSort: '', // 标准类别
standNumber: '', // 标准编号
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
standSystemName: '',// 标准体系
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
fbgbjbd: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
bfbdtbzh: '', // 增补件
kwj: '', // 勘误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
zqyjgName: '', // 征求意见稿
jdwjName: '', // 解读文件
zbjbdName: '', // 增补件
kwjName: '', // 勘误件
glwjName: '', // 关联文件
// 适用范围
txlb: '', // 体系类别
gkdw: '', // 归口管理部门
qcdw: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
cllx: '', // 适用车型
nylx: '',// 能源类型
sycpx: '',// 适用产品线
syrz: '', // 适用认证
zrbm: '', // 责任部门
zrgcs: '', // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
byybj: '', // 被引用标准
glwj: '', // 关联文件
xglc: '', // 相关流程
chjl: '', // 参会记录
//流程信息 //流程信息
prcNum:'', prcNum:'',
commentText:'', commentText:'',
@@ -832,12 +789,6 @@
prcName : this.$route.query.prcName, prcName : this.$route.query.prcName,
} }
}, },
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect
},
computed: { computed: {
listNoDataText () { listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
@@ -1067,11 +1018,13 @@
this.saveLoading = true this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify(this.form);
if(this.commentCycleDate && this.commentCycleDate.length > 0){ if(this.commentCycleDate && this.commentCycleDate.length > 0){
json.commentCycleStart = this.commentCycleDate[0] this.form.commentCycleStart = this.commentCycleDate[0]
json.commentCycleEnd = this.commentCycleDate[1] this.form.commentCycleEnd = this.commentCycleDate[1]
} }
const json = JSON.stringify(this.form);
this.processCreateLaws(json)
return
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
userId : this.userId, userId : this.userId,
src/pages/processCenter/pages/creatProcess/zcrk/step3.vue
+50 -95
View File
@@ -201,32 +201,47 @@
<div class="prc-content-border" v-show="verifySarStandard" > <div class="prc-content-border" v-show="verifySarStandard" >
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker :config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}"
v-model="form.SSRQLAWS" v-model="form.SSRQLAWS"
type="date" :disabled="false"
placeholder="请选择标准实施日期(标准文本)" ></cus-tom-data-picker-group>
value-format="yyyy-MM-dd"> <!-- <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">-->
</el-date-picker> <!-- <el-date-picker-->
</el-form-item> <!-- v-model="form.SSRQLAWS"-->
<el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled"> <!-- type="date"-->
<el-date-picker <!-- placeholder="请选择标准实施日期(标准文本)"-->
v-model="form.ZCXSSRQLAWS" <!-- value-format="yyyy-MM-dd">-->
type="date" <!-- </el-date-picker>-->
placeholder="请选择在产车实施日期(标准文本)" <!-- </el-form-item>-->
value-format="yyyy-MM-dd"> <cus-tom-data-picker-group
</el-date-picker> :config="{attrName:'请选择在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
</el-form-item> v-model="form.ZCXSSRQLAWS"
:disabled="false"
></cus-tom-data-picker-group>
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ZCXSSRQLAWS"-->
<!-- type="date"-->
<!-- placeholder="请选择在产车实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker :config="{attrName:'请选择新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
v-model="form.XCXSSRQLAWS" v-model="form.XCXSSRQLAWS"
type="date" :disabled="false"
placeholder="请选择新车型实施日期(标准文本" ></cus-tom-data-picker-group>
value-format="yyyy-MM-dd"> <!-- <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">-->
</el-date-picker> <!-- <el-date-picker-->
</el-form-item> <!-- v-model="form.XCXSSRQLAWS"-->
<!-- type="date"-->
<!-- placeholder="请选择新车型实施日期(标准文本"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"--> <!-- v-model="form.ssrqgj"-->
@@ -960,6 +975,9 @@
import {inboundLiaisonDetail,saveTaskFirst, queryTaskFirst,changeAssigneeNew,saveTaskForPub} from "api/process"; import {inboundLiaisonDetail,saveTaskFirst, queryTaskFirst,changeAssigneeNew,saveTaskForPub} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default { export default {
name: "zcrkStep3", name: "zcrkStep3",
@@ -968,7 +986,8 @@
ProcessFooter, ProcessFooter,
ProcessTitle, ProcessTitle,
TreeSelect, TreeSelect,
TreeSelectNew TreeSelectNew,
CusTomDataPickerGroup
}, },
data () { data () {
const validateQcdw = (rule, value, callback) => { const validateQcdw = (rule, value, callback) => {
@@ -1159,73 +1178,6 @@
form: { form: {
// 基础信息 // 基础信息
country:[], country:[],
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: '0', // 标准类型
standSort: '', // 标准类别
standNumber: '', // 标准编号
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
standSystem: '',// 标准体系
standSystemName: '',// 标准体系名称
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
FBGBJBD: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
kwj: '', // 勘 误件
caName: '', // 草案
fbgbjbdName: '', // 发布稿
xgdName: '', // 修改单
bpgName: '', // 报批稿
ssgName: '', // 送审稿
zqyjgName: '', // 征求意见稿
jdwjName: '', // 解读文件
zbjbdName: '', // 增补件
kwjName: '', // 勘误件
glwjName: '', // 关联文件
// 适用范围
txlb: '', // 体系类别
gkdw: '', // 归口管理部门
qcdw: [], // 起草单位
wssmr: [], // 我司署名人
cysd: '', // 我司参与深度
cllx: [], // 适用车型
nylx: [],// 能源类型
sycpx: [],// 适用产品线
syrz: [], // 适用认证
zrbm: [], // 责任部门
zrgcs: [], // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
bfbdtbzh: '', // 部分代替标准号
byybj: '', // 被引用标准
glwj: '', // 关联文件
xglc: '', // 相关流程
chjl: '', // 参会记录
// 基础信息 // 基础信息
lawsType: '', lawsType: '',
lawsNumber: '', lawsNumber: '',
@@ -1464,6 +1416,8 @@
this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS']) this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS']) this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS']) this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
this.form['ZRBMLAWS'] = this.filterObj(this.form['ZRBMLAWS'])
this.form['TGDWLAWS'] = this.filterObj(this.form['TGDWLAWS'])
const dateArr = [] const dateArr = []
if(this.form.commentCycleStart && this.form.commentCycleEnd){ if(this.form.commentCycleStart && this.form.commentCycleEnd){
dateArr[0] = this.form.commentCycleStart dateArr[0] = this.form.commentCycleStart
@@ -1601,6 +1555,7 @@
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId (mesg) { getTaskId (mesg) {
console.log(mesg)
this.form = mesg.form this.form = mesg.form
this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD')) this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
let dateArr = [] let dateArr = []
@@ -1615,6 +1570,8 @@
this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS']) this.form['YYRZLAWS'] = this.filterObj(this.form['YYRZLAWS'])
this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS']) this.form['NYLXLAWS'] = this.filterObj(this.form['NYLXLAWS'])
this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS']) this.form['TGRLAWS'] = this.filterObj(this.form['TGRLAWS'])
this.form['ZRBMLAWS'] = this.filterObj(this.form['ZRBMLAWS'])
this.form['TGDWLAWS'] = this.filterObj(this.form['TGDWLAWS'])
this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName); this.ZCWBLAWSFileList=this.assemble(this.form.ZCWBLAWS,this.form.ZCWBLAWSName);
this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName); this.GCWBLAWSFileList=this.assemble(this.form.GCWBLAWS,this.form.GCWBLAWSName);
this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName); this.JDWJLAWSFileList=this.assemble(this.form.JDWJLAWS,this.form.JDWJLAWSName);
@@ -2409,9 +2366,7 @@
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.country=this.countryArr; this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
json.commentText = this.commentText json.commentText = this.commentText
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
+48 -85
View File
@@ -188,29 +188,47 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker disabled :key="'SSRQLAWS'"
v-model="form.SSRQLAWS" :config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}"
type="date" v-model="form.SSRQLAWS"
value-format="yyyy-MM-dd"> :disabled="true"
</el-date-picker> ></cus-tom-data-picker-group>
</el-form-item> <!-- <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">-->
<el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled"> <!-- <el-date-picker disabled-->
<el-date-picker disabled <!-- v-model="form.SSRQLAWS"-->
v-model="form.ZCXSSRQLAWS" <!-- type="date"-->
type="date" <!-- value-format="yyyy-MM-dd">-->
value-format="yyyy-MM-dd"> <!-- </el-date-picker>-->
</el-date-picker> <!-- </el-form-item>-->
</el-form-item> <cus-tom-data-picker-group
:key="'ZCXSSRQLAWS'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
v-model="form.ZCXSSRQLAWS"
:disabled="true"
></cus-tom-data-picker-group>
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker disabled-->
<!-- v-model="form.ZCXSSRQLAWS"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled"> <cus-tom-data-picker-group
<el-date-picker disabled :key="'XCXSSRQLAWS'"
v-model="form.XCXSSRQLAWS" :config="{attrName:'新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
type="date" v-model="form.XCXSSRQLAWS"
value-format="yyyy-MM-dd"> :disabled="true"
</el-date-picker> ></cus-tom-data-picker-group>
</el-form-item> <!-- <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker disabled-->
<!-- v-model="form.XCXSSRQLAWS"-->
<!-- type="date"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker--> <!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"--> <!-- v-model="form.ssrqgj"-->
@@ -551,9 +569,18 @@
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default { export default {
name: "zcrkStep5", name: "zcrkStep5",
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect,
CusTomDataPickerGroup
},
data () { data () {
return { return {
dataLoading: true, dataLoading: true,
@@ -588,64 +615,6 @@
defaultCheckedKeys: [], defaultCheckedKeys: [],
commentCycleDate:'', commentCycleDate:'',
form: { form: {
// 基础信息
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: '0', // 标准类型
standSort: '', // 标准类别
standNumber: '', // 标准编号
standNature: '', // 标准性质
standEnName: '', // 英文名称
standName: '', // 中文名称
signFlag: '1', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
standSystem: '',// 标准体系
gxhbq: '', // 标签
// 实施日期
ssrq: '', // 实施日期(标准文本)
xcxssrq: '', // 新车型实施日期(标准文本)
zccssrq: '', // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
// 文本信息
ca: '', // 草案
fbgbjbd: '', // 发布稿
xgd: '', // 修改单
bpg: '', // 报批稿
ssg: '', // 送审稿
zqyjg: '', // 征求意见稿
jdwj: '', // 解读文件
zbjbd: '', // 增补件
kwj: '', // 勘误件
// 适用范围
txlb: '', // 体系类别
gkdw: '', // 归口管理部门
fbjg: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
cllx: '', // 适用车型
nylx: '',// 能源类型
sycpx: '',// 适用产品线
syrz: '', // 适用认证
zrbm: '', // 责任部门
zrgcs: '', // 责任工程师
cycvppsbm: '', // 关联模块--乘用车VPPS编码
cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
cbbh: '', // 采标编号
cbcd: '', // 采标程度
yybj: '', // 引用标准
byybj: '', // 被引用标准
glwj: '', // 关联文件
xglc: '', // 相关流程
chjl: '', // 参会记录
//流程信息 //流程信息
prcNum:'', prcNum:'',
commentText:'', commentText:'',
@@ -700,12 +669,6 @@
prcName : this.$route.query.prcName, prcName : this.$route.query.prcName,
} }
}, },
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect
},
computed: { computed: {
listNoDataText () { listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
src/pages/processCenter/pages/newProcess/index.vue
+2 -2
View File
@@ -190,7 +190,7 @@
<el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider> <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
<div class="process-box"> <div class="process-box">
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'62d7895323fc44fcd3a2d7fa1a0c84bf'"> <el-card shadow="hover" v-btn-permission="''">
<div class="card-box" @click="handleCreateProcess('buss1')"> <div class="card-box" @click="handleCreateProcess('buss1')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
@@ -205,7 +205,7 @@
</el-card> </el-card>
</div> </div>
<div class="process-name"> <div class="process-name">
<el-card shadow="hover" v-btn-permission="'c149ed69750916dce3e26c35c4728542'"> <el-card shadow="hover" v-btn-permission="''">
<div class="card-box" @click="handleCreateProcess('buss2')"> <div class="card-box" @click="handleCreateProcess('buss2')">
<div class="card-top"> <div class="card-top">
<div class="card-top-left"> <div class="card-top-left">
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+12 -2
View File
@@ -609,6 +609,14 @@
></custom-input> ></custom-input>
</template> </template>
</template> </template>
<template v-else-if="field.attrField === 'SSRQLAWS' || field.attrField === 'XCXSSRQLAWS' || field.attrField === 'ZCXSSRQLAWS'">
<cus-tom-data-picker-group
:key="field.attrField"
:config="field"
v-model="sarLawsStandEO[field.attrField]"
:disabled="formdisableflag"
></cus-tom-data-picker-group>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'"> <template v-else-if="field.attrType === 'DATE_PICKER'">
<custom-date-pick <custom-date-pick
:key="field.attrField" :key="field.attrField"
@@ -1320,7 +1328,8 @@
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
import {mapGetters} from 'vuex' import {mapGetters} from 'vuex'
import store from "@/store"; import store from "@/store";
export default { export default {
@@ -1338,7 +1347,8 @@
CustomSVPPS, CustomSVPPS,
TreeSelect, TreeSelect,
TreeSelectNew, TreeSelectNew,
ProcessTitle ProcessTitle,
CusTomDataPickerGroup
}, },
props: { props: {
}, },