master
lion 3 years ago
parent 421fb20be4
commit e6ef420fe0

@ -0,0 +1,9 @@
import request from '@/utils/request'
export function index(params) {
return request({
url: '/api/admin/other/contract',
method: 'get',
params:params
})
}

@ -3,19 +3,17 @@
<xy-dialog ref="dialog" :width='80' :is-show.sync="isShow" type="form" :title="type === 'add' ? `新增${rukuTypeName}入库` : `编辑${rukuTypeName}入库`" :form="form" <xy-dialog ref="dialog" :width='80' :is-show.sync="isShow" type="form" :title="type === 'add' ? `新增${rukuTypeName}入库` : `编辑${rukuTypeName}入库`" :form="form"
:rules="rules" @submit="submit"> :rules="rules" @submit="submit">
<!-- <template v-slot:guanlianhetong v-if="form.rukuleixing=='采购'"> <template v-slot:caigouhetong v-if="form.rukuleixing=='采购'">
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>关联合同 <span style="color: red;font-weight: 600;padding-right: 4px;"></span>采购合同
</div> </div>
<div class="xy-table-item-content"> <div class="xy-table-item-content">
<el-select v-model="form.guanlianhetong" style="width: 300px;" placeholder="请选择"> <el-input type="text" @focus="isShowHt=true" v-model="form.caigouhetong"
<el-option v-for="item in lexingoptions" :key="item.value" :label="item.label" :value="item.value"> placeholder="请选择采购合同" style="width: 300px;"></el-input>
</el-option>
</el-select>
</div> </div>
</div> </div>
</template> --> </template>
<template v-slot:rukushijian> <template v-slot:rukushijian>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
@ -244,9 +242,20 @@
@on-current-change="wuziSelect" /> @on-current-change="wuziSelect" />
<Page :current="wuziPageIndex" :total="showTotal" simple <Page :current="wuziPageIndex" :total="showTotal" simple
style="padding-top: 14px;display: flex;justify-content: center;" @on-change="wuziPageChange" /> style="padding-top: 14px;display: flex;justify-content: center;" @on-change="wuziPageChange" />
</Modal>
<!-- 选择采购合同 -->
<Modal v-model="isShowHt" title="合同选择">
<div class="searchCompanys">
<el-input type="text" @keyup.enter.native="getHt" v-model="htkeyword" placeholder="请输入关键词查找"></el-input>
<el-button type="primary" @click="getHt"></el-button>
</div>
<Table highlight-row ref="currentRowTable" :columns="htColumns" :data="htList"
@on-current-change="htSelect" />
<Page :current="htPageIndex" :total="htTotal" simple
style="padding-top: 14px;display: flex;justify-content: center;" @on-change="htPageChange" />
</Modal> </Modal>
</div> </div>
</template> </template>
@ -255,7 +264,10 @@
save, save,
index, index,
show show
} from "@/api/system/baseForm.js" } from "@/api/system/baseForm.js"
import {
index as getContract
} from "@/api/contract.js"
import { import {
Message Message
} from 'element-ui' } from 'element-ui'
@ -282,9 +294,10 @@
value: '回库' value: '回库'
}], }],
rukupiciList:[], rukupiciList:[],
form: { form: {
caigouhetong:'',
rukushijian: '', rukushijian: '',
// guanlianhetong:'', // caigouhetong:'',
rukuleixing: '', rukuleixing: '',
rukucangku: '', rukucangku: '',
jingbanren: "", jingbanren: "",
@ -298,9 +311,9 @@
required: true, required: true,
message: '请选择入库时间' message: '请选择入库时间'
}], }],
// rukushijian: [{ // caigouhetong: [{
// required: true, // required: true,
// message: '' // message: ''
// }], // }],
jingbanren: [{ jingbanren: [{
required: true, required: true,
@ -310,7 +323,8 @@
required: true, required: true,
message: '请填写记录人员' message: '请填写记录人员'
}] }]
}, },
hetongoptions:[],
isShowMingxi: false, isShowMingxi: false,
showLoading: true, showLoading: true,
mingxiObj: { mingxiObj: {
@ -388,15 +402,84 @@
},{ },{
title:'物资类型', title:'物资类型',
key:'wuzileixing', key:'wuzileixing',
}] }],
//
isShowHt: false,
htList: [],
htPageIndex: 1,
htkeyword: '',
htTotal: 0,
htColumns: [{
width: 60,
_isChecked: false,
key: "isSelect",
resizable: true,
render: (h, params) => {
return h('div', [
h('Radio', {
props: {
value: params.row.isSelect
},
on: {
'on-change': (e) => {
this.htList.forEach((items) => {
this.$set(items, 'isSelect', false)
});
this.htList[params.index].isSelect = e;
}
}
})
])
}
}, {
title: '名称',
key: 'name',
},{
title:'类型',
key:'type_name',
},{
title:'状态',
key:'status_name'
}]
} }
}, },
created() { created() {
this.getCangku() this.getCangku()
// this.getWuzi() // this.getWuzi()
// this.getKucun() // this.getKucun()
}, },
methods: { methods: {
async getHt(){
let res = await getContract({
page_size: 10,
page: this.htPageIndex,
keyword:this.htkeyword
// type:2,
})
for (var m of res.data) {
m.isSelect = false
m.type_name = '货物'
m.status_name = m.status==1?'待签订':(m.status==2?'已签订':'')
}
this.htList = res.data
this.htTotal = res.total
// this.hetongoptions = res.data
},
htSelect(e) {
this.htList.forEach((items) => {
this.$set(items, 'isSelect', false)
if(items.id==e.id){
this.$set(items, 'isSelect', true)
}
});
this.form.caigouhetong = e.name
},
htPageChange(e) {
console.log("e", e)
this.htPageIndex = e
this.getHt()
},
mingxiConfirm() { mingxiConfirm() {
setTimeout(() => { setTimeout(() => {
this.showLoading = false this.showLoading = false
@ -624,7 +707,8 @@
id: this.id, id: this.id,
table_name: this.tableName table_name: this.tableName
}) })
this.form = { this.form = {
caigouhetong:res?.caigouhetong,
rukushijian: res?.rukushijian, rukushijian: res?.rukushijian,
rukuleixing: res?.rukuleixing, rukuleixing: res?.rukuleixing,
rukucangku:res.rukucangku, rukucangku:res.rukucangku,
@ -741,7 +825,10 @@
isShow(newVal) { isShow(newVal) {
if (newVal) { if (newVal) {
this.form.rukuleixing = this.rukuType this.form.rukuleixing = this.rukuType
this.rukuTypeName = this.rukuType=='回库'?'归还':this.rukuType this.rukuTypeName = this.rukuType=='回库'?'归还':this.rukuType
if(this.rukuType=='采购'){
this.getHt()
}
if (this.type === 'editor') { if (this.type === 'editor') {
this.getDetail() this.getDetail()
} }

Loading…
Cancel
Save