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:
yuezhihang
2021-07-24 09:33:49 +08:00
parent fde336157e 02ca206827
commit 1fff7cf4f9
3 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+18 -16
View File
@@ -58,7 +58,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.textStatus" placeholder="请选择文本状态"> <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option <el-option
v-for="item in standStateOptions" v-for="item in standStateOptions"
placeholder="请选择" placeholder="请选择"
@@ -79,7 +79,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别"> <el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
placeholder="请选择" placeholder="请选择"
@@ -90,7 +90,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质"> <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
<el-option <el-option
v-for="item in standNatureOptions" v-for="item in standNatureOptions"
placeholder="请选择" placeholder="请选择"
@@ -122,7 +122,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input> <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new <tree-select-new
:key="key" :key="key"
:multiple=false :multiple=false
@@ -473,7 +473,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple> <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option <el-option
v-for="item in zrbmOptions" v-for="item in zrbmOptions"
placeholder="请选择" placeholder="请选择"
@@ -484,7 +484,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple> <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-option <el-option
v-for="item in applyArcticOptions" v-for="item in applyArcticOptions"
placeholder="请选择" placeholder="请选择"
@@ -495,7 +495,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled"> <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple> <el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option <el-option
v-for="item in categoryOptions" v-for="item in categoryOptions"
placeholder="请选择" placeholder="请选择"
@@ -555,7 +555,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple> <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option <el-option
v-for="item in qcdwOption" v-for="item in qcdwOption"
placeholder="请选择" placeholder="请选择"
@@ -566,7 +566,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
placeholder="请选择" placeholder="请选择"
@@ -579,7 +579,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled"> <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple> <el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option <el-option
v-for="item in sycpxOptions" v-for="item in sycpxOptions"
placeholder="请选择" placeholder="请选择"
@@ -590,7 +590,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled"> <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
<el-select v-model="form.syrz" placeholder="请选择适用认证" multiple> <el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>
<el-option <el-option
v-for="item in applyAuthOptions" v-for="item in applyAuthOptions"
placeholder="请选择" placeholder="请选择"
@@ -601,7 +601,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple> <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option <el-option
v-for="item in zrgcsOptions" v-for="item in zrgcsOptions"
placeholder="请选择" placeholder="请选择"
@@ -633,13 +633,13 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <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-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option label="署名人1" value="1"></el-option> <el-option label="署名人1" value="1"></el-option>
<el-option label="署名人2" value="2"></el-option> <el-option label="署名人2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <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="请选择我司参与深度"> <el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
<el-option <el-option
v-for="item in cysdOptions" v-for="item in cysdOptions"
placeholder="请选择" placeholder="请选择"
@@ -673,7 +673,7 @@
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度"> <el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option> <el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option> <el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
@@ -859,6 +859,7 @@
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst"> <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
<el-form-item label="标准来源" class="search-item" v-if="dataSource"> <el-form-item label="标准来源" class="search-item" v-if="dataSource">
<el-select <el-select
:popper-append-to-body="false"
v-model="replaceLawsNumForm.standType" v-model="replaceLawsNumForm.standType"
placeholder="请选择标准来源" placeholder="请选择标准来源"
@change="dataSourceChange"> @change="dataSourceChange">
@@ -984,6 +985,7 @@
<el-form :model="standardSearchForm" inline class="label-input-form search-area"> <el-form :model="standardSearchForm" inline class="label-input-form search-area">
<el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" > <el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
<el-select <el-select
:popper-append-to-body="false"
v-model="standardSearchForm.standType" v-model="standardSearchForm.standType"
placeholder="请选择标准来源"> placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option> <el-option value="INLAND" label="国内标准库"></el-option>
@@ -991,7 +993,7 @@
</el-select> </el-select>
</el-formItem> </el-formItem>
<el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" > <el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
<el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable> <el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
:key="item.value" :key="item.value"
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+10
View File
@@ -1295,6 +1295,7 @@ export default {
children: 'children', children: 'children',
label: 'menuName' label: 'menuName'
}, },
id: '',
modalShowFlag1: false, // drawer开关 modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关 modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关 modalShowFlag3: false, // drawer开关
@@ -2262,6 +2263,7 @@ export default {
}, },
// 编辑标准属性 // 编辑标准属性
selectStandardPro (item, state) { selectStandardPro (item, state) {
this.id = item.id
this.addOrUPdateFlag = 2 this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑国内标准' this.modalshowtitle = '编辑国内标准'
this.modalshowflag = true this.modalshowflag = true
@@ -3116,6 +3118,14 @@ export default {
}, res => { }, res => {
this.isSubmit = false this.isSubmit = false
if (res.ok) { if (res.ok) {
this.personCollect.collectType = 'INLAND_STAND'
this.personCollect.id = this.id
this.personCollect.userId = this.$store.getters.userInfo.userId
this.$http.get('person/personCollect/updatePersonCollect', this.personCollect, {
_this: this,
loading: 'loading'
}, res => {
}, e => {})
this.getDomesticStandardTable(this.tableFlag) this.getDomesticStandardTable(this.tableFlag)
this.resetForm() this.resetForm()
if (this.addOrUPdateFlag === 1) { if (this.addOrUPdateFlag === 1) {
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+19 -6
View File
@@ -25,7 +25,7 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="historySearch.responseUnit" v-show="false" /> <el-input v-model="historySearch.responseUnitShow" v-show="false" />
<el-popover <el-popover
placement="bottom" placement="bottom"
popper-class="user-dept-popper" popper-class="user-dept-popper"
@@ -495,8 +495,19 @@ export default {
}) })
}, },
detailsStandard (item) { detailsStandard (item) {
this.$http.post('lawss/sarTestItem/validateStandNumber', { console.log(item);
standnumber: item.standNum let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
// 接口调用无返回值与后台商量后先行封存 使用未符合整改数据库中方法直接跳转
/*this.$http.post('lawss/sarTestItem/validateStandNumber', {
standNumber: item.standId
}, { }, {
_this: this _this: this
}, res => { }, res => {
@@ -510,7 +521,7 @@ export default {
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, e => { }, e => {
}) })*/
}, },
getOrgTreeSource () { getOrgTreeSource () {
this.$http.get('sys/org/getTree', {}, {_this: this}, this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -612,8 +623,9 @@ export default {
// }) // })
// }, // },
treeClickSearch (treeId, treeNode) { treeClickSearch (treeId, treeNode) {
this.historySearch.responseUnit = treeNode.id this.historySearch.responsibleUnit = treeNode.id
this.historySearch.responseUnitShow = treeNode.name this.historySearch.responseUnitShow = treeNode.name
this.$forceUpdate()
}, },
// 点击清空按钮事件 // 点击清空按钮事件
clearAllSearch () { clearAllSearch () {
@@ -621,7 +633,8 @@ export default {
standNumOrName: '', standNumOrName: '',
quesType: '', quesType: '',
productName: '', productName: '',
responseUnit: '' responsibleUnit: '',
responseUnitShow:''
} }
this.getTableBtn() this.getTableBtn()
}, },