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

修改

Browse Source
This commit is contained in:
zeng yuneng
2022-12-01 09:47:56 +08:00
parent e8975a106b
commit d34fdc8dd8
9 changed files with 7141 additions and 7270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/DatePickerGroup.vue
+5
View File
@@ -7,6 +7,7 @@
:label-width="labelWidth" :label-width="labelWidth"
class="add-form-item" class="add-form-item"
:class="{'form-item-disabled': disabled}" :class="{'form-item-disabled': disabled}"
:required="required"
> >
<el-input <el-input
v-show="false" v-show="false"
@@ -89,6 +90,10 @@ export default {
labelWidth: { labelWidth: {
type: String, type: String,
default: '210px' default: '210px'
},
required:{
type:Boolean,
default:false
} }
}, },
components: {}, components: {},
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+22 -14
View File
@@ -303,14 +303,17 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
clickButtonToUpload2(file) { // clickButtonToUpload2(file) {
let attId = "" // let attId = ""
if(file && file.id){ // if(file && file.id){
attId = file.id // attId = file.id
}else { // }else {
attId = file.response.data.id // attId = file.response.data.id
} // }
this.$preview(attId) // this.$preview(attId)
// },
clickButtonToUpload2(fileId) {
this.$preview(fileId)
}, },
clickButtonToUpload(file) { clickButtonToUpload(file) {
let attId = "" let attId = ""
@@ -412,7 +415,7 @@
this.form.fileName = response.data.name this.form.fileName = response.data.name
this.form.fileList.push(response.data) this.form.fileList.push(response.data)
this.$message({ this.$message({
showClose: true, // showClose: true,
message: response.message, message: response.message,
type: 'success' type: 'success'
}) })
@@ -495,7 +498,7 @@
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.commentText3 = data.commentText3 || '' // this.commentText3 = data.commentText3 || ''
this.todoId = res.id this.todoId = res.id
this.form.title = data.title || data.form.title this.form.title = data.title || data.form.title
this.form.processName = data.processName || data.form.processName this.form.processName = data.processName || data.form.processName
@@ -505,11 +508,16 @@
this.form.modelList = data.modelList || data.form.modelList this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form ? data.form.responUserList : data.responUserList this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
this.form.fileName = data.form? data.form.fileName : '' // this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : '' // this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : '' // this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.docUser this.newDocUser = data.docUser
this.form.fileList = data.form ? data.form.fileList : [] // this.form.fileList = data.form ? data.form.fileList : []
this.commentText3 = data.commentText3 || data.commentText || ''
this.form.fileName = data.form? data.form.fileName : data.fileName || ''
this.form.fileId = data.form ? data.form.fileId : data.fileId || ''
this.form.dyhz = data.form ? data.form.dyhz : data.dyhz || ''
this.form.fileList = data.form ? data.form.fileList : data.fileList || []
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+11 -8
View File
@@ -279,14 +279,17 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
clickButtonToUpload2(file) { // clickButtonToUpload2(file) {
let attId = "" // let attId = ""
if(file && file.id){ // if(file && file.id){
attId = file.id // attId = file.id
}else { // }else {
attId = file.response.data.id // attId = file.response.data.id
} // }
this.$preview(attId) // this.$preview(attId)
// },
clickButtonToUpload2(fileId) {
this.$preview(fileId)
}, },
clickButtonToUpload(file) { clickButtonToUpload(file) {
let attId = "" let attId = ""
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+7 -5
View File
@@ -435,7 +435,7 @@
</div> </div>
<div style="width: 80%"> <div style="width: 80%">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''"> <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
type="textarea" type="textarea"
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
@@ -444,7 +444,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
type="textarea" type="textarea"
v-model="plForm.changePoint" v-model="plForm.changePoint"
@@ -453,7 +453,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
@@ -466,18 +466,20 @@
class="myDataPick" class="myDataPick"
:config="{attrName: '新车型实施日期'}" :config="{attrName: '新车型实施日期'}"
v-model="plForm.newData" v-model="plForm.newData"
:required="true"
></custom-date-pick-group> ></custom-date-pick-group>
<custom-date-pick-group <custom-date-pick-group
class="myDataPick" class="myDataPick"
:config="{attrName: '在产车实施日期'}" :config="{attrName: '在产车实施日期'}"
v-model="plForm.onlineData" v-model="plForm.onlineData"
:required="true"
></custom-date-pick-group> ></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
<el-select :disabled="disabledXX" multiple v-model="plForm.applyArctic"> <el-select :disabled="disabledXX" multiple v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任人" prop="zrUserId" class="add-form-item"> <el-form-item label="责任人" prop="zrUserId" class="add-form-item" required>
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
style="display: none;" style="display: none;"
v-model="plForm.zrUserId" v-model="plForm.zrUserId"
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+8 -6
View File
@@ -382,7 +382,7 @@
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div> <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div> </div>
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150> <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1"> <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1" required>
<el-input <el-input
type="textarea" type="textarea"
v-model="editForm.technicalRequir" v-model="editForm.technicalRequir"
@@ -391,7 +391,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1" required>
<el-input <el-input
type="textarea" type="textarea"
v-model="editForm.changePoint" v-model="editForm.changePoint"
@@ -400,7 +400,7 @@
:autosize="{minRows:10,maxRows:10}" :autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1" required>
<el-input <el-input
type="textarea" type="textarea"
:autosize="{ minRows: 4, maxRows: 14}" :autosize="{ minRows: 4, maxRows: 14}"
@@ -413,18 +413,20 @@
class="myDataPick" class="myDataPick"
:config="{attrName: '新车型实施日期'}" :config="{attrName: '新车型实施日期'}"
v-model="editForm.newData" v-model="editForm.newData"
:required="true"
></custom-date-pick-group> ></custom-date-pick-group>
<custom-date-pick-group <custom-date-pick-group
class="myDataPick" class="myDataPick"
:config="{attrName: '在产车实施日期'}" :config="{attrName: '在产车实施日期'}"
v-model="editForm.onlineData" v-model="editForm.onlineData"
:required="true"
></custom-date-pick-group> ></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" > <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" required>
<el-select multiple v-model="editForm.applyArctic"> <el-select multiple v-model="editForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option> <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" > <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" required>
<el-select <el-select
v-model="editForm.complianceRequir" v-model="editForm.complianceRequir"
placeholder="请选择符合性要求"> placeholder="请选择符合性要求">
@@ -432,7 +434,7 @@
<el-option value="2" label="不符合"></el-option> <el-option value="2" label="不符合"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" > <el-form-item label="合规性分析" prop="complianceState" class="add-form-item" required>
<el-input <el-input
v-model="editForm.complianceState" v-model="editForm.complianceState"
placeholder="请输入合规性分析" placeholder="请输入合规性分析"
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+3 -2
View File
@@ -373,7 +373,8 @@
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0"> <!-- <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">-->
<div style="position: absolute;bottom: 115px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0"> <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px"> <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
@@ -438,7 +439,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div style="height: calc(100% - 65px); overflow: auto"> <div style="height: calc(100% - 125px); overflow: auto">
<el-table <el-table
:data="productData" :data="productData"
tooltip-effect="dark" tooltip-effect="dark"
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+3 -2
View File
@@ -253,7 +253,7 @@
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0"> <div style="position: absolute;bottom: 120px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0"> <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
@@ -291,7 +291,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
height="100%" height="calc(100% - 64px)"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@row-click="rowClick" @row-click="rowClick"
@@ -1517,6 +1517,7 @@ export default {
this.dataList = this.listForm.dataList this.dataList = this.listForm.dataList
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText = mes.commentText
console.log(this.listForm)
}) })
}, },
}, },
src/sysConfig/index.js
+1 -1
View File
@@ -11,7 +11,7 @@
// const devIp = '10.10.10.46' // const devIp = '10.10.10.46'
// const devInterfacePORT = '4202' // const devInterfacePORT = '4202'
// const devIp = '10.0.3.10' // const devIp = '10.0.3.10'
const devIp = '10.0.3.8' const devIp = 'localhost'
const devInterfacePORT = '10086' const devInterfacePORT = '10086'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8033'
yarn.lock
+7081 -7232
View File
File diff suppressed because it is too large Load Diff