Browse Source

2023-6-2

master
guoxing 2 years ago
parent
commit
0729debb4f
  1. 2
      yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development
  2. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeProcure/oilTypeProcure.js
  3. 35
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/index.vue
  4. 10
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue
  5. 195
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue

2
yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development

@ -6,7 +6,7 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
## VUE_APP_URL = "http://cg9jzr.natappfree.cc"
## VUE_APP_URL = "http://192.168.1.177:7101"
##VUE_APP_URL = "http://192.168.1.177:7101"
VUE_APP_URL = "http://192.168.1.193:7101"

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeProcure/oilTypeProcure.js

@ -35,7 +35,7 @@ export default {
// 修改
procureUpdateData: function(data) {
return request({
url: '/v1/warehouselocation/update',
url: '/cyf/procurement//update',
method: 'post',
data: data
});
@ -49,7 +49,7 @@ export default {
})
},
// 新增提交
// 提交
procureAddSubmitInfo: function(data) {
return request({
url: '/cyf/procurement/submit',

35
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/index.vue

@ -20,8 +20,8 @@
<el-date-picker v-model="listQuery.params.date" type="date" :picker-options="pickerOptions"
clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
</el-form-item>
<el-form-item label="商名称">
<el-input v-model="listQuery.params.tradeName" maxlength="20" placeholder="请输入采购商品名称"
<el-form-item label="供应商名称">
<el-input v-model="listQuery.params.supplierName" maxlength="20" placeholder="请输入供应商名称"
class="addinputw" clearable />
</el-form-item>
</el-form>
@ -36,7 +36,7 @@
<div>
<el-table v-loading="tableLoading1" :data="list" border style="width: 100%">
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" wid align="center">
<el-table-column label="操作" wid align="center" width="200" >
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state==1"
@ -46,14 +46,11 @@
</template>
</el-table-column>
<el-table-column label="订单编号" prop="orderNumber" align="center" />
<el-table-column label="合同日期" prop="contractSigningDate" width="100" align="center" />
<el-table-column label="商品类型" prop="typeName" width="100" align="center" />
<el-table-column label="商品编码" prop="productCode" width="100" align="center" />
<el-table-column label="商品名称" prop="tradeName" width="180" align="center" />
<el-table-column label="单价" prop="price" width="80" align="center" />
<el-table-column label="数量" prop="weight" width="100" align="center" />
<el-table-column label="单位" prop="weight" width="100" align="center" />
<el-table-column label="合同日期" prop="contractSigningDate" width="120" align="center" />
<el-table-column label="到货日期" prop="arrivalDate" width="120" align="center" />
<el-table-column label="供应商名称" prop="supplierName" align="center" />
<el-table-column label="商品种类" prop="amount" width="120" align="center" />
<el-table-column label="总价值" prop="totalValue" width="120" align="center" />
<el-table-column label="订单状态" prop="stateValue" width="150" align="center" />
</el-table>
</div>
@ -178,9 +175,9 @@
params: {
orderNumber: '',
date: '',
tradeName: '',
supplierName: '',
type: '1', // 1 2 3
state: "1", // 1 2 3 4 5 6 7
// state: "1", // 1 2 3 4 5 6 7
},
total: 0
},
@ -192,9 +189,9 @@
params: {
orderNumber: '',
date: '',
tradeName: '',
supplierName: '',
type: '1', // 1 2 3
state: "1", // 1 2 3 4 5 6 7
// state: "1", // 1 2 3 4 5 6 7
},
total: 0
},
@ -330,7 +327,7 @@
tradeName: '',
date: "",
type: '1',
state: "1", // 1 2 3 4 5 6 7
// state: "1", // 1 2 3 4 5 6 7
}
}
this.loadLogList()
@ -352,7 +349,7 @@
tradeName: '',
date: "",
type: '1',
state: "1", // 1 2 3 4 5 6 7
// state: "1", // 1 2 3 4 5 6 7
}
}
this.loadIn112List()
@ -404,7 +401,7 @@
}
})
}
if ("1" == this.index) {
req.procureDelBySids(row.sid).then((response) => {
if (response.success) {
@ -428,7 +425,7 @@
},
toDetail(row) {
this.viewState = 4
this.$refs['divInfo'].showAdd(row.sid)
this.$refs['divInfo'].showAdd(row)
},
resetState() {
this.viewState = 1
@ -442,4 +439,4 @@
}
</script>
<style scoped>
</style>
</style>

10
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureAdd.vue

@ -85,15 +85,15 @@
<el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="crudeName" align="center">
<el-table-column label="商品名称" prop="name" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.crudeName" filterable placeholder="请选择原油名称"
<el-select v-model="scope.row.name" filterable placeholder="请选择原油名称"
@change="getType($event,scope.$index)">
<el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
</template>
</el-table-column>
<el-table-column label="商品编码" prop="crudeNumber" align="center" />
<el-table-column label="商品编码" prop="number" align="center" />
<el-table-column label="单位" prop="sss" align="center" />
<el-table-column label="单价" prop="price" align="center">
<template slot-scope="scope">
@ -323,8 +323,8 @@
console.log(">>>>>>>>>getType", index)
const choose = this.crudeLists.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.commodityList[index].crudeNumber = choose[0].number
this.formobj.commodityList[index].crudeName = choose[0].name
this.formobj.commodityList[index].number = choose[0].number
this.formobj.commodityList[index].name = choose[0].name
this.formobj.commodityList[index].sid = value
},

195
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue

@ -2,128 +2,93 @@
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>查看采购信息</div>
<div>采购信息</div>
<div>
<el-button type="primary" size="small" v-show="formobj.state<=5" :disabled="submitdisabled"
@click="submitData">提交</el-button>
<!-- <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> -->
<el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd">
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="titwu">采购信息</div>
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基本信息</div>
<div>主体信息</div>
</div>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">库房位置</span>
<span slot="label">合同编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.address}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">--</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.province}} - {{temp.city}} - {{temp.county}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">库房面积</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.squareMeasure}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">库房层高</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.floorHeight}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">库房价格</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.price}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">库房性质</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.properties}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">房源</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.housingResources}}</span>
<span>{{formobj.orderNumber}}</span>
<!-- <el-input v-model="formobj.orderNumber" placeholder="" style="width: 80%;" clearable /> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">备注</span>
<span slot="label">合同日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.remarks}}</span>
<span>{{formobj.contractSigningDate}}</span>
<!-- <el-date-picker v-model="formobj.contractSigningDate" type="date" style="width: 80%;"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">联系人</span>
<span slot="label">供货商名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.contacts}}</span>
<span>{{formobj.supplierName}}</span>
<!-- <el-select v-model="formobj.supplierName" filterable placeholder="请选择供货商名称" style="width: 80%;"
@change="getSupplier">
<el-option v-for="item in supplierList" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">联系电话</span>
<span slot="label">到货日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{temp.telephone}}</span>
<span>{{formobj.arrivalDate}}</span>
<!-- <el-date-picker v-model="formobj.arrivalDate" type="date" format="yyyy-MM-dd" style="width: 80%;"
value-format="yyyy-MM-dd" placeholder="请选择" /> -->
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item name="1" title="商品信息">
<!-- <template slot="title" title="商品信息">
商品信息<span class="span" @click.stop="add()">添加</span>
</template> -->
<el-table v-loading="listLoading" :data="formobj.commodityList" border style="width: 100%;"
:row-style="{height: '40px'}">
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="商品名称" prop="name" align="center" />
<el-table-column label="商品编码" prop="number" align="center" />
<el-table-column label="单位" prop="sss" align="center" />
<el-table-column label="单价" prop="price" align="center" />
<el-table-column label="重量" prop="weight" align="center" />
</el-table>
</el-collapse-item>
</el-collapse>
</el-form>
@ -136,31 +101,85 @@
import req from '@/api/oilTypeProcure/oilTypeProcure'
export default {
name: 'CustomerManagementInfo',
data() {
return {
temp: {} //
submitdisabled: false,
listLoading: false,
activeNames: ['1'],
formobj: {
sid: "",
orderNumber: "",
contractSigningDate: "",
arrivalDate: "",
supplierSid: "",
supplierName: "",
commodityList: [],
}
}
},
methods: {
submitData() {
console.log(">>>>>>>>>submit", this.formobj)
if (this.formobj.state = 5) {
//
} else {
//
req.procureAddSubmitInfo(this.formobj)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn("true")
} else {
// resp.code
}
})
.catch(() => {})
}
methods: {
showAdd(sid) {
req.fetchBySid(sid)
},
handleReturn(isreload) {
console.log(">>>>>>>>>")
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
this.formobj = {
sid: "",
orderNumber: "",
contractSigningDate: "",
arrivalDate: "",
supplierSid: "",
supplierName: "",
commodityList: [],
}
},
showAdd(row) {
console.log(">>>>>>>>>", row)
req.procureFetchBySid(row.sid)
.then(resp => {
if (resp.success) {
this.temp = resp.data
this.formobj = resp.data
}
})
.catch(e => {
this.$emit('doback')
this.formobj = row
})
},
//
handleReturn() {
this.$emit('doback')
}
//
indexMethod(index) {
// var pagestart = (this.listQuery.current - 1) * this.listQuery.size
// var pageindex = index + 1 + pagestart
return index + 1
},
}
}
</script>

Loading…
Cancel
Save