|
|
@@ -51,10 +51,11 @@
|
|
|
|
|
|
<el-row :span="24" v-if="timesTimeElement.timeState === 1">
|
|
|
<el-col :span="3.3" style="line-height: 40px">时间元素：</el-col>
|
|
|
- <el-col :span="18">
|
|
|
- <el-input v-model="timesTimeElement.timeName" placeholder="请点击后，在左边选择元素" @focus="timeElementFocus">
|
|
|
- <el-button slot="append" @click="timeElementFinish">完成</el-button>
|
|
|
- </el-input>
|
|
|
+ <el-col :span="14">
|
|
|
+ <el-input v-model="timesTimeElement.timeName" placeholder="请点击后，在左边选择元素" @focus="timeElementFocus"></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3" style="margin-left: 5px">
|
|
|
+ <el-button type="primary" :disabled="!isTimeElement" @click="timeElementFinish">完成</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -156,13 +157,14 @@ import {
|
|
|
getSignDetail
|
|
|
} from "../../../../../api/manager/AdjustForm";
|
|
|
import {findPfxType, getPriwbsPdf} from "../../../../../api/certificate/list";
|
|
|
+import {f} from "vuedraggable/dist/vuedraggable.common";
|
|
|
|
|
|
export default {
|
|
|
props: ['pkeyId1', 'htmlData1', 'excelId', 'times'],
|
|
|
data() {
|
|
|
return {
|
|
|
radio: '',
|
|
|
- isTimeSigning: false,
|
|
|
+ isTimeElement: false,
|
|
|
timesTimeElement: {
|
|
|
timeState: 2,
|
|
|
},
|
|
|
@@ -194,6 +196,7 @@ export default {
|
|
|
isEditLoaing: false,
|
|
|
sigRoleName: '',
|
|
|
saveLoaing: false
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -255,10 +258,8 @@ export default {
|
|
|
},
|
|
|
'times': {
|
|
|
handler(obj) {
|
|
|
- this.timesTimeElement = {
|
|
|
- timeName: obj.colName,
|
|
|
- timeColKey: obj.keyname
|
|
|
- }
|
|
|
+ this.$set(this.timesTimeElement, 'timeName', obj.colName)
|
|
|
+ this.$set(this.timesTimeElement, 'timeColKey', obj.keyname)
|
|
|
},
|
|
|
deep: true
|
|
|
}
|
|
|
@@ -505,6 +506,10 @@ export default {
|
|
|
obj.pyzby = this.pyzby
|
|
|
obj.id = this.signId
|
|
|
obj.isDeleted = this.isDeleted
|
|
|
+ const times = this.timesTimeElement
|
|
|
+ obj.timeState = times.timeState || 2
|
|
|
+ obj.timeName = times.timeName
|
|
|
+ obj.timeColKey = times.timeColKey
|
|
|
if (this.signType == 2) {
|
|
|
obj.parentRoleId = this.radio
|
|
|
obj.sigRoleId = this.sigRoleId
|
|
|
@@ -525,7 +530,9 @@ export default {
|
|
|
ele.tabId = obj.tabId
|
|
|
ele.show = false
|
|
|
ele.colName = this.htmlData1.name
|
|
|
-
|
|
|
+ ele.timeState = obj.timeState
|
|
|
+ ele.timeName = obj.timeName
|
|
|
+ ele.timeColKey = obj.timeColKey
|
|
|
}
|
|
|
})
|
|
|
this.$nextTick(() => {
|
|
|
@@ -599,9 +606,11 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
timeElementFocus() {
|
|
|
+ this.isTimeElement = true
|
|
|
this.$emit('timeFocus', true)
|
|
|
},
|
|
|
timeElementFinish() {
|
|
|
+ this.isTimeElement = false
|
|
|
this.$emit('timeFocus', false)
|
|
|
},
|
|
|
},
|
|
|
@@ -612,8 +621,6 @@ export default {
|
|
|
console.log(this.htmlData1, 'html1');
|
|
|
|
|
|
},
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
|
