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

Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-06-24 09:14:41 +08:00
parent 619c1c094d f5e3f15fea
commit de7578716b
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+14 -7
View File
@@ -103,7 +103,8 @@
<el-date-picker <el-date-picker
v-model="form.issueTime" v-model="form.issueTime"
type="date" type="date"
placeholder="请选择标准发布日期"> placeholder="请选择标准发布日期"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled"> <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
@@ -143,21 +144,24 @@
<el-date-picker <el-date-picker
v-model="form.ssrq" v-model="form.ssrq"
type="date" type="date"
placeholder="请选择标准实施日期(标准文本)"> placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled"> <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.xcxssrq" v-model="form.xcxssrq"
type="date" type="date"
placeholder="请选择新车型实施日期(标准文本"> placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.zccssrq" v-model="form.zccssrq"
type="date" type="date"
placeholder="请选择在产车实施日期(标准文本)"> placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -166,21 +170,24 @@
<el-date-picker <el-date-picker
v-model="form.ssrqgj" v-model="form.ssrqgj"
type="date" type="date"
placeholder="请选择实施日期(国际)"> placeholder="请选择实施日期(国际)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled"> <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.xcxssrqgj" v-model="form.xcxssrqgj"
type="date" type="date"
placeholder="请选择新车型实施日期(国家)"> placeholder="请选择新车型实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.zccssrqgj" v-model="form.zccssrqgj"
type="date" type="date"
placeholder="请选择在产车实施日期(国家)"> placeholder="请选择在产车实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+14 -8
View File
@@ -109,7 +109,8 @@
disabled disabled
v-model="form.issueTime" v-model="form.issueTime"
type="date" type="date"
placeholder="请选择标准发布日期"> placeholder="请选择标准发布日期"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled"> <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
@@ -151,7 +152,8 @@
disabled disabled
v-model="form.ssrq" v-model="form.ssrq"
type="date" type="date"
placeholder="请选择标准实施日期(标准文本)"> placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled"> <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
@@ -159,7 +161,8 @@
disabled disabled
v-model="form.xcxssrq" v-model="form.xcxssrq"
type="date" type="date"
placeholder="请选择新车型实施日期(标准文本"> placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
@@ -167,7 +170,8 @@
disabled disabled
v-model="form.zccssrq" v-model="form.zccssrq"
type="date" type="date"
placeholder="请选择在产车实施日期(标准文本)"> placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -177,7 +181,8 @@
disabled disabled
v-model="form.ssrqgj" v-model="form.ssrqgj"
type="date" type="date"
placeholder="请选择实施日期(国际)"> placeholder="请选择实施日期(国际)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled"> <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
@@ -185,7 +190,8 @@
disabled disabled
v-model="form.xcxssrqgj" v-model="form.xcxssrqgj"
type="date" type="date"
placeholder="请选择新车型实施日期(国家)"> placeholder="请选择新车型实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled"> <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
@@ -193,7 +199,8 @@
disabled disabled
v-model="form.zccssrqgj" v-model="form.zccssrqgj"
type="date" type="date"
placeholder="请选择在产车实施日期(国家)"> placeholder="请选择在产车实施日期(国家)"
value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -846,7 +853,6 @@
this.form.commentText = this.commentText this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
console.log(json)
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
userId : this.userId, userId : this.userId,