commit
This commit is contained in:
zhutianqi
@@ -404,7 +404,7 @@
|
||||
<div style="display: flex; height: 100%;">
|
||||
<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="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>
|
||||
<div v-else style="height: 100%;">
|
||||
@@ -417,7 +417,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
<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) {
|
||||
this.itermsConditions = row.itermsConditions
|
||||
this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
|
||||
let itemsEoPage = {
|
||||
oldItemId: row.itemsId,
|
||||
newItemId: row.itemsId2,
|
||||
@@ -847,7 +847,7 @@
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getData () {
|
||||
queryTaskFirst({
|
||||
|
||||
@@ -68,6 +68,15 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</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-row>
|
||||
</div>
|
||||
@@ -383,6 +392,7 @@ export default {
|
||||
itemsName: '',
|
||||
itemsNum1: '',
|
||||
itemsName1: '',
|
||||
endTime: '',
|
||||
},
|
||||
json: {},
|
||||
}
|
||||
@@ -463,7 +473,7 @@ export default {
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
@@ -504,6 +514,7 @@ export default {
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
let data = JSON.parse(res.mesg)
|
||||
this.form.endTime = data.endTime || data.form.endTime
|
||||
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||
if (data.form) {
|
||||
|
||||
@@ -412,7 +412,7 @@
|
||||
<div style="display: flex; height: 100%;">
|
||||
<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="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>
|
||||
<div v-else style="height: 100%;">
|
||||
@@ -425,7 +425,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
<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) {
|
||||
this.itermsConditions = row.itermsConditions
|
||||
this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
|
||||
let itemsEoPage = {
|
||||
oldItemId: row.itemsId,
|
||||
newItemId: row.itemsId2,
|
||||
@@ -860,7 +860,7 @@ export default {
|
||||
},
|
||||
itermsConditionsOpen(row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
showUser(row) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
|
||||
@@ -59,7 +59,6 @@
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
disabled
|
||||
:picker-options="pickerOptions"
|
||||
placeholder="请选择截止日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
@@ -381,7 +380,7 @@
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
|
||||
@@ -59,7 +59,6 @@
|
||||
v-model="form.endTime"
|
||||
type="date"
|
||||
disabled
|
||||
:picker-options="pickerOptions"
|
||||
placeholder="请选择截止日期"
|
||||
value-format="yyyy-MM-dd">
|
||||
</el-date-picker>
|
||||
@@ -368,7 +367,7 @@
|
||||
<div style="display: flex; height: 100%;">
|
||||
<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="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>
|
||||
<div v-else style="height: 100%;">
|
||||
@@ -381,7 +380,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
|
||||
@@ -624,7 +623,7 @@
|
||||
})
|
||||
},
|
||||
itemEdit (row) {
|
||||
this.itermsConditions = row.itermsConditions
|
||||
this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
|
||||
let itemsEoPage = {
|
||||
oldItemId: row.itemsId,
|
||||
newItemId: row.itemsId2,
|
||||
@@ -718,7 +717,7 @@
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
|
||||
@@ -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 () {
|
||||
this.$router.push('/phoneBzjdStep4')
|
||||
},
|
||||
@@ -449,7 +434,7 @@
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
|
||||
@@ -431,7 +431,7 @@
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
|
||||
@@ -429,7 +429,7 @@
|
||||
},
|
||||
itermsConditionsOpen (row) {
|
||||
this.itermsConditionsFlag = true
|
||||
this.itermsConditionsTitle = row
|
||||
this.itermsConditionsTitle = row.replace(/''/g, '\'')
|
||||
},
|
||||
getHistoryData () {
|
||||
this.$http.get('lawss/activiti/get_list_by_instance', {
|
||||
|
||||
Reference in New Issue
Block a user