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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-08-04 14:51:43 +08:00
parent c400abf683 60439cef5b
commit 6a2c61479c
8 changed files with 177 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -1
View File
@@ -14,6 +14,7 @@
<el-form
ref="bzzqyjForm"
:model="form"
:rules="formRules"
class="label-input-form"
label-width="210px"
>
@@ -499,7 +500,7 @@
_this: this
}, res => {
this.standInfoList = res.data.list
this.total = res.data.total
this.total = res.data.count
this.spinShow = false
}, e => {
})
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+22 -2
View File
@@ -198,6 +198,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -220,7 +221,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from 'api/process'
export default {
name: "bzjdStep2",
@@ -306,7 +307,26 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('pId', this.pId)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
itemList: this.itemList,
sarType: this.sarType
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+7 -1
View File
@@ -530,7 +530,12 @@
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.json = data
const itemList = JSON.parse(data.itemList)
let itemList
if (typeof (data.itemList) == 'string') {
itemList = JSON.parse(data.itemList)
} else {
itemList = data.itemList
}
itemList.forEach(item => {
item.unitDeptName = this.$store.getters.userInfo.orgName
item.onlineData = ''
@@ -542,6 +547,7 @@
item.technicalRequir = ''
item.itemsTitle = item.itermsConditions
})
console.log(2);
this.itemList = itemList
this.loading = false
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+81 -32
View File
@@ -976,38 +976,51 @@
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div>
</el-dialog>
<el-drawer
:title="drawerTitle"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<el-input
style="width:70%;padding: 10px"
placeholder="请输入姓名"
v-model="filterText">
</el-input>
<el-tree
:filter-node-method="filterNode"
v-if="modalShowFlag"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
:data="treeData"
:props="defaultUserProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalShowFlag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- <el-drawer-->
<!-- :title="drawerTitle"-->
<!-- :visible.sync="modalShowFlag"-->
<!-- :wrapperClosable="false"-->
<!-- size="800px">-->
<!-- <el-input-->
<!-- style="width:70%;padding: 10px"-->
<!-- placeholder="请输入姓名"-->
<!-- v-model="filterText">-->
<!-- </el-input>-->
<!-- <el-tree-->
<!-- :filter-node-method="filterNode"-->
<!-- v-if="modalShowFlag"-->
<!-- node-key="id"-->
<!-- style="height: 100%; overflow: auto;"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultUserProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree">-->
<!-- </el-tree>-->
<!-- <div id="roleFormButton" class="demo-drawer-footer">-->
<!-- <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>-->
<!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
<!-- 选择标准的弹框 -->
<el-drawer
ref="standard"
@@ -1256,6 +1269,7 @@
label: 'model'
},
nodeList: [],
nodeList2: [],
type: '',
defaultUserProps: {
children: 'children',
@@ -1267,6 +1281,7 @@
key3:4,
treeData: [], // 人员数据
modalShowFlag: false, // drawer开关
modalShowRoleFlag: false, // drawer开关
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
@@ -1491,6 +1506,39 @@
},
},
methods: {
choiceZRRS () {
if (this.userType === 'zrUserId') {
this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
}
this.modalshowflag2 = true
},
checkedRole2 (data) {
var idList = ''
var nameList = ''
data.forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.zrUserIds = idList
this.zrUserIds = nameList
},
checkedRole (data) {
if (this.userType === 'jlUserId') {
this.roleForm.jlUserId = data[0].id
this.roleForm.jlUserName = data[0].name
}else if(this.userType === 'zrUserId'){
this.roleForm.zrUserId=data[0].id;
this.roleForm.zrUserName=data[0].name;
}
},
// z责任人会签姓名搜索
filterNode(value, data) {
if (!value) return true;
@@ -1792,6 +1840,7 @@
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
},
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+1 -1
View File
@@ -232,7 +232,7 @@
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime}}</div>
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>
</el-form>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+15 -12
View File
@@ -5,7 +5,7 @@
<div class="content-top">
<el-form :modal="nonConformitySearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="nonConformitySearch.standId"
<el-input v-model="nonConformitySearch.standSerialNumber"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
@@ -269,7 +269,7 @@
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="计划关闭时间:">
<div class="seeItem">{{historySeeForm.planCloseTime}}</div>
<div class="seeItem">{{historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>
</el-form>
</div>
@@ -384,7 +384,7 @@
</div>
<div class="typeitems">
<div class="itemsLeft">验证时间:</div>
<div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11): '')}}</div>
<div class="itemsRight">{{(item.validTime ? item.validTime.substring(0, 11) : '')}}</div>
</div>
<div class="typeitems">
<div class="itemsLeft">验证结果:</div>
@@ -430,6 +430,7 @@ export default {
pageNo: 1,
nonConformitySearch: {
standId: '', // 标准号/名称
standSerialNumber:'',
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
},
@@ -591,16 +592,18 @@ export default {
this.$nextTick(() => {
const arr = []
let questionType = []
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
if (item === opr.value) {
item = opr.label
arr.push(item)
}
if (this.historySeeForm.quesType) {
questionType = this.historySeeForm.quesType.split(',')
questionType.map((item) => {
this.optionList.map((opr) => {
if (item === opr.value) {
item = opr.label
arr.push(item)
}
})
})
})
this.historySeeForm.quesType = arr.toString()
this.historySeeForm.quesType = arr.toString()
}
})
},
//点击编辑按钮事件
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+47 -54
View File
@@ -32,54 +32,52 @@
<el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
</div>
<div class="container" style="position:relative;">
<div style="position: absolute;top: 0;left: 0;bottom: 0;right: 0;">
<el-table
:data="standinfoList"
height="100%"
border
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
<div class="container">
<el-table
:data="standinfoList"
height="100%"
border
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
prop="partCode"
label="章节编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="content"
align="center"
label="修改意见内容(包括理由或依据)"
>
</el-table-column>
<el-table-column
prop="deptName"
align="center"
label="提出部门"
>
</el-table-column>
<el-table-column
prop="userName"
align="center"
label="提出人"
>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i v-if="scope.row.userId === $store.getters.userInfo.userId" class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
</div>
<el-table-column
prop="partCode"
label="章节编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="content"
align="center"
label="修改意见内容(包括理由或依据)"
>
</el-table-column>
<el-table-column
prop="deptName"
align="center"
label="提出部门"
>
</el-table-column>
<el-table-column
prop="userName"
align="center"
label="提出人"
>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</template>
</el-table-column>
</el-table>
</div>
<pagination
style="position: static;width: 100%;"
@@ -174,15 +172,9 @@
_this: this
}, res => {
this.standinfoList = res.data.records
console.log(this.standinfoList);
this.total = res.data.total
this.spinShow = false
res.data.records.forEach(item => {
if (item.ideaKey == 1) {
this.ideaKey = false
} else {
this.ideaKey = true
}
})
}, e => {
})
},
@@ -388,6 +380,7 @@
display: flex;
margin:10px 0;
flex-direction: column;
padding: 0;
.el-tabs{
height: 100%;
display: flex;
src/sysConfig/index.js
+2 -2
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '10.96.170.156'
const devIp = '127.0.0.1'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
const prodInterfacePORT = '8033'
const prodInterfacePORT = '8038'
// 判断环境