Merge branch 'develop' into 'FOTON'
Develop See merge request LAWS/laws-system-front-FOTON!290
This commit is contained in:
王夏晖
@@ -266,9 +266,9 @@
|
|||||||
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
|
<p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
|
||||||
sarStandardsInfoEO.issueTime || '-'
|
sarStandardsInfoEO.issueTime || '-'
|
||||||
}}</span></p>
|
}}</span></p>
|
||||||
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{
|
<!-- <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
|
||||||
standMap[sarStandardsInfoEO.standNature] || '-'
|
<!-- standMap[sarStandardsInfoEO.standNature] || '-'-->
|
||||||
}}</span></p>
|
<!-- }}</span></p>-->
|
||||||
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
|
<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
|
||||||
style=" margin-right: 150px;">标准体系</label><span>{{
|
style=" margin-right: 150px;">标准体系</label><span>{{
|
||||||
sarStandardsInfoEO.standSystem || '-'
|
sarStandardsInfoEO.standSystem || '-'
|
||||||
@@ -374,7 +374,7 @@
|
|||||||
v-else-if="child.attrType === 'DATE_PICKER'"
|
v-else-if="child.attrType === 'DATE_PICKER'"
|
||||||
class="modular-content-p-val"
|
class="modular-content-p-val"
|
||||||
>
|
>
|
||||||
{{ child.value ? child.value.substring(0, 10) : '-' }}
|
{{ child.value ? child.value : '-' }}
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
v-else-if="child.attrType !== 'FILE'"
|
v-else-if="child.attrType !== 'FILE'"
|
||||||
@@ -3124,7 +3124,6 @@ export default {
|
|||||||
},
|
},
|
||||||
// 分解单----查看标准条款相关
|
// 分解单----查看标准条款相关
|
||||||
selectSarStandItems(id, flag) {
|
selectSarStandItems(id, flag) {
|
||||||
this.page7 = 1
|
|
||||||
this.standItemSearch.standId = this.sarStandardsInfoEO.id
|
this.standItemSearch.standId = this.sarStandardsInfoEO.id
|
||||||
this.standItemSearch.fileType = this.fileType
|
this.standItemSearch.fileType = this.fileType
|
||||||
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
|
this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
|
||||||
@@ -3675,6 +3674,7 @@ export default {
|
|||||||
// return
|
// return
|
||||||
// }
|
// }
|
||||||
displayLocation.forEach((location) => {
|
displayLocation.forEach((location) => {
|
||||||
|
console.log(location);
|
||||||
location.isShowImp = '0'
|
location.isShowImp = '0'
|
||||||
if (dynamicFormField) {
|
if (dynamicFormField) {
|
||||||
let value = dynamicFormField[field.attrField]
|
let value = dynamicFormField[field.attrField]
|
||||||
|
|||||||
@@ -380,7 +380,7 @@
|
|||||||
name="file"
|
name="file"
|
||||||
drag
|
drag
|
||||||
:file-list="rh_pageData.infoSources"
|
:file-list="rh_pageData.infoSources"
|
||||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
|
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF, .pptx"
|
||||||
:http-request="httpRequest"
|
:http-request="httpRequest"
|
||||||
:before-upload="handleBeforeUpload"
|
:before-upload="handleBeforeUpload"
|
||||||
:before-remove="handleBeforeRemove"
|
:before-remove="handleBeforeRemove"
|
||||||
@@ -603,7 +603,7 @@ export default {
|
|||||||
// 判断上传文件格式
|
// 判断上传文件格式
|
||||||
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
|
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
|
||||||
|| fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
|
|| fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
|
||||||
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
|
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
|
||||||
|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
|
|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp') {
|
||||||
return true
|
return true
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -142,7 +142,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="身份:">
|
<el-form-item class="add-form-item" label="职务/名称:">
|
||||||
<el-input
|
<el-input
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
placeholder="请填写身份"
|
placeholder="请填写身份"
|
||||||
@@ -181,6 +181,8 @@
|
|||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="add-form-item" label="资料:">
|
<el-form-item class="add-form-item" label="资料:">
|
||||||
<el-upload
|
<el-upload
|
||||||
|
|||||||
@@ -81,7 +81,7 @@
|
|||||||
</a>
|
</a>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="previews(item.id)"
|
@click="previews(item.id, 'down')"
|
||||||
icon="el-icon-download"
|
icon="el-icon-download"
|
||||||
style="height: 25px; margin-left: 5px;"
|
style="height: 25px; margin-left: 5px;"
|
||||||
></el-button>
|
></el-button>
|
||||||
@@ -120,14 +120,20 @@
|
|||||||
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
||||||
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
||||||
<el-table-column prop="fillDept" align="center" label="部门"/>
|
<el-table-column prop="fillDept" align="center" label="部门"/>
|
||||||
<el-table-column prop="fillPost" align="center" label="身份"/>
|
<el-table-column prop="fillPost" align="center" label="职务/名称"/>
|
||||||
<el-table-column prop="fillTel" align="center" label="电话"/>
|
<el-table-column prop="fillTel" align="center" label="电话"/>
|
||||||
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
||||||
<el-table-column prop="fillFile" align="center" label="资料">
|
<el-table-column prop="fillFile" align="center" label="资料">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
|
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
|
||||||
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
|
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id, 'onLine')">
|
||||||
{{ item.name }} {{ ';' }}
|
{{ item.name }} {{ ';' }}
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
@click="previews(item.id, 'down')"
|
||||||
|
icon="el-icon-download"
|
||||||
|
style="height: 25px; margin-left: 5px;"
|
||||||
|
></el-button>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -417,10 +423,14 @@ export default {
|
|||||||
this.$preview(attId)
|
this.$preview(attId)
|
||||||
},
|
},
|
||||||
/** 点击对应附件进行下载*/
|
/** 点击对应附件进行下载*/
|
||||||
previews(val) {
|
previews(val,type) {
|
||||||
let attId = val
|
let attId = val
|
||||||
if (attId != null && attId !== "") {
|
if (attId != null && attId !== "") {
|
||||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
if (type === 'down') {
|
||||||
|
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||||
|
} else {
|
||||||
|
this.$preview(attId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -176,7 +176,7 @@
|
|||||||
{{ scope.row.fillDept || '' }}
|
{{ scope.row.fillDept || '' }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="fillPost" align="center" label="身份">
|
<el-table-column prop="fillPost" align="center" label="职务/名称">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.fillPost || '' }}
|
{{ scope.row.fillPost || '' }}
|
||||||
</template>
|
</template>
|
||||||
@@ -368,6 +368,7 @@
|
|||||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
|
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
|
||||||
:http-request="httpRequest"
|
:http-request="httpRequest"
|
||||||
:before-upload="handleBeforeUpload"
|
:before-upload="handleBeforeUpload"
|
||||||
|
:on-preview="handlePreview"
|
||||||
:before-remove="handleBeforeRemove"
|
:before-remove="handleBeforeRemove"
|
||||||
:on-success="handleOnsuccess"
|
:on-success="handleOnsuccess"
|
||||||
>
|
>
|
||||||
@@ -625,6 +626,13 @@ export default {
|
|||||||
this.fileListData.fillFile = this.reData
|
this.fileListData.fillFile = this.reData
|
||||||
},
|
},
|
||||||
|
|
||||||
|
handlePreview(file) {
|
||||||
|
let attId = file.id
|
||||||
|
if (attId != null && attId !== "") {
|
||||||
|
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
handleClose() {
|
handleClose() {
|
||||||
this.upDialog = false
|
this.upDialog = false
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -114,7 +114,7 @@
|
|||||||
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
||||||
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
||||||
<el-table-column prop="fillDept" align="center" label="部门"/>
|
<el-table-column prop="fillDept" align="center" label="部门"/>
|
||||||
<el-table-column prop="fillPost" align="center" label="身份"/>
|
<el-table-column prop="fillPost" align="center" label="职务/名称"/>
|
||||||
<el-table-column prop="fillTel" align="center" label="电话"/>
|
<el-table-column prop="fillTel" align="center" label="电话"/>
|
||||||
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
||||||
<el-table-column prop="fillFile" align="center" label="资料">
|
<el-table-column prop="fillFile" align="center" label="资料">
|
||||||
|
|||||||
@@ -125,7 +125,7 @@
|
|||||||
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
<el-table-column prop="fillPeople" align="center" label="参与人"/>
|
||||||
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
<el-table-column prop="fillUnit" align="center" label="单位"/>
|
||||||
<el-table-column prop="fillDept" align="center" label="部门"/>
|
<el-table-column prop="fillDept" align="center" label="部门"/>
|
||||||
<el-table-column prop="fillPost" align="center" label="身份"/>
|
<el-table-column prop="fillPost" align="center" label="职务/名称"/>
|
||||||
<el-table-column prop="fillTel" align="center" label="电话"/>
|
<el-table-column prop="fillTel" align="center" label="电话"/>
|
||||||
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
<el-table-column prop="fillMail" align="center" label="邮箱"/>
|
||||||
<el-table-column prop="fillFile" align="center" label="资料">
|
<el-table-column prop="fillFile" align="center" label="资料">
|
||||||
|
|||||||
@@ -312,7 +312,7 @@
|
|||||||
name="file"
|
name="file"
|
||||||
drag
|
drag
|
||||||
:file-list="ch_pageData.fileTextList"
|
:file-list="ch_pageData.fileTextList"
|
||||||
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
|
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF,.pptx"
|
||||||
:http-request="httpRequest"
|
:http-request="httpRequest"
|
||||||
:before-upload="handleBeforeUpload"
|
:before-upload="handleBeforeUpload"
|
||||||
:before-remove="handleBeforeRemove"
|
:before-remove="handleBeforeRemove"
|
||||||
@@ -539,7 +539,7 @@ export default {
|
|||||||
// 判断上传文件格式
|
// 判断上传文件格式
|
||||||
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
|
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip'
|
||||||
|| fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
|
|| fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF'
|
||||||
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.PPT'
|
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || fileSuffix === '.pptx'
|
||||||
|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp'
|
|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.bmp'
|
||||||
) {
|
) {
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -1695,6 +1695,17 @@ export default {
|
|||||||
filterText(val) {
|
filterText(val) {
|
||||||
this.$refs.tree.filter(val);
|
this.$refs.tree.filter(val);
|
||||||
},
|
},
|
||||||
|
'form.standInData' : {
|
||||||
|
handler: function () {
|
||||||
|
if(this.form.standInData === '1') {
|
||||||
|
this.rules.standYear[0].required = false;
|
||||||
|
this.rules.standName[0].required = false
|
||||||
|
} else {
|
||||||
|
this.rules.standYear[0].required = true;
|
||||||
|
this.rules.standName[0].required = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
/*'form.standInData': {
|
/*'form.standInData': {
|
||||||
handler: function (val) {
|
handler: function (val) {
|
||||||
this.verifySarStandard = false
|
this.verifySarStandard = false
|
||||||
@@ -1840,14 +1851,10 @@ export default {
|
|||||||
this.rules.standName[0].required = false
|
this.rules.standName[0].required = false
|
||||||
this.rules.standEnName[0].required = true;
|
this.rules.standEnName[0].required = true;
|
||||||
this.rules.standNature[0].required = false
|
this.rules.standNature[0].required = false
|
||||||
this.rules.standYear[0].required = false;
|
|
||||||
this.rules.standName[0].required = false
|
|
||||||
} else {
|
} else {
|
||||||
this.rules.standName[0].required = true
|
this.rules.standName[0].required = true
|
||||||
this.rules.standNature[0].required = true
|
this.rules.standNature[0].required = true
|
||||||
this.rules.standEnName[0].required = false;
|
this.rules.standEnName[0].required = false;
|
||||||
this.rules.standYear[0].required = true;
|
|
||||||
this.rules.standName[0].required = true
|
|
||||||
}
|
}
|
||||||
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
|
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
|
||||||
//切换清空表单
|
//切换清空表单
|
||||||
@@ -3054,6 +3061,8 @@ export default {
|
|||||||
this.isSubmit = false
|
this.isSubmit = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
this.isSubmit = false
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -158,6 +158,7 @@
|
|||||||
:disabled="true"
|
:disabled="true"
|
||||||
></custom-date-pick-group>
|
></custom-date-pick-group>
|
||||||
<custom-date-pick-group
|
<custom-date-pick-group
|
||||||
|
:labelWidth="210"
|
||||||
:key="'zccssrq'"
|
:key="'zccssrq'"
|
||||||
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
|
:config="{attrName:'在产车实施日期(标准文本)',attrField:'zccssrq'}"
|
||||||
v-model="form.zccssrq"
|
v-model="form.zccssrq"
|
||||||
@@ -184,6 +185,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<custom-date-pick-group
|
<custom-date-pick-group
|
||||||
|
:labelWidth="210"
|
||||||
:key="'zccssrq'"
|
:key="'zccssrq'"
|
||||||
:config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
|
:config="{attrName:'新车型实施日期(标准文本)',attrField:'zccssrq'}"
|
||||||
v-model="form.xcxssrq"
|
v-model="form.xcxssrq"
|
||||||
@@ -421,14 +423,14 @@
|
|||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>-->
|
</el-form-item>-->
|
||||||
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
|
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="210px" prop="cycvppscn" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.cycvppscn"
|
v-model="form.cycvppscn"
|
||||||
disabled
|
disabled
|
||||||
clearable
|
clearable
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" class="add-form-item form-item-disabled">
|
<el-form-item label="关联模块--卡车vpps中文名称" label-width="210px" prop="kccvppscn" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.kccvppscn"
|
v-model="form.kccvppscn"
|
||||||
disabled
|
disabled
|
||||||
|
|||||||
@@ -55,14 +55,14 @@
|
|||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="标准年份" v-show="form.standInData === '0'" prop="standYear" class="add-form-item form-item-disabled">
|
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.standYear"
|
v-model="form.standYear"
|
||||||
placeholder="请输入标准标准年份"
|
placeholder="请输入标准标准年份"
|
||||||
clearable
|
clearable
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="标准中文名称"v-show="form.standInData === '0'" prop="standName" class="add-form-item form-item-disabled">
|
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="form.standName"
|
v-model="form.standName"
|
||||||
placeholder="请输入标准中文名称"
|
placeholder="请输入标准中文名称"
|
||||||
@@ -125,6 +125,7 @@
|
|||||||
<el-radio label="1">是</el-radio>
|
<el-radio label="1">是</el-radio>
|
||||||
<el-radio label="2">否</el-radio>
|
<el-radio label="2">否</el-radio>
|
||||||
</el-radio-group>
|
</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>
|
||||||
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
|
||||||
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
|
<el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
|
||||||
@@ -1688,14 +1689,10 @@ export default {
|
|||||||
this.rules.standName[0].required = false
|
this.rules.standName[0].required = false
|
||||||
this.rules.standEnName[0].required = true;
|
this.rules.standEnName[0].required = true;
|
||||||
this.rules.standNature[0].required = false
|
this.rules.standNature[0].required = false
|
||||||
this.rules.standYear[0].required = false;
|
|
||||||
this.rules.standName[0].required = false
|
|
||||||
} else {
|
} else {
|
||||||
this.rules.standName[0].required = true
|
this.rules.standName[0].required = true
|
||||||
this.rules.standNature[0].required = true
|
this.rules.standNature[0].required = true
|
||||||
this.rules.standEnName[0].required = false;
|
this.rules.standEnName[0].required = false;
|
||||||
this.rules.standYear[0].required = true;
|
|
||||||
this.rules.standName[0].required = true
|
|
||||||
}
|
}
|
||||||
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
|
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
|
||||||
},
|
},
|
||||||
@@ -2662,6 +2659,17 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
'form.standInData' : {
|
||||||
|
handler: function () {
|
||||||
|
if(this.form.standInData === '1') {
|
||||||
|
this.rules.standYear[0].required = false;
|
||||||
|
this.rules.standName[0].required = false
|
||||||
|
} else {
|
||||||
|
this.rules.standYear[0].required = true;
|
||||||
|
this.rules.standName[0].required = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
form(val){
|
form(val){
|
||||||
if(this.form){
|
if(this.form){
|
||||||
|
|
||||||
|
|||||||
@@ -162,7 +162,7 @@
|
|||||||
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
|
<el-input v-model="roleForm.ministerUser" style="display: none;"/>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="roleForm.ministerUserName"
|
v-model="roleForm.ministerUserName"
|
||||||
placeholder="选择标准法规部部长·"
|
placeholder="选择标准法规部部长"
|
||||||
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
|
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,11 +12,11 @@
|
|||||||
<div class="content" v-show="active === '1'">
|
<div class="content" v-show="active === '1'">
|
||||||
<div style="flex: auto; overflow: auto;">
|
<div style="flex: auto; overflow: auto;">
|
||||||
<el-form
|
<el-form
|
||||||
ref="bzzqyjForm"
|
ref="bzzqyjForm"
|
||||||
:model="form"
|
:model="form"
|
||||||
:rules="formRules"
|
:rules="formRules"
|
||||||
class="label-input-form"
|
class="label-input-form"
|
||||||
label-width="210px"
|
label-width="210px"
|
||||||
>
|
>
|
||||||
<ProcessTitle>
|
<ProcessTitle>
|
||||||
<template slot="title">基础信息</template>
|
<template slot="title">基础信息</template>
|
||||||
@@ -26,18 +26,18 @@
|
|||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
|
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
|
||||||
<el-input
|
<el-input
|
||||||
disabled
|
disabled
|
||||||
v-model="form.cid"
|
v-model="form.cid"
|
||||||
placeholder="请输入标准编号"
|
placeholder="请输入标准编号"
|
||||||
clearable
|
clearable
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
disabled
|
disabled
|
||||||
v-model="form.endTime"
|
v-model="form.endTime"
|
||||||
type="date"
|
type="date"
|
||||||
placeholder="请选择结束日期">
|
placeholder="请选择结束日期">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
|
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
|
||||||
@@ -76,6 +76,14 @@
|
|||||||
- -
|
- -
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="审批领导" prop="user7" class="add-form-item form-item-disabled">
|
||||||
|
<el-input
|
||||||
|
v-model="form.user7"
|
||||||
|
style="display: none;"
|
||||||
|
clearable
|
||||||
|
></el-input>
|
||||||
|
<el-input v-model="form.user7Name" readonly placeholder="请选择审批领导" @click.native="choiceZRR"></el-input>
|
||||||
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
@@ -96,71 +104,71 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
ref="multipleTable"
|
ref="multipleTable"
|
||||||
:data="data"
|
:data="data"
|
||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
border
|
border
|
||||||
style="width: 100%; flex: auto;"
|
style="width: 100%; flex: auto;"
|
||||||
class="drag-table"
|
class="drag-table"
|
||||||
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
|
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
|
||||||
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}">
|
fontWeight: 'bold', height: '48px'}">
|
||||||
<el-table-column
|
<el-table-column
|
||||||
type="index"
|
type="index"
|
||||||
label="序号"
|
label="序号"
|
||||||
width="55"
|
width="55"
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="chapterNumber"
|
prop="chapterNumber"
|
||||||
align="center"
|
align="center"
|
||||||
sortable
|
sortable
|
||||||
label="章条编号"
|
label="章条编号"
|
||||||
width="101px">
|
width="101px">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="chapterName"
|
prop="chapterName"
|
||||||
align="center"
|
align="center"
|
||||||
width="200px"
|
width="200px"
|
||||||
label="章节名称">
|
label="章节名称">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="commentText"
|
prop="commentText"
|
||||||
align="center"
|
align="center"
|
||||||
label="修改意见内容（包括理由或依据）">
|
label="修改意见内容（包括理由或依据）">
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="oldText"
|
prop="oldText"
|
||||||
align="center"
|
align="center"
|
||||||
label="修改前">
|
label="修改前">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
|
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newText"
|
prop="newText"
|
||||||
align="center"
|
align="center"
|
||||||
label="修改后">
|
label="修改后">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="reason"
|
prop="reason"
|
||||||
align="center"
|
align="center"
|
||||||
label="修改理由">
|
label="修改理由">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="department"
|
prop="department"
|
||||||
align="center"
|
align="center"
|
||||||
label="提出部门">
|
label="提出部门">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="responUserName"
|
prop="responUserName"
|
||||||
align="center"
|
align="center"
|
||||||
label="提出人">
|
label="提出人">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="state"
|
prop="state"
|
||||||
align="center"
|
align="center"
|
||||||
label="处理意见">
|
label="处理意见">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div>{{ stateText(scope.row.state) }}</div>
|
<div>{{ stateText(scope.row.state) }}</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -171,11 +179,11 @@
|
|||||||
<el-collapse-item title="审批意见">
|
<el-collapse-item title="审批意见">
|
||||||
<div style="margin: 10px 0;">
|
<div style="margin: 10px 0;">
|
||||||
<el-input
|
<el-input
|
||||||
type="textarea"
|
type="textarea"
|
||||||
:rows="3"
|
:rows="3"
|
||||||
resize="none"
|
resize="none"
|
||||||
placeholder="请输入意见"
|
placeholder="请输入意见"
|
||||||
v-model="commentText6">
|
v-model="commentText6">
|
||||||
</el-input>
|
</el-input>
|
||||||
</div>
|
</div>
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
@@ -183,24 +191,24 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="content" v-show="active === '2'">
|
<div class="content" v-show="active === '2'">
|
||||||
<el-table
|
<el-table
|
||||||
height="100%"
|
height="100%"
|
||||||
ref="selection"
|
ref="selection"
|
||||||
:data="histortData"
|
:data="histortData"
|
||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
border
|
border
|
||||||
row-key="id"
|
row-key="id"
|
||||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="name"
|
prop="name"
|
||||||
label="任务步骤"
|
label="任务步骤"
|
||||||
align="center"
|
align="center"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="assignee"
|
prop="assignee"
|
||||||
label="任务受理人"
|
label="任务受理人"
|
||||||
align="center"
|
align="center"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -220,17 +228,17 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="comment"
|
prop="comment"
|
||||||
label="流程信息"
|
label="流程信息"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.commentText }}</span>
|
<span>{{ scope.row.commentText }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="completeFlag"
|
prop="completeFlag"
|
||||||
label="状态"
|
label="状态"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
|
||||||
</template>
|
</template>
|
||||||
@@ -238,16 +246,16 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
@submit="handleSubmit"
|
@submit="handleSubmit"
|
||||||
show-back
|
show-back
|
||||||
@back="handleSubmitNo"
|
@back="handleSubmitNo"
|
||||||
show-transfer
|
show-transfer
|
||||||
@transfer="handleTransfer"
|
@transfer="handleTransfer"
|
||||||
approval
|
approval
|
||||||
submitBTNText="同意"
|
submitBTNText="同意"
|
||||||
>
|
>
|
||||||
</ProcessFooter>
|
</ProcessFooter>
|
||||||
<Role-tree
|
<Role-tree
|
||||||
@@ -265,187 +273,209 @@
|
|||||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
|
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
<Role-tree
|
||||||
|
check-box
|
||||||
|
is-title="选择审批领导"
|
||||||
|
:is-visible.sync="modalshowflag"
|
||||||
|
@checkedRole="checkedRole2"
|
||||||
|
:nodeList="nodeList"
|
||||||
|
></Role-tree>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import ProcessHeader from "../../components/ProcessHeader";
|
import ProcessHeader from "../../components/ProcessHeader";
|
||||||
import ProcessFooter from "../../components/ProcessFooter";
|
import ProcessFooter from "../../components/ProcessFooter";
|
||||||
import ProcessTitle from "../../components/ProcessTitle";
|
import ProcessTitle from "../../components/ProcessTitle";
|
||||||
import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
|
import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
|
||||||
import axios from "axios";
|
import axios from "axios";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "bzzqyjStep6",
|
name: "bzzqyjStep6",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
commentText6: '',
|
commentText6: '',
|
||||||
itermsConditionsFlag: false,
|
itermsConditionsFlag: false,
|
||||||
itermsConditionsTitle: '',
|
itermsConditionsTitle: '',
|
||||||
drawerModal: false,
|
drawerModal: false,
|
||||||
histortData: [],
|
histortData: [],
|
||||||
oldData: [],
|
oldData: [],
|
||||||
data: [],
|
data: [],
|
||||||
commentText: "",
|
commentText: "",
|
||||||
oldText: "",
|
oldText: "",
|
||||||
newText: "",
|
newText: "",
|
||||||
reason: "",
|
reason: "",
|
||||||
taskIds: this.$route.query.taskIds,
|
taskIds: this.$route.query.taskIds,
|
||||||
pId: this.$route.query.prcId,
|
pId: this.$route.query.prcId,
|
||||||
roleRow: {},
|
roleRow: {},
|
||||||
nodeList: [],
|
nodeList: [],
|
||||||
type: "",
|
type: "",
|
||||||
defaultProps: {
|
defaultProps: {
|
||||||
children: "children",
|
children: "children",
|
||||||
label: "name"
|
label: "name"
|
||||||
|
},
|
||||||
|
treeData: [], // 人员数据
|
||||||
|
modalshowflag: false, // drawer开关
|
||||||
|
drawerTitle: "", //drawer标题
|
||||||
|
textarea: "", // 意见
|
||||||
|
ListModel: false, // 新增编辑抽屉开关
|
||||||
|
active: "1", // 默认显示
|
||||||
|
isSubmit: false,
|
||||||
|
saveLoading: false,
|
||||||
|
form: {
|
||||||
|
cid: "", // 编号
|
||||||
|
endTime: "", // 结束日期
|
||||||
|
cname: "", // 名称
|
||||||
|
fjList: [],
|
||||||
|
fjListId: '',
|
||||||
|
textType: '',
|
||||||
|
modelList: [],
|
||||||
|
modelNameList: '',
|
||||||
|
user7: '',
|
||||||
|
user7Name: ''
|
||||||
|
},
|
||||||
|
formRules: {
|
||||||
|
responUserList: [
|
||||||
|
{required: true, message: "请选择责任人", trigger: "change"}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
json: {}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
components: {
|
||||||
|
ProcessHeader,
|
||||||
|
ProcessFooter,
|
||||||
|
ProcessTitle
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
choiceZRR () {
|
||||||
|
this.nodeList = [];
|
||||||
|
if (this.form.user7) {
|
||||||
|
this.nodeList.push(this.form.user7)
|
||||||
|
}
|
||||||
|
this.modalshowflag = true;
|
||||||
},
|
},
|
||||||
treeData: [], // 人员数据
|
checkedRole2(data) {
|
||||||
modalshowflag: false, // drawer开关
|
this.form.user7 = data[0].id
|
||||||
drawerTitle: "", //drawer标题
|
this.form.user7Name = data[0].name
|
||||||
textarea: "", // 意见
|
|
||||||
ListModel: false, // 新增编辑抽屉开关
|
|
||||||
active: "1", // 默认显示
|
|
||||||
isSubmit: false,
|
|
||||||
saveLoading: false,
|
|
||||||
form: {
|
|
||||||
cid: "", // 编号
|
|
||||||
endTime: "", // 结束日期
|
|
||||||
cname: "", // 名称
|
|
||||||
fjList: [],
|
|
||||||
fjListId: '',
|
|
||||||
textType: '',
|
|
||||||
modelList: [],
|
|
||||||
modelNameList: '',
|
|
||||||
},
|
},
|
||||||
formRules: {
|
filesUpload (file) { // 下载
|
||||||
responUserList: [
|
const attId = file.attId
|
||||||
{required: true, message: "请选择责任人", trigger: "change"}
|
if (attId) {
|
||||||
]
|
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||||
|
} else {
|
||||||
|
this.$message.warning('文件不存在,下载失败')
|
||||||
|
}
|
||||||
},
|
},
|
||||||
json: {}
|
fileLook(file) { // 预览
|
||||||
};
|
const attId = file.attId
|
||||||
},
|
this.$preview(attId)
|
||||||
components: {
|
},
|
||||||
ProcessHeader,
|
itermsConditionsClose () {
|
||||||
ProcessFooter,
|
this.itermsConditionsFlag = false
|
||||||
ProcessTitle
|
},
|
||||||
},
|
itermsConditionsOpen (row) {
|
||||||
methods: {
|
this.itermsConditionsFlag = true
|
||||||
filesUpload (file) { // 下载
|
this.itermsConditionsTitle = row
|
||||||
const attId = file.attId
|
},
|
||||||
if (attId) {
|
downloadFile (attId) {
|
||||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
||||||
} else {
|
},
|
||||||
this.$message.warning('文件不存在,下载失败')
|
|
||||||
}
|
|
||||||
},
|
|
||||||
fileLook(file) { // 预览
|
|
||||||
const attId = file.attId
|
|
||||||
this.$preview(attId)
|
|
||||||
},
|
|
||||||
itermsConditionsClose () {
|
|
||||||
this.itermsConditionsFlag = false
|
|
||||||
},
|
|
||||||
itermsConditionsOpen (row) {
|
|
||||||
this.itermsConditionsFlag = true
|
|
||||||
this.itermsConditionsTitle = row
|
|
||||||
},
|
|
||||||
downloadFile (attId) {
|
|
||||||
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
|
|
||||||
},
|
|
||||||
handleTransfer() {
|
handleTransfer() {
|
||||||
this.drawerModal = true
|
this.drawerModal = true
|
||||||
},
|
},
|
||||||
checkedRole (data) {
|
checkedRole (data) {
|
||||||
changeAssigneeNew({
|
changeAssigneeNew({
|
||||||
taskId: this.$route.query.taskIds, // 任务id
|
taskId: this.$route.query.taskIds, // 任务id
|
||||||
userId:this.$store.getters.userInfo.userId, // 委托人
|
userId:this.$store.getters.userInfo.userId, // 委托人
|
||||||
assignee: data[0].id, // 被委托人
|
assignee: data[0].id, // 被委托人
|
||||||
pId: this.$route.query.prcId, // 流程实例
|
pId: this.$route.query.prcId, // 流程实例
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.drawerModal = false
|
this.drawerModal = false
|
||||||
this.$message.success('调整成功')
|
this.$message.success('调整成功')
|
||||||
this.processNum()
|
this.processNum()
|
||||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||||
} else {
|
} else {
|
||||||
this.$message.warning(res.message)
|
this.$message.warning(res.message)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 请求转换流程图
|
// 请求转换流程图
|
||||||
processNum (row) {
|
processNum (row) {
|
||||||
axios.request({
|
axios.request({
|
||||||
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
|
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
|
||||||
responseType: 'blob',
|
responseType: 'blob',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: {
|
params: {
|
||||||
prcNum: this.$route.query.prcNum
|
prcNum: this.$route.query.prcNum
|
||||||
}
|
|
||||||
}).then(res => {
|
|
||||||
this.processStep = window.URL.createObjectURL(res.data)
|
|
||||||
})
|
|
||||||
},
|
|
||||||
updataFj(item) {
|
|
||||||
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
|
|
||||||
},
|
|
||||||
getHistoryData() {
|
|
||||||
this.$http.get("lawss/activiti/get_list_by_instance", {
|
|
||||||
prcNum: this.$route.query.prcNum
|
|
||||||
}, {}, res => {
|
|
||||||
this.histortData = res;
|
|
||||||
}, e => {
|
|
||||||
});
|
|
||||||
},
|
|
||||||
stateText(row) {
|
|
||||||
if (row === "1") {
|
|
||||||
return "上报";
|
|
||||||
} else if (row === "2") {
|
|
||||||
return "处理后上报";
|
|
||||||
}
|
|
||||||
},
|
|
||||||
upload(row, title) {
|
|
||||||
if (row.length > 0) {
|
|
||||||
var params = {
|
|
||||||
columnName: {
|
|
||||||
chapterNumber: "章条编号",
|
|
||||||
chapterName: "章节名称",
|
|
||||||
commentText: "修改意见内容（包括理由或依据）",
|
|
||||||
oldText: "修改前",
|
|
||||||
newText: "修改后",
|
|
||||||
reason: "修改理由",
|
|
||||||
department: "提出部门",
|
|
||||||
responUserName: "提出人",
|
|
||||||
},
|
|
||||||
dataList: []
|
|
||||||
};
|
|
||||||
if (title === '上报意见.xls') {
|
|
||||||
params.columnName.stateText = "处理意见"
|
|
||||||
}
|
|
||||||
params.dataList = JSON.parse(JSON.stringify(row));
|
|
||||||
params.dataList.forEach(item => {
|
|
||||||
if (item.state === "1") {
|
|
||||||
item.stateText = "上报";
|
|
||||||
} else if (item.state === "2") {
|
|
||||||
item.stateText = "处理后上报";
|
|
||||||
} else {
|
|
||||||
item.stateText = "不上报";
|
|
||||||
}
|
}
|
||||||
|
}).then(res => {
|
||||||
|
this.processStep = window.URL.createObjectURL(res.data)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
updataFj(item) {
|
||||||
|
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
|
||||||
|
},
|
||||||
|
getHistoryData() {
|
||||||
|
this.$http.get("lawss/activiti/get_list_by_instance", {
|
||||||
|
prcNum: this.$route.query.prcNum
|
||||||
|
}, {}, res => {
|
||||||
|
this.histortData = res;
|
||||||
|
}, e => {
|
||||||
});
|
});
|
||||||
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
|
},
|
||||||
});
|
stateText(row) {
|
||||||
} else {
|
if (row === "1") {
|
||||||
this.$message.warning('无上报数据')
|
return "上报";
|
||||||
}
|
} else if (row === "2") {
|
||||||
},
|
return "处理后上报";
|
||||||
handleTabs(name) {
|
}
|
||||||
this.active = name;
|
},
|
||||||
},
|
upload(row, title) {
|
||||||
handleSubmit() {
|
if (row.length > 0) {
|
||||||
|
var params = {
|
||||||
|
columnName: {
|
||||||
|
chapterNumber: "章条编号",
|
||||||
|
chapterName: "章节名称",
|
||||||
|
commentText: "修改意见内容（包括理由或依据）",
|
||||||
|
oldText: "修改前",
|
||||||
|
newText: "修改后",
|
||||||
|
reason: "修改理由",
|
||||||
|
department: "提出部门",
|
||||||
|
responUserName: "提出人",
|
||||||
|
},
|
||||||
|
dataList: []
|
||||||
|
};
|
||||||
|
if (title === '上报意见.xls') {
|
||||||
|
params.columnName.stateText = "处理意见"
|
||||||
|
}
|
||||||
|
params.dataList = JSON.parse(JSON.stringify(row));
|
||||||
|
params.dataList.forEach(item => {
|
||||||
|
if (item.state === "1") {
|
||||||
|
item.stateText = "上报";
|
||||||
|
} else if (item.state === "2") {
|
||||||
|
item.stateText = "处理后上报";
|
||||||
|
} else {
|
||||||
|
item.stateText = "不上报";
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.$message.warning('无上报数据')
|
||||||
|
}
|
||||||
|
},
|
||||||
|
handleTabs(name) {
|
||||||
|
this.active = name;
|
||||||
|
},
|
||||||
|
handleSubmit() {
|
||||||
this.isSubmit = true;
|
this.isSubmit = true;
|
||||||
var json = this.json;
|
var json = this.json;
|
||||||
json.hqFlag = '0';
|
json.hqFlag = '0';
|
||||||
json.commentText = this.commentText6;
|
json.commentText = this.commentText6;
|
||||||
|
json.user7 = this.form.user7;
|
||||||
|
json.user7Name = this.form.user7Name;
|
||||||
this.$http.post("lawss/activiti/completeTask", {
|
this.$http.post("lawss/activiti/completeTask", {
|
||||||
json: JSON.stringify(json),
|
json: JSON.stringify(json),
|
||||||
taskId: this.taskIds,
|
taskId: this.taskIds,
|
||||||
@@ -457,128 +487,130 @@ export default {
|
|||||||
}
|
}
|
||||||
this.isSubmit = false;
|
this.isSubmit = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSubmitNo() {
|
handleSubmitNo() {
|
||||||
if (this.commentText6) {
|
if (this.commentText6) {
|
||||||
this.isSubmit = true;
|
this.isSubmit = true;
|
||||||
var json = this.json;
|
var json = this.json;
|
||||||
json.hqFlag = '1';
|
json.hqFlag = '1';
|
||||||
json.commentText = this.commentText6;
|
json.commentText = this.commentText6;
|
||||||
this.$http.post("lawss/activiti/completeTask", {
|
this.$http.post("lawss/activiti/completeTask", {
|
||||||
json: JSON.stringify(json),
|
json: JSON.stringify(json),
|
||||||
taskIds: this.taskIds,
|
taskIds: this.taskIds,
|
||||||
userId: this.$store.getters.userInfo.userId
|
userId: this.$store.getters.userInfo.userId
|
||||||
}, {}, res => {
|
}, {}, res => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
this.$message.success("驳回成功");
|
this.$message.success("驳回成功");
|
||||||
this.$router.push("/processCenter");
|
this.$router.push("/processCenter");
|
||||||
}
|
}
|
||||||
this.isSubmit = false;
|
this.isSubmit = false;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
this.$message.warning("请输入反馈意见");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
getData() {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
inboundLiaisonDetail({
|
||||||
|
taskIds: this.taskIds,
|
||||||
|
pId: this.pId
|
||||||
|
}).then(res => {
|
||||||
|
let data = JSON.parse(res.mesg);
|
||||||
|
this.commentText6 = data.commentText6 || ''
|
||||||
|
this.form.fjList = data.fjList || data.form.fjList
|
||||||
|
this.form.cid = data.cid || data.form.cid;
|
||||||
|
this.form.endTime = data.endTime || data.form.endTime;
|
||||||
|
this.form.textType = data.textType || data.form.textType
|
||||||
|
this.form.modelList = data.modelList || data.form.modelList
|
||||||
|
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
|
||||||
|
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
|
||||||
|
this.oldData = JSON.parse(JSON.stringify(data.info))
|
||||||
|
var arr = []
|
||||||
|
data.info.forEach(item => {
|
||||||
|
if (item.state != '3') {
|
||||||
|
arr.push(item)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.json = data
|
||||||
|
this.data = arr
|
||||||
|
}).catch(e => {
|
||||||
|
});
|
||||||
});
|
});
|
||||||
} else {
|
|
||||||
this.$message.warning("请输入反馈意见");
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getData() {
|
mounted() {
|
||||||
return new Promise((resolve, reject) => {
|
this.getHistoryData();
|
||||||
inboundLiaisonDetail({
|
this.getData();
|
||||||
taskIds: this.taskIds,
|
|
||||||
pId: this.pId
|
|
||||||
}).then(res => {
|
|
||||||
let data = JSON.parse(res.mesg);
|
|
||||||
this.commentText6 = data.commentText6 || ''
|
|
||||||
this.form.fjList = data.fjList || data.form.fjList
|
|
||||||
this.form.cid = data.cid || data.form.cid;
|
|
||||||
this.form.endTime = data.endTime || data.form.endTime;
|
|
||||||
this.form.textType = data.textType || data.form.textType
|
|
||||||
this.form.modelList = data.modelList || data.form.modelList
|
|
||||||
this.oldData = JSON.parse(JSON.stringify(data.info))
|
|
||||||
var arr = []
|
|
||||||
data.info.forEach(item => {
|
|
||||||
if (item.state != '3') {
|
|
||||||
arr.push(item)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
this.json = data
|
|
||||||
this.data = arr
|
|
||||||
}).catch(e => {
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
};
|
||||||
mounted() {
|
|
||||||
this.getHistoryData();
|
|
||||||
this.getData();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@import '~@/assets/styles/style';
|
@import '~@/assets/styles/style';
|
||||||
|
|
||||||
.bzdyStep6 {
|
.bzdyStep6 {
|
||||||
/deep/ .el-drawer__container {
|
/deep/ .el-drawer__container {
|
||||||
.prc-content-border {
|
.prc-content-border {
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0 20px 0;
|
padding: 0 20px 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.fileClass {
|
.fileClass {
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.fileClass:hover {
|
|
||||||
color: #0c91e5;
|
|
||||||
}
|
|
||||||
|
|
||||||
position: relative;
|
|
||||||
height: 100%;
|
|
||||||
|
|
||||||
.headerTabs {
|
|
||||||
height: 52px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
position: absolute;
|
|
||||||
top: 0;
|
|
||||||
right: 10px;
|
|
||||||
|
|
||||||
.headerTabsItem {
|
|
||||||
border: 1px solid #c1c1c1;
|
|
||||||
padding: 0 5px;
|
|
||||||
height: 30px;
|
|
||||||
line-height: 30px;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.active {
|
.fileClass:hover {
|
||||||
border: 1px solid #E6A23C;
|
color: #0c91e5;
|
||||||
color: #fff;
|
|
||||||
background: #E6A23C;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
position: relative;
|
||||||
display: flex;
|
height: 100%;
|
||||||
flex-direction: column;
|
|
||||||
justify-content: space-between;
|
|
||||||
height: calc(~'100% - 103px');
|
|
||||||
overflow: auto;
|
|
||||||
|
|
||||||
.tableTitle {
|
.headerTabs {
|
||||||
margin-bottom: 10px;
|
height: 52px;
|
||||||
height: 30px;
|
display: flex;
|
||||||
line-height: 30px;
|
align-items: center;
|
||||||
position: relative;
|
position: absolute;
|
||||||
font-size: 13px;
|
top: 0;
|
||||||
font-weight: bold;
|
right: 10px;
|
||||||
|
|
||||||
.tableButton {
|
.headerTabsItem {
|
||||||
position: absolute;
|
border: 1px solid #c1c1c1;
|
||||||
right: 0;
|
padding: 0 5px;
|
||||||
top: 0;
|
height: 30px;
|
||||||
|
line-height: 30px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.active {
|
||||||
|
border: 1px solid #E6A23C;
|
||||||
|
color: #fff;
|
||||||
|
background: #E6A23C;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-between;
|
||||||
|
height: calc(~'100% - 103px');
|
||||||
|
overflow: auto;
|
||||||
|
|
||||||
|
.tableTitle {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
height: 30px;
|
||||||
|
line-height: 30px;
|
||||||
|
position: relative;
|
||||||
|
font-size: 13px;
|
||||||
|
font-weight: bold;
|
||||||
|
|
||||||
|
.tableButton {
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+38
-24
@@ -1437,25 +1437,26 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import CustomInput from '@/components/CustomFormComponents/Input'
|
import CustomInput from "@/components/CustomFormComponents/Input";
|
||||||
import CustomTextarea from '@/components/CustomFormComponents/Textarea'
|
import CustomTextarea from "@/components/CustomFormComponents/Textarea";
|
||||||
import CustomSearchSelect from '@/components/CustomFormComponents/SearchSelect'
|
import CustomSearchSelect from "@/components/CustomFormComponents/SearchSelect";
|
||||||
import CustomSelect from '@/components/CustomFormComponents/Select'
|
import CustomSelect from "@/components/CustomFormComponents/Select";
|
||||||
import CustomDatePick from '@/components/CustomFormComponents/DatePicker'
|
import CustomDatePick from "@/components/CustomFormComponents/DatePicker";
|
||||||
import CustomFile from '@/components/CustomFormComponents/File'
|
import CustomFile from "@/components/CustomFormComponents/File";
|
||||||
import CustomInputForStandards from '@/components/CustomFormComponents/InputForStandardsForEnterprise'
|
import CustomInputForStandards from "@/components/CustomFormComponents/InputForStandardsForEnterprise";
|
||||||
import customSelectArray from '@/components/CustomFormComponents/SelectArray'
|
import customSelectArray from "@/components/CustomFormComponents/SelectArray";
|
||||||
import CustomOrg from '@/components/CustomFormComponents/OrgTree'
|
import CustomOrg from "@/components/CustomFormComponents/OrgTree";
|
||||||
import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
|
import CustomSVPPS from "@/components/CustomFormComponents/SVPPS";
|
||||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
import TreeSelect from "@/components/treeSelect/treeSelect.vue";
|
||||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
import TreeSelectNew from "@/components/treeSelect/treeSelectNew.vue";
|
||||||
import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle'
|
import ProcessTitle from "@/pages/processCenter/pages/components/ProcessTitle";
|
||||||
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
|
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
|
||||||
|
|
||||||
import {mapGetters} from 'vuex'
|
import { mapGetters } from "vuex";
|
||||||
import store from "@/store";
|
import store from "@/store";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'EnterpriseStandardDatabase',
|
name: "EnterpriseStandardDatabase",
|
||||||
components: {
|
components: {
|
||||||
CustomFile,
|
CustomFile,
|
||||||
CustomInput,
|
CustomInput,
|
||||||
@@ -3916,17 +3917,30 @@ export default {
|
|||||||
formFieldList.forEach((item) => {
|
formFieldList.forEach((item) => {
|
||||||
const value = this.sarBussionessSearch[item.attrField]
|
const value = this.sarBussionessSearch[item.attrField]
|
||||||
// 时间格式处理
|
// 时间格式处理
|
||||||
if (value !== undefined && value !== null && value !== '') {
|
if (value !== undefined && value !== null && value !== "") {
|
||||||
advanceSearchVOList.push({
|
advanceSearchVOList.push({
|
||||||
connect: advanceSearchVOList.length > 0 ? "and" : "",
|
connect: advanceSearchVOList.length > 0 ? "and" : "",
|
||||||
field: item.attrField || '',
|
field: item.attrField || "",
|
||||||
type: 'like',
|
type: "like",
|
||||||
value: value
|
value: value
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
|
// formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
|
||||||
|
this.SarExportSearchEo = formData;
|
||||||
|
formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null;
|
||||||
|
formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null;
|
||||||
|
formData.startFSRQBUSS = formData.FSRQBUSS ? formData.FSRQBUSS[0] : null;
|
||||||
|
formData.endFSRQBUSS = formData.FSRQBUSS ? formData.FSRQBUSS[1] : null;
|
||||||
|
formData.startFZRQBUSS = formData.FZRQBUSS ? formData.FZRQBUSS[0] : null;
|
||||||
|
formData.endFZRQBUSS = formData.FZRQBUSS ? formData.FZRQBUSS[1] : null;
|
||||||
|
formData.startPutTime = formData.putTime ? formData.putTime[0] : null;
|
||||||
|
formData.endPutTime = formData.putTime ? formData.putTime[1] : null;
|
||||||
|
formData.FSRQBUSS = null;
|
||||||
|
formData.FZRQBUSS = null;
|
||||||
|
formData.putTime = null;
|
||||||
|
formData.issueTime = null;
|
||||||
}
|
}
|
||||||
this.SarExportSearchEo = formData
|
this.SarExportSearchEo = formData
|
||||||
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
|
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
|
||||||
|
|||||||
@@ -3713,7 +3713,7 @@ export default {
|
|||||||
}
|
}
|
||||||
break
|
break
|
||||||
case 'textStatus' :
|
case 'textStatus' :
|
||||||
this.orderBy = 5;
|
this.orderBy = 4;
|
||||||
this.nowOrder = sortObj.column.order
|
this.nowOrder = sortObj.column.order
|
||||||
if (this.nowOrder === 'ascending') {
|
if (this.nowOrder === 'ascending') {
|
||||||
this.nowOrder = 2
|
this.nowOrder = 2
|
||||||
|
|||||||
Reference in New Issue
Block a user