|
@@ -25,7 +25,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="updateTime" label="配置时间" align="center">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="createId" label="配置人员" align="center">
|
|
|
+ <el-table-column prop="createName" label="配置人员" align="center">
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column prop="status" label="模板状态" align="center">
|
|
@@ -86,8 +86,8 @@
|
|
|
message: '截止时间不能为空',
|
|
|
trigger: 'change',
|
|
|
}">
|
|
|
- <el-date-picker v-model="issue_form.endTime" type="datetime"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%;">
|
|
|
+ <el-date-picker v-model="issue_form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ style="width: 100%;">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
@@ -141,8 +141,7 @@
|
|
|
:type="depttype" :closeList="closeList"></deptTreeOnly>
|
|
|
<div class="tree treeUser">
|
|
|
<p>{{ treeListonly.leaderAuditName }}
|
|
|
- <i v-if="treeListonly.leaderAuditName" @click="treeDelete()"
|
|
|
- class="el-icon-error"></i>
|
|
|
+ <i v-if="treeListonly.leaderAuditName" @click="treeDelete()" class="el-icon-error"></i>
|
|
|
</p>
|
|
|
</div>
|
|
|
<el-form-item style="margin-bottom:0;display:none;">
|
|
@@ -175,8 +174,8 @@
|
|
|
<el-table-column prop="status" label="审批意见">
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <el-pagination class="pageBox" @current-change="issuedLogChange" layout="prev, pager, next"
|
|
|
- background :total="issuedLogTotal">
|
|
|
+ <el-pagination class="pageBox" @current-change="issuedLogChange" layout="prev, pager, next" background
|
|
|
+ :total="issuedLogTotal">
|
|
|
</el-pagination>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
@@ -294,10 +293,10 @@ export default {
|
|
|
xiafaqueding() {
|
|
|
console.log(this.issue_form);
|
|
|
console.log(this.$refs.issue_ref);
|
|
|
-
|
|
|
+
|
|
|
this.$refs.issue_ref.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- this.BtnDisabled=true
|
|
|
+ this.BtnDisabled = true
|
|
|
if (this.issue_form.endTime) {
|
|
|
this.$http({
|
|
|
url: "/market/Issued/issuedTemplate",
|
|
@@ -320,7 +319,7 @@ export default {
|
|
|
this.getList({}, this.pageSize);
|
|
|
}
|
|
|
this.issue_visible = false;
|
|
|
- this.BtnDisabled=false;
|
|
|
+ this.BtnDisabled = false;
|
|
|
});
|
|
|
} else {
|
|
|
this.$http({
|
|
@@ -344,7 +343,7 @@ export default {
|
|
|
this.getList({}, this.pageSize);
|
|
|
}
|
|
|
this.issue_visible = false;
|
|
|
- this.BtnDisabled=false;
|
|
|
+ this.BtnDisabled = false;
|
|
|
});
|
|
|
}
|
|
|
|
|
@@ -420,6 +419,9 @@ export default {
|
|
|
},
|
|
|
}).then(({ data: { totalRecord, data } }) => {
|
|
|
this.tableData = data;
|
|
|
+ this.tableData.map((item) => {
|
|
|
+ item.createName = JSON.parse(window.sessionStorage.getItem('userInfo')).loginName
|
|
|
+ })
|
|
|
this.total = totalRecord;
|
|
|
this.loading = false;
|
|
|
});
|