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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhutianqi
2022-03-02 09:49:52 +08:00
parent 24b53f939e d01056eedd
commit 92ff909a34
11 changed files with 209 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+70 -1
View File
@@ -332,12 +332,32 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
<!-- 选择起草责任单位-->
<Mechanism-tree
is-title="选择起草责任单位"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<!--导入模态窗-->
<el-dialog width="400px" :visible.sync="importModalshowflag" title="导入文件" :footer-hide="true">
<el-upload
drag
:show-file-list="showUploadlist"
:on-success="importFileSuccess"
:on-remove="removeOneFile"
:before-upload="beforeUpload"
:action="importExcelUrl"
:file-list="defaultFileList"
accept=".xlsx"
name="file"
ref="importFileAboutStand">
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
</div>
</template>
@@ -358,6 +378,10 @@ export default {
name: "qbzxdlxStep1",
data() {
return {
importModalshowflag: false, //导入弹窗
showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
defaultFileList: [], // 默认显示
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
fileIds: [], // 上传的附件
@@ -483,6 +507,51 @@ export default {
})
},
methods: {
onFileExceed() {
this.$message.error('最多上传一个文件')
},
// 导入标准数据成功后执行
importFileSuccess (res, file, fileList) {
let files = {}
if (res.ok) {
files.attId = res.data.attId
files.fileName = res.data.name
if (res.data.standNum != null && res.data.standNum !== '') {
files.standNumSplit = res.data.standNum
}
if (res.data.standName != null && res.data.standName !== '') {
files.standNameSplit = res.data.standName
}
this.defaultFileList.push(file)
const _formData = new FormData()
_formData.append('standNumSplit', files.standNumSplit)
_formData.append('standNameSplit', files.standNameSplit)
_formData.append('fileType', files.fileType)
_formData.append('file', file.raw)
this.$http.postData('importWkExcel/importData', _formData,{
_this: this
}, res => {
if(res.ok){
this.qblx_pageData.qblxData = res.data
}else{
alert(res.message)
}
})
this.$message.success('文件上传成功')
this.importModalshowflag = false
this.$nextTick(() => {
this.$refs.importFileAboutStand.clearFiles()
})
} else {
this.defaultFileList = []
this.uploadFilesplitEo.attId = ''
this.$message.error(res.message)
}
},
//删除文件时执行
removeOneFile(){
},
getWorkBtn(){
this.page = 1
this.getWorkData()
@@ -787,7 +856,7 @@ export default {
/** 数据导入到列表 */
uploadQblx() {
this.importModalshowflag = true
},