FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!291
This commit is contained in:
王夏晖
2022-01-11 13:39:45 +08:00
parent 1ee1eb0d4c 697fab7bf0
commit ccaa1ae470
17 changed files with 99 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+3 -3
View File
@@ -3673,8 +3673,9 @@ export default {
// if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) { // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
// return // return
// } // }
console.log(displayLocation)
displayLocation.forEach((location) => { displayLocation.forEach((location) => {
console.log(location); console.log(location.child)
location.isShowImp = '0' location.isShowImp = '0'
if (dynamicFormField) { if (dynamicFormField) {
let value = dynamicFormField[field.attrField] let value = dynamicFormField[field.attrField]
@@ -3705,7 +3706,6 @@ export default {
displayLocation.forEach(location => { displayLocation.forEach(location => {
// 动态属性字段-FBGBJBD 单独添加至基础信息 // 动态属性字段-FBGBJBD 单独添加至基础信息
const list = displayLocation.filter(item => item.label === '过程稿件'); const list = displayLocation.filter(item => item.label === '过程稿件');
console.log('3535', list)
if (location.label === '基础信息' && list && list.length > 0) { if (location.label === '基础信息' && list && list.length > 0) {
//发布稿必读 //发布稿必读
if (!list[0].child) { if (!list[0].child) {
@@ -3772,6 +3772,7 @@ export default {
} }
} }
}) })
console.log(child)
const fieldsIsTextAreaOrFile = child.filter(field => { const fieldsIsTextAreaOrFile = child.filter(field => {
return field.attrType === 'TEXTAREA' || field.attrType === 'FILE' return field.attrType === 'TEXTAREA' || field.attrType === 'FILE'
}) })
@@ -3783,7 +3784,6 @@ export default {
location.half = half location.half = half
location.showAll = false location.showAll = false
}) })
console.log(displayLocation)
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
id: this.$route.params.id id: this.$route.params.id
}, { }, {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+7
View File
@@ -836,6 +836,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled"> <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
style="display:none;"
v-model="form.bfdtbzh"
placeholder="请输入部分代替标准号"
></el-input>
<el-input <el-input
v-model="form.bfbdtbzh" v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号" placeholder="请输入部分代替标准号"
@@ -1574,6 +1579,7 @@ export default {
cbcd: '', // 采标程度 cbcd: '', // 采标程度
yybj: '', // 引用标准 yybj: '', // 引用标准
bfbdtbzh: '', // 部分代替标准号 bfbdtbzh: '', // 部分代替标准号
bfdtbzh: '',
byybj: '', // 被引用标准 byybj: '', // 被引用标准
glwj: '', // 关联文件 glwj: '', // 关联文件
xglc: '', // 相关流程 xglc: '', // 相关流程
@@ -2520,6 +2526,7 @@ export default {
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' + textArr.join(',') : textArr.join(',') this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' + textArr.join(',') : textArr.join(',')
} else if (this.replaceLawType === 'bfbdtbzh') { } else if (this.replaceLawType === 'bfbdtbzh') {
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' + textArr.join(',') : textArr.join(',') this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' + textArr.join(',') : textArr.join(',')
this.form.bfdtbzh = this.form.bfdtbzh ? this.form.bfdtbzh + ',' + textArr.join(',') : textArr.join(',')
} else { } else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' + textArr.join(',') : textArr.join(',') this.form.byybj = this.form.byybj ? this.form.byybj + ',' + textArr.join(',') : textArr.join(',')
} }
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+2 -3
View File
@@ -899,6 +899,7 @@
jdwj: '', // 解读文件 jdwj: '', // 解读文件
zbjbd: '', // 增补件 zbjbd: '', // 增补件
bfbdtbzh: '', // 增补件 bfbdtbzh: '', // 增补件
bfdtbz: '',
kwj: '', // 勘误件 kwj: '', // 勘误件
caName: '', // 草案 caName: '', // 草案
fbgbjbdName: '', // 发布稿 fbgbjbdName: '', // 发布稿
@@ -1271,16 +1272,13 @@
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion);
if(this.formTongGuo.approvalOpinion == '1'){ if(this.formTongGuo.approvalOpinion == '1'){
console.log("shibai");
this.$message.warning("驳回成功") this.$message.warning("驳回成功")
this.isSubmit = false this.isSubmit = false
this.formTongGuo.commentText = '' this.formTongGuo.commentText = ''
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else{ }else{
console.log("hello");
this.processCreateStand(json) this.processCreateStand(json)
} }
} }
@@ -1294,6 +1292,7 @@
* @auth: chenxiaoxi * @auth: chenxiaoxi
*/ */
processCreateStand(json) { processCreateStand(json) {
console.log(json)
const _formData = new FormData() const _formData = new FormData()
_formData.append('infoJson', json) _formData.append('infoJson', json)
processCreateStand(_formData).then(res => { processCreateStand(_formData).then(res => {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2
View File
@@ -1576,6 +1576,7 @@ export default {
caName: '', // 草案 caName: '', // 草案
fbgbjbdName: '', // 发布稿 fbgbjbdName: '', // 发布稿
bfbdtbzh: '', // 发布稿 bfbdtbzh: '', // 发布稿
bfdtbzh: '',
xgdName: '', // 修改单 xgdName: '', // 修改单
bpgName: '', // 报批稿 bpgName: '', // 报批稿
ssgName: '', // 送审稿 ssgName: '', // 送审稿
@@ -1949,6 +1950,7 @@ export default {
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'bfbdtbzh'){ }else if(this.replaceLawType === 'bfbdtbzh'){
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
this.form.bfdtbzh = this.form.bfdtbzh ? this.form.bfdtbzh + ',' + textArr.join(',') : textArr.join(',')
} else { } else {
this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+4 -5
View File
@@ -179,7 +179,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
type="primary" type="primary"
@click="itemEdit(scope.row)">处理</el-button> @click="itemEdit(scope.row, scope.$index)">处理</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -447,14 +447,13 @@
}, },
saveUserInfo2 () { saveUserInfo2 () {
for( let a = 0; a < this.data.length; a++) { for( let a = 0; a < this.data.length; a++) {
if (this.data[a].id === this.itemId) { if (a === this.itemId) {
this.data[a].chapterNumber = this.editForm.chapterNumber this.data[a].chapterNumber = this.editForm.chapterNumber
this.data[a].chapterName = this.editForm.chapterName this.data[a].chapterName = this.editForm.chapterName
this.data[a].oldText = this.editForm.oldText this.data[a].oldText = this.editForm.oldText
this.data[a].newText = this.editForm.newText this.data[a].newText = this.editForm.newText
this.data[a].reason = this.editForm.reason this.data[a].reason = this.editForm.reason
this.data[a].cause = this.editForm.cause this.data[a].cause = this.editForm.cause
this.$set(this.data, a,this.editForm)
} }
} }
this.modalshowflag2 = false this.modalshowflag2 = false
@@ -462,8 +461,8 @@
cancleUserInfo2 () { cancleUserInfo2 () {
this.modalshowflag2 = false this.modalshowflag2 = false
}, },
itemEdit (row) { itemEdit (row, index) {
this.itemId = row.id this.itemId = index
this.modalshowflag2 = true this.modalshowflag2 = true
this.editForm = { this.editForm = {
chapterNumber: row.chapterNumber, chapterNumber: row.chapterNumber,
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+5 -5
View File
@@ -40,8 +40,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
@@ -200,8 +200,8 @@
placeholder="根据企标名称查找" placeholder="根据企标名称查找"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订类型" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -257,7 +257,7 @@
<el-table-column <el-table-column
prop="reviseStatus" prop="reviseStatus"
align="center" align="center"
label="制修订状态"> label="制修订类型">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+5 -5
View File
@@ -40,8 +40,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="1"></el-option> <el-option label="制定" value="1"></el-option>
<el-option label="修订" value="2"></el-option> <el-option label="修订" value="2"></el-option>
</el-select> </el-select>
@@ -216,8 +216,8 @@
placeholder="根据企标名称查找" placeholder="根据企标名称查找"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订类型" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -273,7 +273,7 @@
<el-table-column <el-table-column
prop="reviseStatus" prop="reviseStatus"
align="center" align="center"
label="制修订状态"> label="制修订类型">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+15 -5
View File
@@ -27,9 +27,9 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled"> class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -283,7 +283,6 @@
:data="standSystemOptions" :data="standSystemOptions"
show-checkbox show-checkbox
node-key="id" node-key="id"
default-expand-all
check-strictly check-strictly
:default-checked-keys="TXJGList" :default-checked-keys="TXJGList"
:props="defaultProps"> :props="defaultProps">
@@ -373,7 +372,7 @@ export default {
unitName: "", unitName: "",
esName: "", // 企标名称 esName: "", // 企标名称
planStatus: "0", // 计划状态 planStatus: "0", // 计划状态
reviseStatus: "", // 制修订状态 reviseStatus: "", // 制修订类型
area: "", //适用车型 area: "", //适用车型
isRelate: "", //采用何种标准 isRelate: "", //采用何种标准
technologic: '', //指标依据 technologic: '', //指标依据
@@ -400,7 +399,7 @@ export default {
{ required: true, message: "请输入企标名称", trigger: "blur" } { required: true, message: "请输入企标名称", trigger: "blur" }
], ],
reviseStatus: [ reviseStatus: [
{ required: true, message: "请选择制修订状态", trigger: "blur" } { required: true, message: "请选择制修订类型", trigger: "blur" }
], ],
resPersonName: [ resPersonName: [
{ required: true, message: "请输入评审责任人", trigger: "blur" } { required: true, message: "请输入评审责任人", trigger: "blur" }
@@ -591,18 +590,26 @@ export default {
this.modalshowflag2 = true; this.modalshowflag2 = true;
}, },
checkedRole2(data) { checkedRole2(data) {
console.log(data);
let idList = "", nameList = "" let idList = "", nameList = ""
let unitList = "", unitNameList = ""
data.forEach(item => { data.forEach(item => {
if (nameList.length) { if (nameList.length) {
nameList += ","; nameList += ",";
idList += ","; idList += ",";
unitList += ",";
unitNameList += ",";
} }
idList += item.id; idList += item.id;
nameList += item.name; nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
}); });
if(this.roleType === '1'){ if(this.roleType === '1'){
this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafter', idList)
this.$set(this.qbfsForm, 'drafterName', nameList) this.$set(this.qbfsForm, 'drafterName', nameList)
this.$set(this.qbfsForm, 'unit', unitList)
this.$set(this.qbfsForm, 'unitName', unitNameList)
}else if(this.roleType === '2'){ }else if(this.roleType === '2'){
this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPerson', idList)
this.$set(this.qbfsForm, 'resPersonName', nameList) this.$set(this.qbfsForm, 'resPersonName', nameList)
@@ -611,6 +618,9 @@ export default {
if(this.qbfsForm.drafterName){ if(this.qbfsForm.drafterName){
this.$refs.qbfsForm.validateField('drafterName'); this.$refs.qbfsForm.validateField('drafterName');
} }
if(this.qbfsForm.unitName){
this.$refs.qbfsForm.validateField('unitName');
}
if(this.qbfsForm.resPersonName){ if(this.qbfsForm.resPersonName){
this.$refs.qbfsForm.validateField('resPersonName'); this.$refs.qbfsForm.validateField('resPersonName');
} }
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+22 -13
View File
@@ -20,8 +20,8 @@
<el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled"> <el-form-item label="企标名称" prop="esName1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.esName1" placeholder="请输入企标名称" clearable></el-input> <el-input readonly v-model="qbfsForm.esName1" placeholder="请输入企标名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled"> <el-form-item label="制修订类型" prop="reviseStatus1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input> <el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订类型" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -31,8 +31,8 @@
<el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled"> <el-form-item label="企标名称" prop="esName2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.esName2" placeholder="请输入企标名称" clearable></el-input> <el-input readonly v-model="qbfsForm.esName2" placeholder="请输入企标名称" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled"> <el-form-item label="制修订类型" prop="reviseStatus2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input> <el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订类型" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -64,8 +64,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -222,8 +222,8 @@
placeholder="根据企标名称查找" placeholder="根据企标名称查找"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订类型" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -279,7 +279,7 @@
<el-table-column <el-table-column
prop="reviseStatus" prop="reviseStatus"
align="center" align="center"
label="制修订状态"> label="制修订类型">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
@@ -447,7 +447,6 @@
:data="standSystemOptions" :data="standSystemOptions"
show-checkbox show-checkbox
node-key="id" node-key="id"
default-expand-all
check-strictly check-strictly
:default-checked-keys="TXJGList" :default-checked-keys="TXJGList"
:props="defaultProps"> :props="defaultProps">
@@ -558,7 +557,7 @@ export default {
{required: true, message: '请输入企标名称', trigger: 'blur'}, {required: true, message: '请输入企标名称', trigger: 'blur'},
], ],
reviseStatus: [ reviseStatus: [
{required: true, message: '请选择制修订状态', trigger: 'change'}, {required: true, message: '请选择制修订类型', trigger: 'change'},
], ],
resPersonName: [ resPersonName: [
{required: true, message: '请输入评审责任人', trigger: 'blur'}, {required: true, message: '请输入评审责任人', trigger: 'blur'},
@@ -783,19 +782,26 @@ export default {
this.modalshowflag2 = true; this.modalshowflag2 = true;
}, },
checkedRole2(data) { checkedRole2(data) {
let idList = ""; let idList = "", nameList = ""
let nameList = ""; let unitList = "", unitNameList = ""
data.forEach(item => { data.forEach(item => {
if (nameList.length) { if (nameList.length) {
nameList += ","; nameList += ",";
idList += ","; idList += ",";
unitList += ",";
unitNameList += ",";
} }
idList += item.id; idList += item.id;
nameList += item.name; nameList += item.name;
unitList += item.institutionId
unitNameList += item.institutionName
}); });
if(this.type === '1'){ if(this.type === '1'){
this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafter', idList)
this.$set(this.qbfsForm, 'drafterName', nameList) this.$set(this.qbfsForm, 'drafterName', nameList)
this.$set(this.qbfsForm, 'unit', unitList)
this.$set(this.qbfsForm, 'unitName', unitNameList)
}else if(this.type === '2'){ }else if(this.type === '2'){
this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPerson', idList)
this.$set(this.qbfsForm, 'resPersonName', nameList) this.$set(this.qbfsForm, 'resPersonName', nameList)
@@ -803,6 +809,9 @@ export default {
if(this.qbfsForm.drafterName){ if(this.qbfsForm.drafterName){
this.$refs.qbfsForm.validateField('drafterName'); this.$refs.qbfsForm.validateField('drafterName');
} }
if(this.qbfsForm.unitName){
this.$refs.qbfsForm.validateField('unitName');
}
if(this.qbfsForm.resPersonName){ if(this.qbfsForm.resPersonName){
this.$refs.qbfsForm.validateField('resPersonName'); this.$refs.qbfsForm.validateField('resPersonName');
} }
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+5 -5
View File
@@ -40,8 +40,8 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -207,8 +207,8 @@
placeholder="根据企标名称查找" placeholder="根据企标名称查找"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="制修订状态" class="search-item search-item-last"> <el-form-item label="制修订类型" class="search-item search-item-last">
<el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态"> <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定" value="制定"></el-option> <el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option> <el-option label="修订" value="修订"></el-option>
</el-select> </el-select>
@@ -264,7 +264,7 @@
<el-table-column <el-table-column
prop="reviseStatus" prop="reviseStatus"
align="center" align="center"
label="制修订状态"> label="制修订类型">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div> <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
</template> </template>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+2 -2
View File
@@ -29,8 +29,8 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+2 -2
View File
@@ -29,8 +29,8 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+2 -2
View File
@@ -29,8 +29,8 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+2 -2
View File
@@ -29,8 +29,8 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+2 -2
View File
@@ -29,8 +29,8 @@
placeholder="请输入企标名称" placeholder="请输入企标名称"
:maxlength="500"/> :maxlength="500"/>
</el-form-item> </el-form-item>
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态"> <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option> <el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option> <el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option> <el-option label="未制定" value="未制定"></el-option>
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+5
View File
@@ -834,6 +834,11 @@
this.addForm.unit = list this.addForm.unit = list
this.addForm.unitName = listName this.addForm.unitName = listName
this.modalshowflagZRBM = false this.modalshowflagZRBM = false
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {
institutionIds: list
}, {}, res => {
console.log(res);
})
}, },
choiceZRBM(id) { choiceZRBM(id) {
if (this.DrawerType === 'see') { if (this.DrawerType === 'see') {
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+14
View File
@@ -141,6 +141,13 @@
> >
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
prop="cause"
align="center"
label="原因"
width="170"
>
</el-table-column>
<el-table-column <el-table-column
prop="deptName" prop="deptName"
align="center" align="center"
@@ -212,6 +219,9 @@
<el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item"> <el-form-item label="修改理由" prop="reason" label-width="" class="add-form-item">
<el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input> <el-input v-model="opinionContent.reason" autocomplete="off" placeholder="请输入修改理由"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原因" prop="cause" label-width="" class="add-form-item">
<el-input v-model="opinionContent.cause" autocomplete="off" placeholder="请输入原因"></el-input>
</el-form-item>
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
@@ -260,6 +270,7 @@ export default {
newText: '', newText: '',
reason: '', reason: '',
chapterName: '', chapterName: '',
cause: '',
}, },
opinionContentRules: { opinionContentRules: {
partCode: [ partCode: [
@@ -382,6 +393,7 @@ export default {
this.opinionContent.reason = row.reason this.opinionContent.reason = row.reason
this.opinionContent.oldText = row.oldText this.opinionContent.oldText = row.oldText
this.opinionContent.newText = row.newText this.opinionContent.newText = row.newText
this.opinionContent.cause = row.cause
} else { } else {
this.id = '' this.id = ''
this.opiniontitle = '新增意见' this.opiniontitle = '新增意见'
@@ -389,6 +401,7 @@ export default {
this.opinionContent.reason = '' this.opinionContent.reason = ''
this.opinionContent.oldText = '' this.opinionContent.oldText = ''
this.opinionContent.newText = '' this.opinionContent.newText = ''
this.opinionContent.cause = ''
} }
this.isDialog = true this.isDialog = true
}, },
@@ -433,6 +446,7 @@ export default {
reason: this.opinionContent.reason, reason: this.opinionContent.reason,
partCode: this.opinionContent.partCode, partCode: this.opinionContent.partCode,
chapterName: this.opinionContent.chapterName, chapterName: this.opinionContent.chapterName,
cause: this.opinionContent.cause,
userId: this.$store.getters.userInfo.userId || '', userId: this.$store.getters.userInfo.userId || '',
userName: this.$store.getters.userInfo.userName || '', userName: this.$store.getters.userInfo.userName || '',
deptName: this.$store.getters.userInfo.orgName || '', deptName: this.$store.getters.userInfo.orgName || '',