Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
yanyizhou
@@ -5501,8 +5501,6 @@ export default {
|
||||
this.sarStandardsInfoEO['ZRGCS'] = nameList;
|
||||
},
|
||||
choiceZRBM(type, title, id) {
|
||||
|
||||
|
||||
this.nodeListZRBM = []
|
||||
this.nodeListZRBM.push(id)
|
||||
this.drawerTitle = title
|
||||
|
||||
@@ -258,30 +258,40 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||
<div style="display: flex;justify-content: space-between;align-items: center;">
|
||||
<el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">
|
||||
<el-input
|
||||
:disabled="DrawerType === 'see'"
|
||||
clearable
|
||||
v-model="addForm.unit"
|
||||
placeholder="选择或输入起草单位">
|
||||
</el-input>
|
||||
</el-tooltip>
|
||||
<div v-else>
|
||||
<el-input
|
||||
:disabled="DrawerType === 'see'"
|
||||
clearable
|
||||
v-model="addForm.unit"
|
||||
placeholder="选择或输入起草单位">
|
||||
</el-input>
|
||||
</div>
|
||||
<div>
|
||||
<el-button
|
||||
:disabled="DrawerType === 'see'"
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="QCDWClick"
|
||||
class="common-button-primary">手动查找</el-button>
|
||||
</div>
|
||||
<el-input
|
||||
:key="addForm.unit"
|
||||
:config="addForm"
|
||||
clearable
|
||||
v-model="addForm.unit"
|
||||
placeholder="请选择起草责任单位"
|
||||
@click.native="choiceZRBM(addForm.unit)">
|
||||
</el-input>
|
||||
|
||||
<!-- <el-tooltip v-if="addForm.unit" class="item" effect="dark" :content="addForm.unit" placement="top-start">-->
|
||||
<!-- <el-input-->
|
||||
<!-- :disabled="DrawerType === 'see'"-->
|
||||
<!-- clearable-->
|
||||
<!-- v-model="addForm.unit"-->
|
||||
|
||||
<!-- placeholder="选择或输入起草单位">-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </el-tooltip>-->
|
||||
<!-- <div v-else>-->
|
||||
<!-- <el-input-->
|
||||
<!-- :disabled="DrawerType === 'see'"-->
|
||||
<!-- clearable-->
|
||||
<!-- v-model="addForm.unit"-->
|
||||
<!-- placeholder="选择或输入起草单位">-->
|
||||
<!-- </el-input>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div>-->
|
||||
<!-- <el-button-->
|
||||
<!-- :disabled="DrawerType === 'see'"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="primary"-->
|
||||
<!-- @click="QCDWClick"-->
|
||||
<!-- class="common-button-primary">手动查找</el-button>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -340,6 +350,12 @@
|
||||
</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<Mechanism-tree
|
||||
is-title="选择起草责任部门"
|
||||
:is-visible.sync="modalshowflagZRBM"
|
||||
:nodeList="nodeListZRBM"
|
||||
@checkedRole="drawerCheckZRBM"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -350,6 +366,9 @@
|
||||
components: {},
|
||||
data() {
|
||||
return {
|
||||
modalshowflagZRBM: false,
|
||||
nodeListZRBM: [],
|
||||
|
||||
QCDWmodal: false,
|
||||
QCDWValue: [],
|
||||
QCDWList: [],
|
||||
@@ -425,6 +444,24 @@
|
||||
props: {},
|
||||
watch: {},
|
||||
methods: {
|
||||
drawerCheckZRBM (data) {
|
||||
let list = ''
|
||||
for (let a = 0; a < data.length; a++) {
|
||||
if (list.length > 0) {
|
||||
list += ','
|
||||
list += data[a].name
|
||||
} else {
|
||||
list = data[a].name
|
||||
}
|
||||
}
|
||||
this.addForm.unit = list
|
||||
this.modalshowflagZRBM = false
|
||||
},
|
||||
choiceZRBM(id) {
|
||||
this.nodeListZRBM = []
|
||||
this.nodeListZRBM = id.split(',')
|
||||
this.modalshowflagZRBM = true
|
||||
},
|
||||
QCDWOK () {
|
||||
let arr1 = []
|
||||
if (this.addForm.unit) {
|
||||
|
||||
@@ -35,7 +35,12 @@
|
||||
@click="handleQueryPdf(file)"
|
||||
:key="item">
|
||||
{{ file.name }}
|
||||
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="downloadFile(file.attId)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -51,7 +56,12 @@
|
||||
@click="handleQueryPdf(file)"
|
||||
:key="item">
|
||||
{{ file.name }}
|
||||
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
@click="downloadFile(file.attId)"
|
||||
icon="el-icon-download"
|
||||
style="height: 32px; margin-left: 5px;"
|
||||
></el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -73,6 +83,7 @@
|
||||
添加
|
||||
</el-button>
|
||||
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
|
||||
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll1">导出上报意见</el-button>
|
||||
</div>
|
||||
<div class="container">
|
||||
<el-table
|
||||
@@ -309,6 +320,9 @@ export default {
|
||||
exportAll() {
|
||||
window.open('/api/slrs/sar-public-idea-all/tuallStand?cid=' + this.$route.query.item.cid)
|
||||
},
|
||||
exportAll1() {
|
||||
window.open('/api/slrs/sar-public-idea-all/tuallStand?type=1&cid=' + this.$route.query.item.id)
|
||||
},
|
||||
getIdeaKey() {
|
||||
this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
|
||||
endTime: this.form.endTime
|
||||
|
||||
Reference in New Issue
Block a user