Commit b0664363 authored by zhangtengjiao's avatar zhangtengjiao

完善了表单信息交互

parent bc2fd565
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合同类型id" prop="typeID"> <el-form-item label="合同类型id" prop="typeID">
<el-input v-model="formId" placeholder="请输入" maxlength="100" disabled /> <el-input v-model="form.BUSINESSTYPE" placeholder="请输入" maxlength="100" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="支付币种" prop="PAYMENTCURRENCY"> <el-form-item label="支付币种" prop="PAYMENTCURRENCY">
<el-input v-model.trim="form.PAYMENTCURRENCY" placeholder="请输入" maxlength="100" /> <el-input v-model.trim="form.TZXX.PAYMENTCURRENCY" placeholder="请输入" maxlength="100" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -355,13 +355,13 @@ ...@@ -355,13 +355,13 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="发票类型" prop="INVOICETYPE"> <el-form-item label="发票类型" prop="INVOICETYPE">
<el-input v-model="form.INVOICETYPE" placeholder="请输入" maxlength="100"/> <el-input v-model="form.TZXX.INVOICETYPE" placeholder="请输入" maxlength="100"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合同价款支付条件" prop="CONTRACTPAYMENTTERMS"> <el-form-item label="合同价款支付条件" prop="CONTRACTPAYMENTTERMS">
<div class="input-long el-textarea el-input--mini el-input--suffix" style="width: 96%;"> <div class="input-long el-textarea el-input--mini el-input--suffix" style="width: 96%;">
<textarea v-model="form.CONTRACTPAYMENTTERMS" placeholder="请输入" autocomplete="off" rows="7" maxlength="1000" class="el-textarea__inner" style="resize: none; min-height: 28px;" /> <textarea v-model="form.TZXX.CONTRACTPAYMENTTERMS" placeholder="请输入" autocomplete="off" rows="7" maxlength="1000" class="el-textarea__inner" style="resize: none; min-height: 28px;" />
<span class="el-input__count">0/1000</span> <span class="el-input__count">0/1000</span>
</div> </div>
</el-form-item> </el-form-item>
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="是否约定保证金" prop="issfybzj"> <el-form-item label="是否约定保证金" prop="issfybzj">
<el-radio-group v-model="form.TZXX.issfybzj"> <el-radio-group v-model="form.TZXX.ISSFYBZJ">
<el-radio label="1"></el-radio> <el-radio label="1"></el-radio>
<el-radio label="0"></el-radio> <el-radio label="0"></el-radio>
</el-radio-group> </el-radio-group>
...@@ -466,6 +466,7 @@ ...@@ -466,6 +466,7 @@
</div>--> </div>-->
<el-upload <el-upload
class="upload-demo" class="upload-demo"
showUploadList=false
action="http://117.122.212.101:8090/contractjxx/contract-fjxx/upload" action="http://117.122.212.101:8090/contractjxx/contract-fjxx/upload"
multiple multiple
:headers="headers" :headers="headers"
...@@ -524,6 +525,8 @@ export default { ...@@ -524,6 +525,8 @@ export default {
active: 'basic', active: 'basic',
form: { form: {
USERID: '123', USERID: '123',
// eslint-disable-next-line no-undef
BUSINESSTYPE: this.$route.query.id,
ISSUPPLYCONTRACT: '0', ISSUPPLYCONTRACT: '0',
CONNAMECN: '', CONNAMECN: '',
CONLANGUAGE: '', CONLANGUAGE: '',
...@@ -555,24 +558,22 @@ export default { ...@@ -555,24 +558,22 @@ export default {
HSAMT: '', HSAMT: '',
HSBGAMT: '', HSBGAMT: '',
ISYZDW: '', ISYZDW: '',
CONTRACTPAYMENTTERMS: '',
INVOICETYPE: '',
PAYRULE: '', PAYRULE: '',
TZXX: { TZXX: {
PAYMETHOD: '价款方式编码', CONTRACTPAYMENTTERMS: '',
INVOICETYPE: '',
PAYMETHOD: '',
ISSFYYFK: '1', ISSFYYFK: '1',
PAYRULE: '预付款支付条件', PAYRULE: '',
issfybzj: '1', ISSFYBZJ: '1',
PAYMENTCURRENCY: '支付币种编码', PAYMENTCURRENCY: '',
RATEMETHOD: '汇率确定方式编码' RATEMETHOD: ''
}, },
HTDFXX: [ HTDFXX: [
{ UNITID: '1', hesuanzuzhi: '', AUTHORIZEDNAME: 'name(idCard)' }, { UNITID: '1', hesuanzuzhi: '', AUTHORIZEDNAME: '' }
{ UNITID: '2', hesuanzuzhi: '', AUTHORIZEDNAME: 'name(idCard)' }
], ],
FKDWXX: [ FKDWXX: [
{ DRAWEEID: '测试付款人1' }, { DRAWEEID: '' }
{ DRAWEEID: '测试付款人2' }
], ],
SKDWXX: [ SKDWXX: [
{ PAYEEID: '测试收款人1', PAYEEACCOUNTYPE: '账户类型1', PAYEEACCOUNNAME: '账户名称', PAYEEACCOUNBANK: '中国银行', PAYEEACCOUNNUMBER: '测试账号', BANKCOUNTRY: '中国', SWIFTCODE: '' } { PAYEEID: '测试收款人1', PAYEEACCOUNTYPE: '账户类型1', PAYEEACCOUNNAME: '账户名称', PAYEEACCOUNBANK: '中国银行', PAYEEACCOUNNUMBER: '测试账号', BANKCOUNTRY: '中国', SWIFTCODE: '' }
...@@ -581,6 +582,8 @@ export default { ...@@ -581,6 +582,8 @@ export default {
{ GUARANTYTYPE: '保证金类型编码', GUARANTYPROPORT: '1.1', GUARANTYAMT: '1.1', GUARANTYXJZFBHTHTJ: '测试保证金退换条件' } { GUARANTYTYPE: '保证金类型编码', GUARANTYPROPORT: '1.1', GUARANTYAMT: '1.1', GUARANTYXJZFBHTHTJ: '测试保证金退换条件' }
], ],
FJXX: [ FJXX: [
{ FILEID: 1, FILENAME: '测试请勿下载', BUSITYPE: 1, BUSINESSID: 1, FILESAVENAME: 1, FROMID: '' }
], ],
amount: '' amount: ''
}, },
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合同类型id" prop="typeID"> <el-form-item label="合同类型id" prop="typeID">
<el-input v-model="formId" placeholder="请输入" maxlength="100" disabled /> <el-input v-model="form.BUSINESSTYPE" placeholder="请输入" maxlength="100" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -254,17 +254,17 @@ ...@@ -254,17 +254,17 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="支付币种" prop="PAYMENTCURRENCY"> <el-form-item label="支付币种" prop="PAYMENTCURRENCY">
<el-input v-model.trim="form.PAYMENTCURRENCY" placeholder="请输入" maxlength="100" /> <el-input v-model.trim="form.TZXX.PAYMENTCURRENCY" placeholder="请输入" maxlength="100" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="汇率确定方式" prop="RATEMETHOD"> <el-form-item label="汇率确定方式" prop="RATEMETHOD">
<el-input v-model.trim="form.RATEMETHOD" placeholder="请输入" maxlength="100" /> <el-input v-model.trim="form.TZXX.RATEMETHOD" placeholder="请输入" maxlength="100" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="价款方式" prop="PAYMETHOD"> <el-form-item label="价款方式" prop="PAYMETHOD">
<el-input v-model.trim="form.PAYMETHOD" placeholder="请输入" maxlength="100" /> <el-input v-model.trim="form.TZXX.PAYMETHOD" placeholder="请输入" maxlength="100" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -355,20 +355,20 @@ ...@@ -355,20 +355,20 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="发票类型" prop="INVOICETYPE"> <el-form-item label="发票类型" prop="INVOICETYPE">
<el-input v-model="INVOICETYPE" placeholder="请输入" maxlength="100"/> <el-input v-model="form.TZXX.INVOICETYPE" placeholder="请输入" maxlength="100"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合同价款支付条件" prop="CONTRACTPAYMENTTERMS"> <el-form-item label="合同价款支付条件" prop="CONTRACTPAYMENTTERMS">
<div class="input-long el-textarea el-input--mini el-input--suffix" style="width: 96%;"> <div class="input-long el-textarea el-input--mini el-input--suffix" style="width: 96%;">
<textarea v-model="form.CONTRACTPAYMENTTERMS" placeholder="请输入" autocomplete="off" rows="7" maxlength="1000" class="el-textarea__inner" style="resize: none; min-height: 28px;" /> <textarea v-model="form.TZXX.CONTRACTPAYMENTTERMS" placeholder="请输入" autocomplete="off" rows="7" maxlength="1000" class="el-textarea__inner" style="resize: none; min-height: 28px;" />
<span class="el-input__count">0/1000</span> <span class="el-input__count">0/1000</span>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="是否有预付款" prop="ISSFYYFK"> <el-form-item label="是否有预付款" prop="ISSFYYFK">
<el-radio-group v-model="form.ISSFYYFK"> <el-radio-group v-model="form.TZXX.ISSFYYFK">
<el-radio label="1"></el-radio> <el-radio label="1"></el-radio>
<el-radio label="0"></el-radio> <el-radio label="0"></el-radio>
</el-radio-group> </el-radio-group>
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="预付款支付条件" prop="PAYRULE"> <el-form-item label="预付款支付条件" prop="PAYRULE">
<div class="input-long el-textarea el-input--mini el-input--suffix" style="width: 96%;"> <div class="input-long el-textarea el-input--mini el-input--suffix" style="width: 96%;">
<textarea v-model="form.PAYRULE" placeholder="请输入" autocomplete="off" rows="7" maxlength="1000" class="el-textarea__inner" style="resize: none; min-height: 28px;" /> <textarea v-model="form.TZXX.PAYRULE" placeholder="请输入" autocomplete="off" rows="7" maxlength="1000" class="el-textarea__inner" style="resize: none; min-height: 28px;" />
<span class="el-input__count">0/1000</span> <span class="el-input__count">0/1000</span>
</div> </div>
</el-form-item> </el-form-item>
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
</el-table-column> </el-table-column>
</el-table></div> </el-table></div>
<el-col :span="12"> <el-col :span="12">
<el-button type="success" @click.stop="upload()">保 存</el-button> <el-button type="success" @click.stop="updateInfo()">保 存</el-button>
</el-col> </el-col>
</div> </div>
</div> </div>
...@@ -605,7 +605,7 @@ export default { ...@@ -605,7 +605,7 @@ export default {
block: 'start' block: 'start'
}) })
}, },
upload() { updateInfo() {
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
/* this.$axios({ /* this.$axios({
method: 'post', method: 'post',
......
...@@ -3,19 +3,20 @@ ...@@ -3,19 +3,20 @@
<div class="search"> <div class="search">
<div style="flex: 1"> <div style="flex: 1">
<el-form inline label-width="auto" label-position="right"> <el-form inline label-width="auto" label-position="right">
<el-form-item label="任务名称"> <el-form-item label="中文名称">
<el-input v-model="form.name" placeholder="请输入任务名称" maxlength="30" /> <el-input v-model="serchForm.CONNAMECN" placeholder="请输入" maxlength="30" />
</el-form-item> </el-form-item>
<el-form-item label="创建日期"> <el-form-item label="合同编码">
<el-date-picker <el-input v-model="serchForm.CONCODE" placeholder="请输入" maxlength="30" />
v-model="form.createDate" </el-form-item>
type="date" <!-- <el-form-item label="项目编码">
value-format="yyyy-MM-dd" <el-input v-model="serchForm.PROJNUMBER" placeholder="请输入" maxlength="30" />
placeholder="请选择创建日期" </el-form-item>-->
/> <el-form-item label="项目名称">
<el-input v-model="serchForm.PROJNAME" placeholder="请输入" maxlength="30" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary">查询</el-button> <el-button type="primary" @click="findContract()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
/> />
</template>--> </template>-->
<el-switch <el-switch
v-model="row.CONSTATUS" v-model="row.SYNCHRONIZATIONSTATUS"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
@click.native="mergeSyn(row)" @click.native="mergeSyn(row)"
...@@ -135,6 +136,7 @@ export default { ...@@ -135,6 +136,7 @@ export default {
name: 'AdminList', name: 'AdminList',
data() { data() {
return { return {
serchForm: {},
form: { form: {
}, },
...@@ -209,6 +211,30 @@ export default { ...@@ -209,6 +211,30 @@ export default {
}) })
}, },
findContract() { findContract() {
this.$axios.get('http://117.122.212.101:8090/contract/contract/queryDemoContractByPage',
{ params: {
USERID: 123,
rows: this.rows,
page: this.page,
CONNAMECN: this.serchForm.CONNAMECN,
CONCODE: this.serchForm.CONCODE,
PROJNUMBER: this.serchForm.PROJNUMBER,
PROJNAME: this.serchForm.PROJNAME
}
}).then(res => {
if (!res.errno) {
this.data = res.data.data.records
this.total = res.data.data.total
this.rows = res.data.data.size
this.page = res.data.data.current
/* console.log(this.data)*/
}
})
.catch(function(error) {
console.log(error)
})
},
findContract2() {
this.$axios.get('http://117.122.212.101:8090/contract/contract/queryDemoContractByPage?page=1&rows=10&USERID=123').then(res => { this.$axios.get('http://117.122.212.101:8090/contract/contract/queryDemoContractByPage?page=1&rows=10&USERID=123').then(res => {
if (!res.errno) { if (!res.errno) {
this.data = res.data.data.records this.data = res.data.data.records
...@@ -225,6 +251,7 @@ export default { ...@@ -225,6 +251,7 @@ export default {
del(row) { del(row) {
this.$axios.delete('http://117.122.212.101:8090/contract/contract/realDelete/' + row.FROMID).then(res => { this.$axios.delete('http://117.122.212.101:8090/contract/contract/realDelete/' + row.FROMID).then(res => {
if (!res.errno) { if (!res.errno) {
alert('删除成功')
this.findContract() this.findContract()
/* console.log(this.data)*/ /* console.log(this.data)*/
} }
...@@ -235,11 +262,11 @@ export default { ...@@ -235,11 +262,11 @@ export default {
}, },
currentPageChange(page) { currentPageChange(page) {
this.page = page this.page = page
this.query() this.findContract()
}, },
pageSizeChange(size) { pageSizeChange(size) {
this.rows = size this.data.rows = size
this.query() this.findContract()
}, },
handleClose(done) { handleClose(done) {
this.$confirm('确认关闭?') this.$confirm('确认关闭?')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment