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-12-09 17:35:02 +08:00
parent cc7e7d9c94 3960a1df16
commit 78e48a622f
5 changed files with 108 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+18 -6
View File
@@ -97,12 +97,24 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<el-input <div v-if="qbfsForm.unit.length > 0">
readonly <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
v-model="qbfsForm.unit" <el-input
placeholder="请输入起草责任单位" readonly
clearable v-model="qbfsForm.unit"
></el-input> placeholder="请输入起草责任单位"
clearable
></el-input>
</el-tooltip>
</div>
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
placeholder="请输入起草责任单位"
clearable
></el-input>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+18 -6
View File
@@ -105,12 +105,24 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<el-input <div v-if="qbfsForm.unit.length > 0">
readonly <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
v-model="qbfsForm.unit" <el-input
placeholder="请输入起草责任单位" readonly
clearable v-model="qbfsForm.unit"
></el-input> placeholder="请输入起草责任单位"
clearable
></el-input>
</el-tooltip>
</div>
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
placeholder="请输入起草责任单位"
clearable
></el-input>
</div>
</el-form-item> </el-form-item>
<el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled"> <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+27 -27
View File
@@ -64,33 +64,33 @@
placeholder="请选择计划标准发布时间"> placeholder="请选择计划标准发布时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" > <!-- <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
<div style="display: flex;justify-content: space-between;align-items: center;"> <!-- <div style="display: flex;justify-content: space-between;align-items: center;">-->
<el-input <!-- <el-input-->
clearable <!-- clearable-->
v-model="qbfsForm.unit" <!-- v-model="qbfsForm.unit"-->
placeholder="选择或输入起草单位"> <!-- placeholder="选择或输入起草单位">-->
</el-input> <!-- </el-input>-->
<div> <!-- <div>-->
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="primary" <!-- type="primary"-->
@click="QCDWClick" <!-- @click="QCDWClick"-->
class="common-button-primary">手动查找</el-button> <!-- class="common-button-primary">手动查找</el-button>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</el-form-item>
<!-- <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">-->
<!-- <el-select v-model="qbfsForm.unit" filterable multiple clearable>-->
<!-- <el-option-->
<!-- v-for="item in qcdwOptions"-->
<!-- placeholder="请选择起草责任单位"-->
<!-- :key="item.value"-->
<!-- :value="item.label"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.unit" filterable multiple clearable>
<el-option
v-for="item in qcdwOptions"
placeholder="请选择起草责任单位"
:key="item.value"
:value="item.label"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled"> <el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input <el-input
type="textarea" type="textarea"
@@ -185,7 +185,7 @@ export default {
}, },
qbfsFormRules: { qbfsFormRules: {
unit: [ unit: [
{required: true, message: '请输入单位', trigger: 'blur'}, {required: true, message: '请选择起草单位', trigger: 'change'},
], ],
esName: [ esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'}, {required: true, message: '请输入企标名称', trigger: 'blur'},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+27 -16
View File
@@ -81,22 +81,33 @@
placeholder="请选择初稿完成时间"> placeholder="请选择初稿完成时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" > <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<div style="display: flex;justify-content: space-between;align-items: center;"> <el-select v-model="qbfsForm.unit" filterable multiple clearable>
<el-input <el-option
clearable v-for="item in qcdwOptions"
v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
placeholder="选择或输入起草单位"> :key="item.value"
</el-input> :value="item.label"
<div> :label="item.label"
<el-button ></el-option>
size="mini" </el-select>
type="primary"
@click="QCDWClick"
class="common-button-primary">手动查找</el-button>
</div>
</div>
</el-form-item> </el-form-item>
<!-- <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
<!-- <div style="display: flex;justify-content: space-between;align-items: center;">-->
<!-- <el-input-->
<!-- clearable-->
<!-- v-model="qbfsForm.unit"-->
<!-- placeholder="选择或输入起草单位">-->
<!-- </el-input>-->
<!-- <div>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="QCDWClick"-->
<!-- class="common-button-primary">手动查找</el-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -340,7 +351,7 @@ export default {
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'}, {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
], ],
unit: [ unit: [
{required: true, message: '请输入单位', trigger: 'blur'}, {required: true, message: '请选择起草单位', trigger: 'change'},
], ],
esName: [ esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'}, {required: true, message: '请输入企标名称', trigger: 'blur'},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+18 -6
View File
@@ -96,12 +96,24 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<el-input <div v-if="qbfsForm.unit.length > 0">
readonly <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
v-model="qbfsForm.unit" <el-input
placeholder="请输入起草责任单位" readonly
clearable v-model="qbfsForm.unit"
></el-input> placeholder="请输入起草责任单位"
clearable
></el-input>
</el-tooltip>
</div>
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
placeholder="请输入起草责任单位"
clearable
></el-input>
</div>
</el-form-item> </el-form-item>
<el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled"> <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input <el-input