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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-28 17:11:24 +08:00
parent cd4fa32659 2774d24da6
commit ebd6d3bc38
14 changed files with 798 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+70 -28
View File
@@ -167,32 +167,61 @@
<div class="prc-content-border content_input" v-show="verifySarStandard" >
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.ssrq"
type="dates"
placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrq"
type="dates"
placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<cus-tom-data-picker-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq"
:disabled="false"
></cus-tom-data-picker-group>
<cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
:disabled="false"
></cus-tom-data-picker-group>
<!-- <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择标准实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.zccssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择在产车实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="dates"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<cus-tom-data-picker-group
:config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
v-model="form.xcxssrq"
:disabled="false"
></cus-tom-data-picker-group>
<!-- <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.xcxssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择新车型实施日期(标准文本"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"-->
@@ -578,7 +607,7 @@
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
<tree-select-new
<tree-select-module
width = "800"
:key="key3"
:lazy=true
@@ -590,7 +619,7 @@
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -1242,15 +1271,22 @@
import {saveTaskFirst, queryTaskFirst} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default {
name: "bzrkStep1",
components: {
CusTomDataPickerGroup,
CustomDatePickGroup,
TreeSelectModule,
ProcessHeader,
ProcessFooter,
ProcessTitle,
TreeSelect,
TreeSelectNew
TreeSelectNew,
},
data () {
const validateQcdw = (rule, value, callback) => {
@@ -1725,6 +1761,7 @@
this.roleForm.zrUserName=nameList;
}
if (this.drawerTitle === '选择我司署名人'){
this.roleForm.wssmrId=idList;
this.form.wssmr = nameList
}
},
@@ -2698,21 +2735,26 @@
},
handleSubmit() {
debugger
// this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['userForm'].validate((valid) => {
if (valid) {
this.fileInfoHandle()
this.isSubmit = true
this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm)
console.log("this.form",this.form.wssmr);
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
json.commentText = this.commentText
json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName
console.log("JSON.stringify(json)",JSON.stringify(json));
this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+54 -30
View File
@@ -152,35 +152,53 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.ssrq"
type="date"
placeholder="请选择标准实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrq"
type="date"
placeholder="请选择在产车实施日期(标准文本)"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<cus-tom-data-picker-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq"
:disabled="true"
></cus-tom-data-picker-group>
<cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
:disabled="true"
></cus-tom-data-picker-group>
<!-- <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择标准实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择在产车实施日期(标准文本)"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
v-model="form.xcxssrq"
:disabled="true"
></cus-tom-data-picker-group>
<!-- <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择新车型实施日期(标准文本"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
@@ -769,6 +787,8 @@
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default {
name: "bzrkStep2",
@@ -956,6 +976,7 @@
}
},
components: {
CusTomDataPickerGroup,
ProcessHeader,
ProcessFooter,
ProcessTitle,
@@ -1209,13 +1230,16 @@
_this: this
}, res => {
if (res.success) {
if(this.formTongGuo.approvalOpinion === '1'){
this.$message.warning("驳回成功")
console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion);
if(this.formTongGuo.approvalOpinion == '1'){
console.log("shibai");
this.$message.warning("驳回成功")
this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else{
this.processCreateStand(json)
console.log("hello");
this.processCreateStand(json)
}
}
})
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+48 -24
View File
@@ -151,32 +151,53 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.ssrq"
type="date"
placeholder="请选择标准实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.zccssrq"
type="date"
placeholder="请选择在产车实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<custom-date-pick-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq"
:disabled="true"
></custom-date-pick-group>
<custom-date-pick-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
:disabled="true"
></custom-date-pick-group>
<!-- <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.ssrq"-->
<!-- type="dates"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss"-->
<!-- placeholder="请选择标准实施日期(标准文本)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.zccssrq"-->
<!-- type="dates"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss"-->
<!-- placeholder="请选择在产车实施日期(标准文本)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<custom-date-pick-group
:key="'zccssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.xcxssrq"
:disabled="true"
></custom-date-pick-group>
<!-- <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
<!-- v-model="form.xcxssrq"-->
<!-- type="dates"-->
<!-- value-format="yyyy-MM-dd hh:mm:ss"-->
<!-- placeholder="请选择新车型实施日期(标准文本">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- disabled-->
@@ -691,6 +712,8 @@ import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
export default {
name: "bzrkStep3",
@@ -866,6 +889,7 @@ export default {
}
},
components: {
CustomDatePickGroup,
ProcessHeader,
ProcessFooter,
ProcessTitle,
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+103 -36
View File
@@ -155,29 +155,48 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.ssrq"
type="date"
placeholder="请选择标准实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.zccssrq"
type="date"
placeholder="请选择在产车实施日期(标准文本)">
</el-date-picker>
</el-form-item>
<cus-tom-data-picker-group
:key="'ssrq'"
:config="{attrName:'实施日期(标准文本)',attrField:'ssrq'}"
v-model="form.ssrq"
:disabled="false"
></cus-tom-data-picker-group>
<cus-tom-data-picker-group
:key="'zccssrq'"
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
v-model="form.zccssrq"
:disabled="false"
></cus-tom-data-picker-group>
<!-- <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择标准实施日期(标准文本)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.zccssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择在产车实施日期(标准文本)">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.xcxssrq"
type="date"
placeholder="请选择新车型实施日期(标准文本">
</el-date-picker>
</el-form-item>
<cus-tom-data-picker-group
:key="'xcxssrq'"
:config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}"
v-model="form.xcxssrq"
:disabled="false">
</cus-tom-data-picker-group>
<!-- <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.xcxssrq"-->
<!-- type="dates"-->
<!-- placeholder="请选择新车型实施日期(标准文本">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker-->
<!-- v-model="form.ssrqgj"-->
@@ -787,7 +806,9 @@
width = "800"
:key="key1"
:lazy=true
:multiple=false
:multiple=true
:check-strictly= true
:show-checkBox=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
@@ -802,7 +823,9 @@
width = "800"
:key="key2"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:show-checkBox=true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
@@ -813,17 +836,19 @@
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
<tree-select-new
<tree-select-module
width = "800"
:key="key3"
:lazy=true
:multiple=false
:multiple=true
:check-strictly= true
:show-checkBox=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-new>
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel" ></tree-select-module>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -909,15 +934,17 @@
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option
v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
</el-input>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
<!-- <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">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1340,6 +1367,12 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<Role-tree
:is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
</div>
</template>
@@ -1357,10 +1390,15 @@ import {
} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
export default {
name: "bzrkStep4",
components: {
CusTomDataPickerGroup,
TreeSelectModule,
ProcessHeader,
ProcessFooter,
ProcessTitle,
@@ -1474,7 +1512,7 @@ export default {
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standEnName: [
{ required: true, message: '请输入标准英文名称', trigger: 'blur' },
{ required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
/*standNature: [
@@ -1631,6 +1669,34 @@ export default {
}
})
},
checkedRole2 (data) {
console.log('1712',this.drawerTitle)
let idList = ''
let nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
if (this.drawerTitle === '选择责任人'){
this.roleForm.zrUserId=idList;
this.roleForm.zrUserName=nameList;
}
if (this.drawerTitle === '选择我司署名人'){
this.form.wssmr = nameList
}
},
choiceZRRS (type, title, id) {
console.log('2077',title)
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
@@ -1663,6 +1729,7 @@ export default {
this.urlChild="sarModelTree/childByList"
this.key3++
},
busVsFunc(){
this.$http.get('sarVppsTree/list', '', {
_this: this