From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
index 04e7563..be72b12 100644
--- a/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/itemCirculatOrder/ItemCirculatOrder-AddOrUpdate.vue
@@ -1,7 +1,7 @@
<template>
- <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <zt-dialog ref="dialog" column="3" @confirm="formSubmit">
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled" label-width="120px" class="circulationFormAuto">
- <div class="">
+ <div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
<span>{{dataForm.circulatOrder.code}}</span>
</el-form-item>
@@ -24,7 +24,7 @@
<el-input v-model="dataForm.project.softwareIdentity" placeholder="鐗╁搧缂栧彿"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="鏁� 閲�" style="width: 32%">
- <el-input v-model="dataForm.project.softwareName" placeholder="鏁伴噺"></el-input>
+ <el-input v-model="dataForm.project.isContract" placeholder="鏁伴噺"></el-input>
</el-form-item>
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
@@ -38,19 +38,19 @@
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="Name" min-width="180" label="鎶�鏈祫鏂欏悕绉�">
+ <el-table-column prop="infoName" min-width="180" label="鎶�鏈祫鏂欏悕绉�">
<template v-slot="{ row }">
- <el-input v-model="row.Name" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
+ <el-input v-model="row.name" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
</template>
</el-table-column>
<el-table-column prop="identify" align="center" width="150" label="鏍囪瘑">
<template v-slot="{ row }">
- <el-input v-model="row.identify" placeholder="鏍囪瘑"></el-input>
+ <el-input v-model="row.version" placeholder="鏍囪瘑"></el-input>
</template>
</el-table-column>
<el-table-column prop="version" align="center" width="120" label="鐗堟湰">
<template v-slot="{ row }">
- <el-input v-model="row.version" placeholder="鐗堟湰"></el-input>
+ <el-input v-model="row.identify" placeholder="鐗堟湰"></el-input>
</template>
</el-table-column>
<el-table-column prop="secretClass" label="瀵嗙骇" width="100" align="center">
@@ -74,11 +74,11 @@
<el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="80" align="center">
+ <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
<template v-slot="{ row }">
<!-- <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>-->
- <table-uploader busi-type="test_order" model-name="dataForm" :dataForm="dataForm"
- v-model="row.files"/>
+ <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
+ v-model="row.files"/>
</template>
</el-table-column>
</el-table>
@@ -156,7 +156,7 @@
</div>
<div class="el-border-left " style="width: 35%;height: 40px;">
<el-form-item label="鏄惁婊¤冻娴嬭瘯瑕佹眰" label-width="150px" style="padding-left:20px;margin-bottom:0">
- <zt-dict v-model="dataForm.circulatOrder.acceptSituation" :radio="true" dict="is_or_not"></zt-dict>
+ <zt-dict v-model="dataForm.circulatOrder.cscs" :radio="true" dict="is_or_not"></zt-dict>
</el-form-item>
</div>
</div>
@@ -364,16 +364,18 @@
...this.dataForm,
...res.data
}
- console.log(this.dataForm,"this.dataForm")
+ console.log(this.dataForm,"getInfo this.dataForm")
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
+ console.log(this.dataForm,"this.dataForm11111")
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/itemCirculatOrder/ItemCirculatOrder/', this.dataForm)
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('refreshDataList')
}
+
}
}
}
--
Gitblit v1.9.1