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!332
This commit is contained in:
王夏晖
2022-03-01 17:34:15 +08:00
parent 826088c0ab f78cc7201b
commit af9aa58664
12 changed files with 149 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+8 -3
View File
@@ -99,7 +99,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag">
<el-radio label="1">是</el-radio>
@@ -2230,6 +2229,11 @@ export default {
}, res => {
if (res && res.data) {
const bringData = res.data
if (res.data.country) {
res.data.country = res.data.country.split(',');
} else {
res.data.country = []
}
bringData.txlb = ''
bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
@@ -2271,7 +2275,6 @@ export default {
}
}
})
} else if (this.standardCheckedList.length > 1) {
this.$message.warning('最多可以带入一条标准信息')
} else {
@@ -2712,7 +2715,8 @@ export default {
this.replaceLawsNumForm.quoteIdList = ''
}
if(this.replaceLawType === 'cbbh') {
this.replaceLawsNumForm.standType = 'FOREIGN'
this.replaceLawsNumForm.standType = ''
// this.replaceLawsNumForm.standType = 'FOREIGN'
} else {
this.replaceLawsNumForm.standType = '' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
}
@@ -3387,6 +3391,7 @@ export default {
})
this.busVsFunc()
this.modelFunc()
}
}
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2 -1
View File
@@ -2168,7 +2168,8 @@ export default {
this.replaceLawsNumForm.quoteIdList = ''
}
if (this.replaceLawType === 'cbbh') {
this.replaceLawsNumForm.standType = 'FOREIGN'
this.replaceLawsNumForm.standType = ''
// this.replaceLawsNumForm.standType = 'FOREIGN'
} else {
this.replaceLawsNumForm.standType = '' // this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+18 -18
View File
@@ -47,6 +47,17 @@
<el-option label="未制定" value="未制定"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input
readonly
@@ -64,13 +75,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="引用标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -125,17 +129,6 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -168,6 +161,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+18 -18
View File
@@ -46,6 +46,17 @@
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input
readonly
@@ -63,13 +74,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="引用标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -132,17 +136,6 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -183,6 +176,13 @@
placeholder="请选择延期后标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+11 -11
View File
@@ -47,6 +47,17 @@
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
@@ -101,17 +112,6 @@
@click.native="choiceTXJG(qbfsForm.tsJson)">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="isRelate" label="是否采用标准" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.isRelate" placeholder="请选择是否采用标准">
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+19 -19
View File
@@ -70,6 +70,17 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
<el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
@@ -113,14 +124,6 @@
placeholder="请输入指标依据"
:maxlength="500"/>
</el-form-item>
<el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
clearable
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
@@ -148,17 +151,6 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="tsJson" label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
@@ -187,6 +179,14 @@
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2>
</template>
<el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+18 -18
View File
@@ -46,6 +46,17 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
<el-input
readonly
@@ -63,13 +74,6 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="引用标准" style="width: 100%; margin-right:10px" prop="esMatingRelations" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -131,17 +135,6 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -174,6 +167,13 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" prop="tsJsonName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.tsJsonName"
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
type="textarea"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+11 -11
View File
@@ -43,6 +43,17 @@
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -96,17 +107,6 @@
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+11 -11
View File
@@ -43,6 +43,17 @@
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -96,17 +107,6 @@
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+11 -11
View File
@@ -43,6 +43,17 @@
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -96,17 +107,6 @@
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+11 -11
View File
@@ -43,6 +43,17 @@
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -96,17 +107,6 @@
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+11 -11
View File
@@ -43,6 +43,17 @@
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -96,17 +107,6 @@
placeholder="请输入体系结构"
:maxlength="500"/>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" prop="isRelate" class="add-form-item form-item-disabled">
<el-input
disabled