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:
super_liu
2022-05-19 10:10:42 +08:00
parent c9f99d8cc2 d161fcca36
commit a1ce2a82fd
17 changed files with 427 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/styles/process.less
+1 -1
View File
@@ -7,7 +7,7 @@
line-height: 50px;
}
.add-form-item:last-child {
border-bottom: 0px dashed #e5e5e5;
//border-bottom: 0px dashed #e5e5e5;
}
.form-item-disabled {
.el-form-item__label, .el-form-item__content .el-input .el-input__inner,
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+2 -2
View File
@@ -411,7 +411,7 @@
:size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
<div class="demo-drawer-content">
<div style="display: flex; height: 100%;">
<div style="width: 50%; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div style="width: 50%; overflow: auto; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
@@ -425,7 +425,7 @@
</div>
</div>
</div>
<div style="width: 50%; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
<div style="width: 50%; overflow: auto; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
-1
View File
@@ -484,7 +484,6 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+79 -73
View File
@@ -48,6 +48,65 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
:multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
:drawerTitle="drawerTitle"
width="800"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
<el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
<el-button
type="primary"
:loading="loadSarStandard"
@click="handleSearchStandard">
根据类别、编号、中英文名称查询
</el-button>
</el-form-item>
<el-form-item style="display: none" v-if="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item>
<!--v-if="verifySarStandard && form.standInData === '0' " -->
<el-form-item v-if="verifySarStandard" label="标准年份" prop="" class="add-form-item form-item-disabled">
<el-input
v-model="form.standYear"
@@ -55,15 +114,32 @@
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
v-model="form.issueTime"
@@ -99,67 +175,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" multiple placeholder="国家/地区">
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
<el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
<el-button
type="primary"
:loading="loadSarStandard"
@click="handleSearchStandard">
根据类别、编号、中英文名称查询
</el-button>
</el-form-item>
<el-form-item style="display: none" v-if="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item>
<!--v-if="verifySarStandard && form.standInData === '0' " -->
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
:multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
:drawerTitle="drawerTitle"
width="800"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</el-form-item>
<el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option
@@ -179,15 +194,6 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+90 -82
View File
@@ -23,69 +23,53 @@
</ProcessTitle>
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" disabled>
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input
disabled
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.standInData" disabled>
<el-radio label="0">国内标准入库</el-radio>
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input
disabled
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
@@ -117,32 +101,53 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.gxhbq"
placeholder="请输入标签"
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
@@ -158,12 +163,15 @@
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-col :span="12">
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
v-model="form.gxhbq"
placeholder="请输入标签"
clearable
></el-input>
</el-form-item>
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+91 -84
View File
@@ -30,56 +30,120 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
v-for="item in standSortOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input
disabled
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
disabled
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
v-else
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio>
@@ -102,53 +166,6 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期">
</el-date-picker>
</el-form-item>
<el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -158,16 +175,6 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+45 -35
View File
@@ -60,20 +60,18 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
:multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
:drawerTitle="drawerTitle"
width="800"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -121,19 +119,40 @@
</el-radio-group>
<el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new
:key="key"
:multiple=false
:lazy=false
:modalShowFlag="modalShowFlag1"
:drawerTitle="drawerTitle"
width="800"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag">
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
v-model="form.gxhbq"
@@ -167,15 +186,6 @@
:nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+54 -46
View File
@@ -30,9 +30,7 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
@@ -62,28 +60,14 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -117,32 +101,53 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.issueTime"
type="date"
placeholder="请选择标准发布日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.gxhbq"
placeholder="请输入标签"
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="归档位置" class="add-form-item form-item-disabled">
<el-input
style="display: none"
@@ -158,12 +163,15 @@
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-col :span="12">
<el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
v-model="form.gxhbq"
placeholder="请输入标签"
clearable
></el-input>
</el-form-item>
@@ -536,7 +544,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-select :popper-append-to-body="false" disabled v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
<el-option
v-for="item in cyzbpmOptions"
placeholder="请选择"
@@ -558,8 +566,8 @@
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input
disabled
type="textarea"
disabled
v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
@@ -641,8 +649,8 @@
</el-tooltip>
<el-input
v-else
disabled
type="textarea"
disabled
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+5 -4
View File
@@ -315,17 +315,18 @@ export default {
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
console.log(res);
if (res.ok) {
if (this.fileTextList !== null) {
this.newDataList = this.fileTextList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
this.fileListData.fileText = this.newDataList
@@ -460,10 +461,10 @@ export default {
// 提交按钮
handleSubmit() {
this.isSubmit = true
let flag=false
let flag = false
this.dataList.forEach(item => {
if (item.fileText.length === 0) {
flag=true
flag = true
this.isSubmit = false
}
})
src/pages/processCenter/pages/phone/bzdy/step4.vue
+3 -3
View File
@@ -273,9 +273,9 @@
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.form ? data.form.fileId : data.fileId
this.form.fileName = data.form ? data.form.fileName : data.fileName
this.form.fileId = data.form ? data.form.fileId : data.fileId
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList
this.commentText4 = data.commentText4 || ''
src/pages/processCenter/pages/phone/bzjd/step4.vue
+10 -1
View File
@@ -26,8 +26,9 @@
<van-field label="标准名称" v-model="form.itemsName" readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准号/政策号" v-model="form.itemsNum1" readonly />
<van-field v-if="sarType === 'FOREIGN'" label="相对标准号/政策号" v-model="form.itemsNum1" readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准名称/政策名称" v-model="form.itemsName1"readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准名称/政策名称" v-model="form.itemsName1" readonly />
<van-field v-if="sarType === 'FOREIGN'" label="相对标准名称/政策名称" v-model="form.itemsName1" readonly />
<van-field label="截止日期" v-model="form.endTime" readonly />
</van-cell-group>
</div>
</el-collapse-transition>
@@ -230,10 +231,17 @@
:saveLoading="saveLoading"
@submit="handleSubmit"
show-back
show-transfer
@transfer="handleTransfer"
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
<phone-role
role-title="转办处理人"
:is-show-phone.sync="drawerModal"
@checkedRole="checkedRole"
/>
<el-dialog
title="查看比对内容"
:visible.sync="BDmodel"
@@ -439,6 +447,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText4 = data.commentText4 || ''
src/pages/processCenter/pages/phone/bzjd/step5.vue
+10 -2
View File
@@ -25,8 +25,9 @@
<van-field label="标准名称" v-model="form.itemsName" readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准号/政策号" v-model="form.itemsNum1" readonly />
<van-field v-if="sarType === 'FOREIGN'" label="相对标准号/政策号" v-model="form.itemsNum1" readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准名称/政策名称" v-model="form.itemsName1"readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准名称/政策名称" v-model="form.itemsName1" readonly />
<van-field v-if="sarType === 'FOREIGN'" label="相对标准名称/政策名称" v-model="form.itemsName1" readonly />
<van-field label="截止日期" v-model="form.endTime" readonly />
</div>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
@@ -239,11 +240,17 @@
:saveLoading="saveLoading"
@submit="handleSubmit"
show-back
show-transfer
@transfer="handleTransfer"
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
<phone-role
role-title="转办处理人"
:is-show-phone.sync="drawerModal"
@checkedRole="checkedRole"
/>
<van-dialog v-model="dialogMadal" title="条款内容" @confirm="dialogOk">
<div v-html="itermsConditionsTitle"></div>
</van-dialog>
@@ -438,6 +445,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText5 = data.commentText5 || ''
src/pages/processCenter/pages/phone/bzjd/step6.vue
+10 -1
View File
@@ -25,8 +25,9 @@
<van-field label="标准名称" v-model="form.itemsName" readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准号/政策号" v-model="form.itemsNum1" readonly />
<van-field v-if="sarType === 'FOREIGN'" label="相对标准号/政策号" v-model="form.itemsNum1" readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准名称/政策名称" v-model="form.itemsName1"readonly />
<van-field v-if="sarType === 'INLAND'" label="上一版本标准名称/政策名称" v-model="form.itemsName1" readonly />
<van-field v-if="sarType === 'FOREIGN'" label="相对标准名称/政策名称" v-model="form.itemsName1" readonly />
<van-field label="截止日期" v-model="form.endTime" readonly />
</div>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
@@ -228,10 +229,17 @@
:saveLoading="saveLoading"
@submit="handleSubmit"
show-back
show-transfer
@transfer="handleTransfer"
@back="handleSubmitNo"
submitBTNText="同意"
>
</ProcessFooter>
<phone-role
role-title="转办处理人"
:is-show-phone.sync="drawerModal"
@checkedRole="checkedRole"
/>
<el-dialog
title="查看比对内容"
:visible.sync="BDmodel"
@@ -437,6 +445,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText6 = data.commentText6 || ''
src/pages/processCenter/pages/phone/wfhxzg/step3.vue
-26
View File
@@ -93,13 +93,11 @@
<ProcessFooter
show-save
show-submit
show-back
show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:transferLoading="turnLoading"
@transfer="handleTurnTo"
@back="handleSubmitNo"
@save="handleSave"
@submit="handleSubmit"
>
@@ -241,30 +239,6 @@ export default {
this.modalshowflag = true
this.roleTitle = '转办处理人'
},
// 退回按钮
handleSubmitNo() {
if (this.textarea) {
var json = {
passInfo: 1,
actionFlag: 1,
commentText: this.textarea,
standardInfoList: this.standardInfoList,
}
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.account)
params.set('taskIds', this.taskIds)
completeTask(params).then(res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+10 -7
View File
@@ -1661,11 +1661,14 @@
</el-option>
</el-select>
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<!-- 备案日期 目前不确定是否需要 暂时隐藏 -->
<el-form-item style="display: none" label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.BARQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-date-picker>
@@ -3763,8 +3766,8 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
type: 'between',
value: value.join(',')
});
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
} else if (value !== null && value !== '') {
@@ -4618,8 +4621,8 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'equals',
value: value
type: 'between',
value: value.join(',')
});
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
} else if (value !== null && value !== '') {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+10 -6
View File
@@ -1155,13 +1155,15 @@
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-datePicker
:editable="false"
<el-date-picker
v-model="sarBussionessSearch.BARQ"
type="date"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
placeholder="根据备案日期查找">
</el-datePicker>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -4358,6 +4360,7 @@ export default {
// 清空搜索框
clearAllSearch(flag) {
if (flag === 'sarBussionessSearch') {
console.log('1');
// 标准搜索
this.sarBussionessSearch.applyCountry = ''
this.sarBussionessSearch.standGenera = ''
@@ -4394,6 +4397,7 @@ export default {
this.sarBussionessSearch.QCRBUSS = ''
this.sarBussionessSearch.QCDW = ''
this.sarBussionessSearch.FZRQBUSS = ''
this.sarBussionessSearch.BARQ = ''
this.sarBussionessSearch.FSRQBUSS = ''
this.sarBussionessSearch.DTQBBHBUSS = ''
this.sarBussionessSearch.BDTQBBHBUSS = ''
@@ -4510,8 +4514,8 @@ export default {
advanceSearchVOList.push({
connect: "and",
field: item.attrField || "",
type: 'EQUALS',
value: value
type: "between",
value: (value ? value[0]+','+value[1] : "") || "",
});
}else if (value !== undefined && value !== null && value !== "" && (item.attrField === 'FZRQBUSS' || item.attrField === 'FSRQBUSS')) {
advanceSearchVOList.push({
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+7 -8
View File
@@ -510,8 +510,8 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<!-- 备案日期 目前不确定是否需要 暂时隐藏 -->
<el-form-item style="display: none" label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="advanceSearchMapping.BARQ"
type="date"
@@ -519,6 +519,11 @@
placeholder="根据备案日期查找">
</el-date-picker>
</el-form-item>
<!-- 标签-->
<el-form-item label="标签" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 标准类别-->
@@ -549,12 +554,6 @@
<el-option value="2" label="否"></el-option>
</el-select>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>