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

commit

Browse Source
This commit is contained in:
zhutianqi
2022-01-18 17:19:12 +08:00
parent 04e482eda6
commit 35a3eab82a
8 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+4 -4
View File
@@ -404,7 +404,7 @@
<div style="display: flex; height: 100%;"> <div style="display: flex; height: 100%;">
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 "> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex;"> <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
<div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<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>
<div v-else style="height: 100%;"> <div v-else style="height: 100%;">
@@ -417,7 +417,7 @@
</div> </div>
</div> </div>
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 "> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
<div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<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="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%;' : ''">
@@ -713,7 +713,7 @@
}) })
}, },
itemEdit (row, type, index) { itemEdit (row, type, index) {
this.itermsConditions = row.itermsConditions this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
let itemsEoPage = { let itemsEoPage = {
oldItemId: row.itemsId, oldItemId: row.itemsId,
newItemId: row.itemsId2, newItemId: row.itemsId2,
@@ -847,7 +847,7 @@
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getData () { getData () {
queryTaskFirst({ queryTaskFirst({
src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+12 -1
View File
@@ -68,6 +68,15 @@
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-date-picker
v-model="form.endTime"
type="date"
disabled
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -383,6 +392,7 @@ export default {
itemsName: '', itemsName: '',
itemsNum1: '', itemsNum1: '',
itemsName1: '', itemsName1: '',
endTime: '',
}, },
json: {}, json: {},
} }
@@ -463,7 +473,7 @@ export default {
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -504,6 +514,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.endTime = data.endTime || data.form.endTime
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
if (data.form) { if (data.form) {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+4 -4
View File
@@ -412,7 +412,7 @@
<div style="display: flex; height: 100%;"> <div style="display: flex; height: 100%;">
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 "> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex;"> <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
<div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<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>
<div v-else style="height: 100%;"> <div v-else style="height: 100%;">
@@ -425,7 +425,7 @@
</div> </div>
</div> </div>
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 "> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
<div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<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="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%;' : ''">
@@ -726,7 +726,7 @@ export default {
}) })
}, },
itemEdit (row, type, index) { itemEdit (row, type, index) {
this.itermsConditions = row.itermsConditions this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
let itemsEoPage = { let itemsEoPage = {
oldItemId: row.itemsId, oldItemId: row.itemsId,
newItemId: row.itemsId2, newItemId: row.itemsId2,
@@ -860,7 +860,7 @@ export default {
}, },
itermsConditionsOpen(row) { itermsConditionsOpen(row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
showUser(row) { showUser(row) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+1 -2
View File
@@ -59,7 +59,6 @@
v-model="form.endTime" v-model="form.endTime"
type="date" type="date"
disabled disabled
:picker-options="pickerOptions"
placeholder="请选择截止日期" placeholder="请选择截止日期"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
@@ -381,7 +380,7 @@
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+4 -5
View File
@@ -59,7 +59,6 @@
v-model="form.endTime" v-model="form.endTime"
type="date" type="date"
disabled disabled
:picker-options="pickerOptions"
placeholder="请选择截止日期" placeholder="请选择截止日期"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
@@ -368,7 +367,7 @@
<div style="display: flex; height: 100%;"> <div style="display: flex; height: 100%;">
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1"> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex;"> <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
<div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<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>
<div v-else style="height: 100%;"> <div v-else style="height: 100%;">
@@ -381,7 +380,7 @@
</div> </div>
</div> </div>
<div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1"> <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1">
<div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div> <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<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>
@@ -624,7 +623,7 @@
}) })
}, },
itemEdit (row) { itemEdit (row) {
this.itermsConditions = row.itermsConditions this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
let itemsEoPage = { let itemsEoPage = {
oldItemId: row.itemsId, oldItemId: row.itemsId,
newItemId: row.itemsId2, newItemId: row.itemsId2,
@@ -718,7 +717,7 @@
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+1 -16
View File
@@ -389,21 +389,6 @@
} }
}) })
}, },
itemEdit (row) {
this.itemId = row.id
this.modalshowflag2 = true
this.editForm = {
technicalRequir: row.technicalRequir, // 核心技术要求
changePoint: row.changePoint, // 国内标准的差异点
complianceRequir: row.complianceRequir || '1', // 符合性要求
complianceState: row.complianceState, // 合规性分析
newData: row.newData, // 新车型实施日期
onlineData: row.onlineData, // 在产车实施日期
applyArctic: row.applyArctic, // 适用车型
itemsId: row.itemsId,
itemsId2: row.itemsId2
}
},
phoneClick () { phoneClick () {
this.$router.push('/phoneBzjdStep4') this.$router.push('/phoneBzjdStep4')
}, },
@@ -449,7 +434,7 @@
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+1 -1
View File
@@ -431,7 +431,7 @@
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+1 -1
View File
@@ -429,7 +429,7 @@
}, },
itermsConditionsOpen (row) { itermsConditionsOpen (row) {
this.itermsConditionsFlag = true this.itermsConditionsFlag = true
this.itermsConditionsTitle = row this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getHistoryData () { getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {