yxt_group
/
supervise
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-6-30

master
guoxing 2 years ago
parent
be4d6b4e4c
commit
9d59b32951
15 changed files with 1502 additions and 713 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      supervise-customer-ui/.env.development
  2. 2
      supervise-report-ui/.env.development
  3. 2
      yxt-portal-ui/.env.development
  4. 23
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeYuanliao/index.js
  5. 8
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInAndOutBound/packagInAndOutBound.js
  6. 82
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagProcure/packagProcure.js
  7. 10
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue
  8. 359
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/packagProcure/index.vue
  9. 485
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/packagProcure/packagProcureAdd.vue
  10. 375
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/packagProcure/packagProcureInfo.vue
  11. 3
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureAdd.vue
  12. 210
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureInfo.vue
  13. 4
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
  14. 42
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/packagInBound/index.vue
  15. 42
      yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/rawMaterialInBound/index.vue

2
supervise-customer-ui/.env.development
View File

@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api/service'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://8.130.39.13:8112" ##VUE_APP_URL = "http://8.130.39.13:8112"
VUE_APP_URL = "http://127.0.0.1:8112" VUE_APP_URL = "http://192.168.1.193:8112"

2
supervise-report-ui/.env.development
View File

@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api/service'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://8.130.39.13:8112" ##VUE_APP_URL = "http://8.130.39.13:8112"
VUE_APP_URL = "http://192.168.3.173:8112" VUE_APP_URL = "http://192.168.1.193:8112"

2
yxt-portal-ui/.env.development
View File

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://127.0.0.1:8112" VUE_APP_URL = "http://192.168.1.193:8112"
# VUE_APP_URL = "http://8.130.39.13:8112" # VUE_APP_URL = "http://8.130.39.13:8112"

23
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/oilTypeYuanliao/index.js
View File

@ -1,6 +1,19 @@
import request from '@/utils/request' import request from '@/utils/request'
let tokens = window.sessionStorage.getItem('tokenValue') let tokens = window.sessionStorage.getItem('tokenValue')
export default { export default {
// 获取采购订单列表 数据字典
procureOrderList: function(params) {
return request({
url: '/cyf/materialProcurement/list',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 采购 // 采购
// 查询分页列表 // 查询分页列表
@ -26,6 +39,16 @@ export default {
} }
}) })
}, },
// 经理--财务提交
updateByState: function(data) {
return request({
url: '/cyf/materialProcurement/updateByState',
method: 'post',
data: data
});
},
// 编辑原料 // 编辑原料
update: function(params) { update: function(params) {
return request({ return request({

8
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInAndOutBound/packagInAndOutBound.js
View File

@ -90,5 +90,13 @@ export default {
}); });
}, },
packInventoryList: function(data) {
return request({
url: '/cyf/packinventory/inventoryList',
method: 'post',
data: data
});
},
} }

82
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagProcure/packagProcure.js
View File

@ -2,10 +2,25 @@ import request from '@/utils/request'
let tokens = window.sessionStorage.getItem('tokenValue') let tokens = window.sessionStorage.getItem('tokenValue')
export default { export default {
// 获取采购订单列表 数据字典
procureOrderList: function(params) {
return request({
url: '/cyf/packagingprocurement/list',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 采购
// 查询分页列表 // 查询分页列表
listPage: function(params) { loadLogList: function(params) {
return request({ return request({
url: '/cyf/procurement/listPage', url: '/cyf/packagingprocurement/listPage',
method: 'post', method: 'post',
data: params, data: params,
headers: { headers: {
@ -15,32 +30,79 @@ export default {
}) })
}, },
addInfo: function(data) { // 新增
procureAddInfo: function(data) {
return request({ return request({
url: '/v1/warehouselocation/save', url: '/cyf/packagingprocurement/save',
method: 'post', method: 'post',
data: data data: data
}); });
}, },
fetchBySid: function(sid) { // 初始化
procureFetchBySid: function(sid) {
return request({ return request({
url: '/v1/warehouselocation/getWarehouseBySid//' + sid url: '/cyf/packagingprocurement/getPackagingProcurementBySid/' + sid
}) })
}, },
updateData: function(data) { // 修改
procureUpdateData: function(data) {
return request({ return request({
url: '/v1/warehouselocation/update', url: '/cyf/packagingprocurement/update',
method: 'post', method: 'post',
data: data data: data
}); });
}, },
delBySids: function(sid) { // 删除
procureDelBySids: function(sid) {
return request({ return request({
url: '/v1/warehouselocation/delete/' + sid, url: '/cyf/packagingprocurement/delete/' + sid,
method: 'delete' method: 'delete'
}) })
}, },
// 提交
procureAddSubmitInfo: function(data) {
return request({
url: '/cyf/packagingprocurement/submit',
method: 'post',
data: data
});
},
// 流程提交
procureSubmitInfo: function(data) {
return request({
url: '/cyf/packagingprocurement/save',
method: 'post',
data: data
});
},
// 经理--财务提交
updateByState: function(data) {
return request({
url: '/cyf/packagingprocurement/updateByState',
method: 'post',
data: data
});
},
// 销售
// 查询分页列表
loadLogList2: function(params) {
return request({
url: '/cyf/procurement/listPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
} }

10
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/oilTypeProcure/oilTypeProcureInfo.vue
View File

@ -355,18 +355,8 @@
this.editDialog = true; this.editDialog = true;
} }
console.log(">>>>>>>>>submit", this.formobj) console.log(">>>>>>>>>submit", this.formobj)
// if (this.formobj.state = 5) {
// // 财务审批 需要填数据
// } else {
// // 财务之前 直接提交
// }
}, },
save() { save() {

359
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/packagProcure/index.vue
View File

@ -1,68 +1,95 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState ==1"> <div v-show="viewState ==1">
<button-bar view-title="采购管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar view-title="包装物采购销售管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content"> <div class="main-content">
<el-row style="margin-left: 20px;margin-right: 20px;">
<el-col>
<el-tabs v-model="tabActiveName" @tab-click="handleOrder">
<el-tab-pane label="包装物采购订单列表" name="uplog">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-button size="small" class="searchbtn"
<div v-show="isSearchShow" class="search"> @click="clicksearchShow1">{{ searchxianshitit1 }}</el-button>
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header"> <div v-show="isSearchShow1" class="search">
<el-form-item label="采购订单编号"> <el-form ref="listQueryform1" :inline="true" :model="listQuery" class="tab-header">
<el-input v-model="listQuery.params.bankName" maxlength="20" placeholder="请输入采购订单编号" class="addinputw" <el-form-item label="订单编号">
clearable /> <el-input v-model="listQuery.params.orderNumber" maxlength="20" placeholder="请输入订单编号"
class="addinputw" clearable />
</el-form-item> </el-form-item>
<el-form-item label="采购日期"> <el-form-item label="日期">
<el-date-picker v-model="listQuery.params.date" type="date" :picker-options="pickerOptions" clearable <el-date-picker v-model="listQuery.params.date" type="date" :picker-options="pickerOptions"
value-format="yyyy-MM-dd" placeholder="选择日期" /> clearable value-format="yyyy-MM-dd" placeholder="选择日期" />
</el-form-item> </el-form-item>
<el-form-item label="商品名称"> <el-form-item label="供应商名称">
<el-input v-model="listQuery.params.bankName" maxlength="20" placeholder="请输入采购商品名称" class="addinputw" <el-input v-model="listQuery.params.supplierName" maxlength="20" placeholder="请输入供应商名称"
clearable /> class="addinputw" clearable />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button> <el-button type="primary" icon="el-icon-search" size="small" @click="handleReset1">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleFilter">重置</el-button> <el-button type="primary" icon="el-icon-refresh" size="small"
@click="handleFilter1">重置</el-button>
</div> </div>
</div> </div>
</div> </div>
<el-row style="margin-left: 20px;margin-right: 20px;">
<el-col>
<el-tabs v-model="tabActiveName" @tab-click="handleOrder">
<el-tab-pane label="原油订单列表" name="uplog">
<div> <div>
<el-table v-loading="tableLoading1" :data="logList" border style="width: 100%"> <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="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" wid align="center" width="220"> <el-table-column label="操作" wid align="center" width="200" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button> <el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button>
<el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> <el-button type="primary" size="mini" v-show="scope.row.state==1"
<el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button> @click="toEdit(scope.row)">编辑</el-button>
<el-button type="primary" size="mini" v-show="scope.row.state==1"
@click="doDel(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单编号" prop="orderNumber" align="center" /> <el-table-column label="订单编号" prop="orderNumber" align="center" />
<el-table-column label="合同日期" prop="contractSigningDate" width="100" align="center" /> <el-table-column label="合同日期" prop="contractSigningDate" width="120" align="center" />
<el-table-column label="商品类型" prop="typeName" width="100" align="center" /> <el-table-column label="到货日期" prop="arrivalDate" width="120" align="center" />
<el-table-column label="商品编码" prop="productCode" width="80" 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="supplierName" align="center" /> <el-table-column label="供应商名称" prop="supplierName" 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="state" width="150" align="center" /> <el-table-column label="总价值" prop="totalValue" width="120" align="center" />
<el-table-column label="订单状态" prop="stateValue" width="150" align="center" />
</el-table> </el-table>
</div> </div>
<div class="pages"> <div class="pages">
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="logListTotal > 0" :total="logListTotal" :page.sync="logListQuery.current" <pagination v-show="listTotal > 0" :total="listTotal" :page.sync="listQuery.current"
:limit.sync="logListQuery.size" class="pagination" @pagination="loadLogList" /> :limit.sync="listQuery.size" class="pagination" @pagination="loadLogList" />
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="包装物订单列表" name="k112"> <el-tab-pane label="包装物销售订单列表" name="k112">
<div class="searchcon">
<el-button size="small" class="searchbtn"
@click="clicksearchShow2">{{ searchxianshitit2 }}</el-button>
<div v-show="isSearchShow2" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery2" class="tab-header">
<el-form-item label="订单编号">
<el-input v-model="listQuery2.params.orderNumber" maxlength="20" placeholder="请输入订单编号"
class="addinputw" clearable />
</el-form-item>
<el-form-item label="日期">
<el-date-picker v-model="listQuery2.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="listQuery2.params.tradeName" maxlength="20" placeholder="请输入采购商品名称"
class="addinputw" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset2">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small"
@click="handleFilter2">重置</el-button>
</div>
</div>
</div>
<div> <div>
<el-table v-loading="tableLoading2" :data="in112List" border style="width: 100%"> <el-table v-loading="tableLoading2" :data="list2" border style="width: 100%">
<el-table-column fixed width="100" type="index" label="序号" :index="indexMethod2" align="center" /> <el-table-column fixed width="100" type="index" label="序号" :index="indexMethod2" align="center" />
<el-table-column prop="supplierName" label="供应商名称" align="center" /> <el-table-column prop="supplierName" label="供应商名称" align="center" />
<el-table-column prop="code" label="商品编码" width="120" align="center" /> <el-table-column prop="code" label="商品编码" width="120" align="center" />
@ -78,70 +105,19 @@
</div> </div>
<div class="pages"> <div class="pages">
<!-- 翻页 --> <!-- 翻页 -->
<pagination v-show="in112ListTotal > 0" :total="in112ListTotal" :page.sync="in112ListQuery.current" <pagination v-show="listTotal2 > 0" :total="listTotal2" :page.sync="listQuery2.current"
:limit.sync="in112ListQuery.size" class="pagination" @pagination="loadIn112List" /> :limit.sync="listQuery2.size" class="pagination" @pagination="loadLogList2" />
</div>
</el-tab-pane>
<el-tab-pane label="原料订单列表" name="all">
<div>
<el-table v-loading="tableLoading3" :data="inallList" border style="width: 100%">
<el-table-column fixed width="100" type="index" label="序号" :index="indexMethod3" align="center" />
<el-table-column prop="supplierName" label="供应商名称" align="center" />
<el-table-column prop="code" label="订单编号" align="center" />
<el-table-column prop="orderAmount" label="订单金额" align="center" />
<el-table-column prop="purchaseDate" label="订单日期" align="center" />
<el-table-column prop="arrivalDate" label="到货日期" align="center" />
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="inallListTotal > 0" :total="inallListTotal" :page.sync="inallListQuery.current"
:limit.sync="inallListQuery.size" class="pagination" @pagination="loadInallList" />
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</el-col> </el-col>
</el-row> </el-row>
<div class="listtop">
<div class="tit">采购订单列表</div>
<!-- 翻页分页 -->
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> -->
</div>
<div class="">
<el-table v-loading="listLoading" :data="list" border style="width: 100%;">
<!-- <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="操作" wid align="center" width="220">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button>
<el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
<el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
</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="80" 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="supplierName" align="center" />
<el-table-column label="供应商" prop="supplierName" align="center" />
<el-table-column label="订单状态" prop="state" width="150" align="center" />
</el-table>
</div> </div>
<div class="pages">
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
:limit.sync="listQuery.size" class="pagination" @pagination="getList" />
</div> </div>
</div> <packagProcureAdd v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState"
</div> @reloadlist="loadLogList" />
<packagProcureAdd v-show="viewState ==2 || viewState ==3" ref="divAdd" @doback="resetState" @reloadlist="getList" /> <packagProcureInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="loadLogList" />
<packagProcureInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" @reloadlist="getList" />
</div> </div>
</template> </template>
@ -152,8 +128,10 @@
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import packagProcureAdd from './packagProcureAdd.vue' import packagProcureAdd from './packagProcureAdd.vue'
import packagProcureInfo from './packagProcureInfo.vue' import packagProcureInfo from './packagProcureInfo.vue'
import {
parseTime
} from '@/utils/index'
export default { export default {
name: 'CustomerManagement',
components: { components: {
Pagination, Pagination,
pageye, pageye,
@ -166,12 +144,13 @@
return { return {
tabActiveName: 'uplog', tabActiveName: 'uplog',
index: "0", index: "0",
isSearchShow: false, isSearchShow1: false,
searchxianshitit: '显示查询条件', searchxianshitit1: '显示查询条件',
isSearchShow2: false,
searchxianshitit2: '显示查询条件',
btndisabled: false, btndisabled: false,
tableLoading1: false, tableLoading1: false,
tableLoading2: false, tableLoading2: false,
tableLoading3: false,
btnList: [{ btnList: [{
type: 'primary', type: 'primary',
size: 'small', size: 'small',
@ -188,15 +167,29 @@
btnLabel: '关闭' btnLabel: '关闭'
} }
], ],
isSearchShow: false,
searchxianshitit: '显示查询条件',
list: [], list: [],
listTotal: 1,
listQuery: { listQuery: {
current: 1, current: 1,
size: 10, size: 10,
params: { params: {
bankName: '', orderNumber: '',
type: '1', // 原油1 包装物2 原料3 date: '',
supplierName: '',
// state: "1", // 1待提交 2经理 3监管 4银行 5财务 6待入库 7已办结
},
total: 0
},
list2: [],
listTotal2: 1,
listQuery2: {
current: 1,
size: 10,
params: {
orderNumber: '',
date: '',
supplierName: '',
// state: "1", // 1待提交 2经理 3监管 4银行 5财务 6待入库 7已办结
}, },
total: 0 total: 0
}, },
@ -212,7 +205,8 @@
this.$refs['btnbar'].setButtonList(this.btnList) this.$refs['btnbar'].setButtonList(this.btnList)
}, },
created() { created() {
this.init() this.loadLogList()
// this.loadLogList2()
// 加载列表 // 加载列表
}, },
methods: { methods: {
@ -230,17 +224,61 @@
} }
}, },
// 搜索条件效果 // 搜索条件效果
clicksearchShow() { clicksearchShow1() {
this.isSearchShow = !this.isSearchShow this.isSearchShow1 = !this.isSearchShow1
if (this.isSearchShow) { if (this.isSearchShow1) {
this.searchxianshitit = '隐藏查询条件' this.searchxianshitit1 = '隐藏查询条件'
} else { } else {
this.searchxianshitit = '显示查询条件' this.searchxianshitit1 = '显示查询条件'
} }
}, },
// 初始化 // 搜索条件效果
init() { clicksearchShow2() {
this.getList() this.isSearchShow2 = !this.isSearchShow2
if (this.isSearchShow2) {
this.searchxianshitit2 = '隐藏查询条件'
} else {
this.searchxianshitit2 = '显示查询条件'
}
},
handleOrder(tab, event) {
console.log("tab", tab)
this.index = tab.index
switch (tab.index) {
// 采购
case "0":
if (this.list.length == 0)
this.loadLogList()
break;
// 销售
case "1":
if (this.list2.length == 0)
this.loadIn112List()
break;
default:
break;
}
},
// 查询列表信息
loadLogList() {
this.tableLoading1 = true
req.loadLogList(this.listQuery).then((response) => {
this.tableLoading1 = false
if (response.success) {
console.log("response.data", response.data)
this.list = response.data.records
this.listQuery.total = response.data.total
this.listTotal = response.data.total
this.listQuery.current = response.data.current
this.listQuery.size = response.data.size
} else {
this.list = []
this.listQuery.total = 0
}
})
}, },
// 序号 // 序号
indexMethod(index) { indexMethod(index) {
@ -249,39 +287,86 @@
return pageindex return pageindex
}, },
// 查询列表信息 // 查询列表信息
getList() { loadLogList2() {
this.listLoading = true this.tableLoading2 = true
req.listPage(this.listQuery).then((response) => { req.loadLogList2(this.listQuery2).then((response) => {
this.listLoading = false this.tableLoading2 = false
if (response.success) { if (response.success) {
this.list = response.data.records this.list2 = response.data.records
this.listQuery.total = response.data.total this.listQuery2.total = response.data.total
this.listTotal2 = response.data.total
this.listQuery2.current = response.data.current
this.listQuery2.size = response.data.size
} else { } else {
this.list = [] this.list2 = []
this.listQuery.total = 0 this.listQuery2.total = 0
} }
}) })
}, },
// 序号
indexMethod2(index) {
var pagestart = (this.listQuery2.current - 1) * this.listQuery2.size
var pageindex = index + 1 + pagestart
return pageindex
},
// 查询按钮 // 查询按钮
handleReset() { handleReset1() {
this.listQuery.current = 1 this.loadLogList()
this.getList()
}, },
// 重置 // 重置
handleFilter() { handleFilter1() {
this.listQuery = { this.listQuery = {
current: 1, current: 1,
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
bankName: "" orderNumber: '',
tradeName: '',
date: "",
type: '1',
// state: "1", // 1待提交 2经理 3监管 4银行 5财务 6待入库 7已办结
}
}
this.loadLogList()
},
// 查询按钮
handleReset2() {
this.loadIn112List()
},
// 重置
handleFilter2() {
this.listQuery2 = {
current: 1,
size: 10,
total: 0,
params: {
orderNumber: '',
tradeName: '',
date: "",
type: '1',
// state: "1", // 1待提交 2经理 3监管 4银行 5财务 6待入库 7已办结
} }
} }
this.getList() this.loadIn112List()
}, },
// 打开添加 // 打开添加
toAdd() { toAdd() {
switch (this.index) {
// 采购
case "0":
this.viewState = 2
break;
// 销售
case "1":
this.viewState = 2 this.viewState = 2
break;
default:
break;
}
}, },
// 打开修改 // 打开修改
toEdit(row) { toEdit(row) {
@ -296,14 +381,15 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
req.delBySids(row.sid).then((response) => { if ("0" == this.index) {
req.procureDelBySids(row.sid).then((response) => {
if (response.success) { if (response.success) {
this.$message({ this.$message({
showClose: true, showClose: true,
type: 'success', type: 'success',
message: '删除成功' message: '删除成功'
}) })
this.getList() this.loadLogList()
} else { } else {
this.$message({ this.$message({
showClose: true, showClose: true,
@ -312,11 +398,32 @@
}) })
} }
}) })
}
if ("1" == this.index) {
req.procureDelBySids(row.sid).then((response) => {
if (response.success) {
this.$message({
showClose: true,
type: 'success',
message: '删除成功'
})
this.loadLogList()
} else {
this.$message({
showClose: true,
type: 'error',
message: '删除失败'
})
}
})
}
}) })
}, },
toDetail(row) { toDetail(row) {
this.viewState = 4 this.viewState = 4
this.$refs['divInfo'].showAdd(row.sid) this.$refs['divInfo'].showAdd(row)
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1

485
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/packagProcure/packagProcureAdd.vue
View File

@ -1,121 +1,234 @@
<template> <template>
<div class="app-container">
<div> <div>
<div class="tab-header webtop"> <div class="tab-header webtop">
<!-- 标题 -->
<div>采购信息</div> <div>采购信息</div>
<!-- start 添加修改按钮 -->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submitData">提交</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
<div class="listconadd">
<div> <el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
<div class="titwu">采购信息</div>
<el-card class="box-card"> <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div class="item"> <div>主体信息</div>
<span class="item_text">库房位置：</span>
<el-input v-model="formobj.address" placeholder="" class="item_input" style="width: 520px;" clearable />
</div> </div>
<div class="item"> <el-row>
<span class="item_text">省-市-县：</span> <el-col :span="4" class="trightb">
<div class="item_input"> <el-form-item class="trightb_item">
<el-select v-model="formobj.province" filterable placeholder="请选择省" class="addinputw" style="width:160px" <span slot="label">合同编号</span>
@change="getShen"> </el-form-item>
<el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid" /> </el-col>
</el-select> <el-col :span="8">
<el-select v-model="formobj.city" filterable placeholder="请选择市" class="addinputw" <el-form-item class="trightb_item">
style="width:160px;margin-left: 20px;margin-right: 20px;" @change="getShi"> <!-- <span>{{temp.bankName}}</span> -->
<el-option v-for="item in inputCityList" :key="item.sid" :label="item.name" :value="item.sid" /> <el-input v-model="formobj.orderNumber" placeholder="" style="width: 80%;" clearable />
</el-select> </el-form-item>
<el-select v-model="formobj.county" filterable placeholder="请选择县" class="addinputw" style="width:160px" </el-col>
@change="getXian"> <el-col :span="4" class="trightb">
<el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid" /> <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.bankAbbreviation}}</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>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span>{{temp.province}} - {{temp.city}} - {{temp.county}}</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-select>
</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.address}}</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>
</div> <el-collapse v-model="activeNames">
<el-collapse-item name="1">
</div> <template slot="title">
<div class="item"> 商品信息<span class="span" @click.stop="add()">添加</span>
<span class="item_text">库房面积：</span> </template>
<el-input v-model="formobj.squareMeasure" placeholder="" class="item_input" style="width: 520px;" clearable /> <el-table v-loading="listLoading" :data="formobj.commodityList" border style="width: 100%;"
</div> :row-style="{height: '40px'}">
<div class="item"> <!-- <el-table-column type="selection" align="center" width="50"/> -->
<span class="item_text">库房层高：</span> <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-input v-model="formobj.floorHeight" placeholder="" class="item_input" style="width: 520px;" clearable /> <el-table-column label="操作" wid align="center" width="150">
</div> <template slot-scope="scope">
<div class="item"> <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
<span class="item_text">库房价格：</span> <!-- <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> -->
<el-input v-model="formobj.price" placeholder="" class="item_input" style="width: 520px;" clearable /> <el-button type="primary" size="mini" @click="doCommoditylDel(scope.$index)">删除</el-button>
</div> </template>
<div class="item"> </el-table-column>
<span class="item_text">库房性质：</span> <el-table-column label="商品名称" prop="name" align="center">
<el-input v-model="formobj.properties" placeholder="" class="item_input" style="width: 520px;" clearable /> <template slot-scope="scope">
</div> <el-select v-model="scope.row.name" filterable placeholder="请选择包装物名称"
<div class="item"> @change="getType($event,scope.$index)">
<span class="item_text">房源：</span> <el-option v-for="item in crudeList" :key="item.sid" :label="item.name" :value="item.sid" />
<el-input v-model="formobj.housingResources" placeholder="" class="item_input" </el-select>
style="width: 520px;" clearable /> </template>
</div> </el-table-column>
<el-table-column label="商品编码" prop="number" align="center" />
<el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="单价" prop="price" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="" @input="limitInput1($event,scope.$index)"
clearable></el-input>
</template>
</el-table-column>
<el-table-column label="重量" prop="weight" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.weight" placeholder="" @input="limitInput2($event,scope.$index)"
clearable></el-input>
</template>
</el-table-column>
</el-table>
<div class="item"> </el-collapse-item>
<span class="item_text">联系人：</span> </el-collapse>
<el-input v-model="formobj.contacts" placeholder="" class="item_input" style="width: 520px;" clearable />
</div>
<div class="item">
<span class="item_text">联系电话：</span>
<el-input v-model="formobj.telephone" placeholder="" maxlength="11" class="item_input" style="width: 520px;" clearable />
</div>
<div class="item">
<span class="item_text">备注：</span>
<el-input v-model="formobj.remarks" placeholder="" class="item_input" style="width: 520px;" clearable />
</div>
</el-card> </el-form>
</div> </div>
</div>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/packagProcure/packagProcure' import req from '@/api/packagProcure/packagProcure'
import req2 from '@/api/packagInAndOutBound/packagInAndOutBound.js'
import req3 from '@/api/supplier/supplier'
export default { export default {
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
crudeLists: [],
crudeList: [],
supplierLists: [],
supplierList: [],
listLoading: false,
activeNames: ['1'],
formobj: { formobj: {
sid: "", sid: "",
address: "", orderNumber: "",
squareMeasure: "", contractSigningDate: "",
floorHeight: "", arrivalDate: "",
properties: "", supplierSid: "",
price: "", supplierName: "",
housingResources: "", commodityList: [],
province: '', }
city: "",
county: "",
contacts: "",
telephone: "",
remarks: ""
},
inputProvinceList: [],
inputCityList: [],
inputCountyList: [],
} }
}, },
created() { created() {
// this.huoquSheng() this.supplierInfoList()
this.crudeinfoList()
}, },
methods: { methods: {
supplierInfoList() {
req3.supplierList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>2222222", res.data)
this.supplierLists = res.data
for (var i = 0; i < this.supplierLists.length; i++) {
let item = {
name: this.supplierLists[i].supplierName,
sid: this.supplierLists[i].sid,
}
this.supplierList.push(item)
}
}
})
},
crudeinfoList() {
req2.packInventoryList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>2222222", res.data)
this.crudeLists = res.data
for (var i = 0; i < this.crudeLists.length; i++) {
let item = {
name: this.crudeLists[i].name,
sid: this.crudeLists[i].sid,
}
this.crudeList.push(item)
}
}
})
},
/**
* 1、必须为数字
* 2、只能有一个小数点
* 3、小数点后保留两位小数
* 4、当第一位输入小数点的时候自动补全，补为 0.
* 5、除非是小数，否则数字不能以0开头
* @param {string} value - 输入的值
* @param {string} index - 匹配的对象属性 [mkPrice | slPrice]
*/
limitInput1(value, index) {
this.formobj.commodityList[index].price =
("" + value) // 第一步：转成字符串
.replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
.replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
.replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
},
/**
* 1、必须为数字
* 2、只能有一个小数点
* 3、小数点后保留两位小数
* 4、当第一位输入小数点的时候自动补全，补为 0.
* 5、除非是小数，否则数字不能以0开头
* @param {string} value - 输入的值
* @param {string} index - 匹配的对象属性 [mkPrice | slPrice]
*/
limitInput2(value, index) {
this.formobj.commodityList[index].weight =
("" + value) // 第一步：转成字符串
.replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
.replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
.replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
},
saveOrUpdate() { saveOrUpdate() {
console.log(">>>>>>>>>222222", this.formobj) console.log(">>>>>>>>>222222", this.formobj)
if (this.formobj.sid) { if (this.formobj.sid) {
req.updateData(this.formobj) req.procureUpdateData(this.formobj)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({
@ -130,7 +243,7 @@
}) })
.catch(() => {}) .catch(() => {})
} else { } else {
req.addInfo(this.formobj) req.procureAddInfo(this.formobj)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
this.$message({ this.$message({
@ -147,6 +260,23 @@
} }
}, },
submitData() {
console.log(">>>>>>>>>submit", this.formobj)
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(() => {})
},
handleReturn(isreload) { handleReturn(isreload) {
console.log(">>>>>>>>>") console.log(">>>>>>>>>")
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
@ -159,26 +289,18 @@
} }
this.formobj = { this.formobj = {
sid: "", sid: "",
address: "", orderNumber: "",
squareMeasure: "", contractSigningDate: "",
floorHeight: "", arrivalDate: "",
properties: "", supplierSid: "",
price: "", supplierName: "",
housingResources: "", commodityList: [],
province: '',
city: "",
county: "",
contacts: "",
telephone: "",
remarks: ""
} }
}, },
showAdd(sid) { showAdd() {},
this.formobj.psid = sid
},
showEdit(row) { showEdit(row) {
req.fetchBySid(row.sid) req.procureFetchBySid(row.sid)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
this.formobj = resp.data this.formobj = resp.data
@ -189,141 +311,80 @@
this.formobj = row this.formobj = row
}) })
}, },
// -------------------------获取省市县方法------------------------- getSupplier(value) {
huoquSheng() { console.log(">>>>>>>>>getType", value)
getProvince().then((res) => { const choose = this.supplierLists.filter((item) => item.sid === value)
if (res.success) { console.log(">>>>>>>>>getType", choose[0])
this.inputProvinceList = res.data this.formobj.supplierName = choose[0].supplierName
} this.formobj.supplierSid = value
})
},
getShen(value) {
let bb = ''
this.inputProvinceList.forEach((e) => {
if (e.sid === value) {
bb = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
}
}
})
// 这里是把code的值赋给province省字段
this.formobj.province = bb.name
this.formobj.city = ""
this.formobj.county = ""
this.huoquShi(bb.sid)
}, },
huoquShi(sid1) { getType(value, index) {
var sid = { console.log(">>>>>>>>>getType", value)
sid: sid1 console.log(">>>>>>>>>getType", index)
} const choose = this.crudeLists.filter((item) => item.sid === value)
getCity(sid).then((res) => { console.log(">>>>>>>>>getType", choose[0])
if (res.success) { this.formobj.commodityList[index].number = choose[0].number
this.inputCityList = res.data this.formobj.commodityList[index].name = choose[0].name
} this.formobj.commodityList[index].unit = choose[0].unit
}) this.formobj.commodityList[index].sid = value
}, },
getShi(value) {
let bb = '' add() {
this.inputCityList.forEach((e) => { this.formobj.commodityList.push({
if (e.sid === value) {
bb = {
name: e.name,
districtCode: e.districtCode,
sid: e.sid
}
}
}) })
this.formobj.city = bb.name
this.formobj.county = ""
this.huoquXian(bb.sid)
}, },
huoquXian(sid1) { doCommoditylDel(index) {
var sid = {
sid: sid1 const tip = '请确认是否删除所选记录?'
} this.$confirm(tip, '提示', {
getCounty(sid).then((res) => { confirmButtonText: '确定',
if (res.success) { cancelButtonText: '取消',
this.inputCountyList = res.data type: 'warning'
} }).then(() => {
this.formobj.commodityList.splice(index, 1);
}) })
}, },
getXian(value) {
let bb = '' // 序号
this.inputCountyList.forEach((e) => { indexMethod(index) {
if (e.sid === value) { // var pagestart = (this.listQuery.current - 1) * this.listQuery.size
bb = { // var pageindex = index + 1 + pagestart
name: e.name, return index + 1
districtCode: e.districtCode,
sid: e.sid
}
}
})
this.formobj.county = bb.name
}, },
} }
} }
</script> </script>
<style lang="scss"> <style scoped>
.box-card { .trightb {
margin-left: 60px;
margin-right: 60px;
margin-top: 20px;
.item {
display: flex; display: flex;
flex-direction: row;
align-items: center; align-items: center;
text-align: ;
justify-content: center; justify-content: center;
margin-top: 15px;
height: 40px;
line-height: 40px;
.item_text {
font-size: 18px;
text-align: right;
}
.item_input {
font-size: 16px;
margin-left: 10px;
margin-right: 80px;
}
.item_left_input {
width: 20%;
} }
.item_left_text { .trightb_item {
height: 30px; padding-top: 5px;
margin-left: 20px;
line-height: 30px;
color: #018AD2;
padding: 0px 15px;
border: 1.5px solid #018AD2;
border-radius: 5px;
}
.item_right {
flex: 1;
justify-items: center;
.item_right_list_text {
font-size: 16px;
} }
.item_right_list_delect { .span {
color: #5E94FF; margin-left: 50px;
margin-left: 20px; font-size: 15px;
font-size: 16px; font-weight: 400;
text-decoration: underline;
}
} }
/deep/ .el-collapse-item__header {
height: 40px;
padding: 10px;
font-weight: bold;
font-size: 20px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
} }
/deep/ .el-collapse-item__content {
padding-bottom: 0;
} }
</style> </style>

375
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/packagProcure/packagProcureInfo.vue
View File

@ -2,165 +2,470 @@
<div class="app-container"> <div class="app-container">
<div> <div>
<div class="tab-header webtop"> <div class="tab-header webtop">
<div>【查看】采购信息</div> <div>采购信息</div>
<div> <div>
<el-button type="primary" size="small" v-show="formobj.state<=5" :disabled="submitdisabled"
@click="submitData">{{state}}</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> <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div> </div>
</div> </div>
<div class="listconadd"> <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"
style="margin-bottom: 150px;">
<div class="titwu">采购信息</div> <div class="titwu">采购信息</div>
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px"> <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基本信息</div> <div>主体信息</div>
</div> </div>
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">库房位置</span> <span slot="label">合同编号</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.address}}</span> <span>{{formobj.orderNumber}}</span>
<!-- <el-input v-model="formobj.orderNumber" placeholder="" style="width: 80%;" clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">省-市-县</span> <span slot="label">合同日期</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.province}} - {{temp.city}} - {{temp.county}}</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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">库房面积</span> <span slot="label">供货商名称</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.squareMeasure}}</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-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">库房层高</span> <span slot="label">到货日期</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.floorHeight}}</span> <span>{{formobj.arrivalDate}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div v-show="formobj.state==6 || formobj.state== 7">
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">库房价格</span> <span slot="label">付款日期</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.price}}</span> <!-- <el-date-picker v-model="formobj.paymentDate" type="date" style="width: 80%;" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="请选择" /> -->
<span>{{formobj.paymentDate}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">库房性质</span> <span slot="label">付款金额</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.properties}}</span> <span>{{formobj.payment}}</span>
<!-- <el-input v-model="formobj.payment" placeholder="" @input="limitInput($event)" style="width: 80%;"
clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">房源</span> <span slot="label">付款单位</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.housingResources}}</span> <!-- <el-input v-model="formobj.payer" placeholder="" style="width: 80%;" clearable /> -->
<span>{{formobj.payer}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">备注</span> <span slot="label">付款单位开户行</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.remarks}}</span> <span>{{formobj.payerBank}}</span>
<!-- <el-input v-model="formobj.payerBank" placeholder="" style="width: 80%;" clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">联系人</span> <span slot="label">收款单位</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.contacts}}</span> <!-- <el-input v-model="formobj.payee" placeholder="" style="width: 80%;" clearable /> -->
<span>{{formobj.payee}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span slot="label">联系电话</span> <span slot="label">收款单位开户行</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<span>{{temp.telephone}}</span> <span>{{formobj.payeeBank}}</span>
<!-- <el-input v-model="formobj.payeeBank" placeholder="" style="width: 80%;" clearable /> -->
</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="20">
<el-form-item class="trightb_item">
<!-- <el-input v-model="formobj.paymentSummary" placeholder="" type="textarea" :rows="5"
style="width: 100%;" clearable /> -->
<span>{{formobj.paymentSummary}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div>
<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-collapse v-model="activeNames">
<el-collapse-item name="2" title="审批流程">
<el-table v-loading="listLoading" :data="recordList" 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="approvalDate" align="center" />
<el-table-column label="审批人员" prop="approverName" align="center" />
<el-table-column label="部门名称" prop="approver" align="center" />
<el-table-column label="审批操作" prop="operateValue" align="center" />
<el-table-column label="审批意见" prop="approvalOpinions" align="center" />
</el-table>
</el-collapse-item>
</el-collapse>
</el-form> </el-form>
</div> </div>
</div> </div>
<el-dialog title="请填写审核意见" :visible.sync="editDialog" width="40%" @close='handleCancle'>
<table class="e-table" cellspacing="0">
<tr>
<td>审核操作</td>
<td>
<div>
<el-radio v-model="radio" label="3">同意</el-radio>
<el-radio v-model="radio" label="4">不同意</el-radio>
</div>
</td>
</tr>
<tr>
<td>审核意见</td>
<td>
<el-input v-model="form.approvalOpinions" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款日期</td>
<td>
<el-date-picker v-model="form.paymentDate" type="date" style="width: 100%;" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择" />
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款金额</td>
<td>
<el-input v-model="form.payment" @input="limitInput($event)" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款单位</td>
<td>
<el-input v-model="form.payer" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款单位开户行</td>
<td>
<el-input v-model="form.payerBank" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>收款单位</td>
<td>
<el-input v-model="form.payee" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>收款单位开户行</td>
<td>
<el-input v-model="form.payeeBank" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>摘要</td>
<td>
<el-input v-model="form.paymentSummary" placeholder="" clearable></el-input>
</td>
</tr>
</table>
<div style="margin-top: 20px; text-align: center">
<el-button type="primary" @click="save()">提交</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/packagProcure/packagProcure' import req from '@/api/packagProcure/packagProcure'
import req2 from '@/api/Common/approval.js'
export default { export default {
name: 'CustomerManagementInfo',
data() { data() {
return { return {
temp: {} // 添加和修改 submitdisabled: false,
listLoading: false,
activeNames: ['1', "2"],
recordList: [],
state: "提交",
editDialog: false,
radio: "0",
form: {
sid: "",
operate: "",
approvalOpinions: "",
paymentDate: "",
payment: "",
payerBank: "",
payee: '',
payeeBank: '',
paymentSummary: ""
},
formobj: {
sid: "",
orderNumber: "",
contractSigningDate: "",
arrivalDate: "",
supplierSid: "",
supplierName: "",
paymentDate: "",
payment: "",
payer: "",
payerBank: "",
payee: "",
payeeBank: "",
paymentSummary: "",
commodityList: [],
state: ""
}
} }
}, },
methods: { methods: {
showAdd(sid) { /**
req.fetchBySid(sid) * 1、必须为数字
* 2、只能有一个小数点
* 3、小数点后保留两位小数
* 4、当第一位输入小数点的时候自动补全，补为 0.
* 5、除非是小数，否则数字不能以0开头
* @param {string} value - 输入的值
* @param {string} index - 匹配的对象属性 [mkPrice | slPrice]
*/
limitInput(value) {
this.form.payment =
("" + value) // 第一步：转成字符串
.replace(/[^\d^\.]+/g, "") // 第二步：把不是数字，不是小数点的过滤掉
.replace(/^0+(\d)/, "$1") // 第三步：第一位0开头，0后面为数字，则过滤掉，取后面的数字
.replace(/^\./, "0.") // 第四步：如果输入的第一位为小数点，则替换成 0. 实现自动补全
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
},
submitData() {
if (this.formobj.state == "1") {
req.procureAddSubmitInfo(this.formobj)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
this.temp = resp.data this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn("true")
} else {
// 根据resp.code进行异常情况处理
}
})
.catch(() => {})
} else {
this.editDialog = true;
} }
console.log(">>>>>>>>>submit", this.formobj)
},
save() {
this.form.sid = this.formobj.sid
this.form.operate = this.radio
console.log(">>>>>>>>>", this.form)
req.updateByState(this.form)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
}) })
.catch(e => { this.editDialog = false;
this.$emit('doback') this.handleReturn("true")
} else {
// 根据resp.code进行异常情况处理
}
}) })
.catch(() => {})
}, },
// 组件返回
handleReturn() { handleCancle() {
this.editDialog = false
this.radio = "0"
this.form = {
sid: "",
operate: "",
approvalOpinions: "",
paymentDate: "",
payment: "",
payment: "",
payerBank: "",
payee: '',
payeeBank: '',
paymentSummary: ""
}
},
handleReturn(isreload) {
console.log(">>>>>>>>>")
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback') this.$emit('doback')
this.formobj = {
sid: "",
orderNumber: "",
contractSigningDate: "",
arrivalDate: "",
supplierSid: "",
supplierName: "",
paymentDate: "",
payment: "",
payer: "",
payerBank: "",
payee: "",
payeeBank: "",
paymentSummary: "",
commodityList: [],
state: ""
}
},
showAdd(row) {
console.log(">>>>>>>>>", row)
req.procureFetchBySid(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
console.log(">>>>>>>>>", this.formobj.state)
if (this.formobj.state == "1") {
this.state = "提交"
} else {
this.state = "审核"
}
} }
})
.catch(e => {
this.formobj = row
})
req2.getRecordBySid(row.sid)
.then(resp => {
if (resp.success) {
this.recordList = resp.data
}
})
.catch(e => {
this.recordList = []
})
},
// 序号
indexMethod(index) {
// var pagestart = (this.listQuery.current - 1) * this.listQuery.size
// var pageindex = index + 1 + pagestart
return index + 1
},
} }
} }
</script> </script>

3
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureAdd.vue
View File

@ -94,7 +94,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="原料编码" prop="number" align="center" /> <el-table-column label="原料编码" prop="number" align="center" />
<el-table-column label="单位" prop="sss" align="center" /> <el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="单价" prop="price" align="center"> <el-table-column label="单价" prop="price" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="" @input="limitInput1($event,scope.$index)" <el-input v-model="scope.row.price" placeholder="" @input="limitInput1($event,scope.$index)"
@ -320,6 +320,7 @@
console.log(">>>>>>>>>getType", choose[0]) console.log(">>>>>>>>>getType", choose[0])
this.formobj.commodityList[index].number = choose[0].number this.formobj.commodityList[index].number = choose[0].number
this.formobj.commodityList[index].name = choose[0].name this.formobj.commodityList[index].name = choose[0].name
this.formobj.commodityList[index].unit = choose[0].unit
this.formobj.commodityList[index].sid = value this.formobj.commodityList[index].sid = value
}, },

210
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/business/rawMaterialProcure/rawMaterialProcureInfo.vue
View File

@ -68,6 +68,7 @@
</el-col> </el-col>
</el-row> </el-row>
<div v-show="formobj.state==6 || formobj.state== 7">
<el-row> <el-row>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
@ -76,9 +77,9 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-date-picker v-model="formobj.paymentDate" type="date" style="width: 80%;" format="yyyy-MM-dd" <!-- <el-date-picker v-model="formobj.paymentDate" type="date" style="width: 80%;" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="请选择" /> value-format="yyyy-MM-dd" placeholder="请选择" /> -->
<!-- <span>{{formobj.supplierName}}</span> --> <span>{{formobj.paymentDate}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
@ -88,9 +89,9 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<!-- <span>{{formobj.arrivalDate}}</span> --> <span>{{formobj.payment}}</span>
<el-input v-model="formobj.payment" placeholder="" @input="limitInput($event)" style="width: 80%;" <!-- <el-input v-model="formobj.payment" placeholder="" @input="limitInput($event)" style="width: 80%;"
clearable /> clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -103,8 +104,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-input v-model="formobj.payer" placeholder="" style="width: 80%;" clearable /> <!-- <el-input v-model="formobj.payer" placeholder="" style="width: 80%;" clearable /> -->
<!-- <span>{{formobj.supplierName}}</span> --> <span>{{formobj.payer}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
@ -114,8 +115,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<!-- <span>{{formobj.arrivalDate}}</span> --> <span>{{formobj.payerBank}}</span>
<el-input v-model="formobj.payerBank" placeholder="" style="width: 80%;" clearable /> <!-- <el-input v-model="formobj.payerBank" placeholder="" style="width: 80%;" clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -127,8 +128,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-input v-model="formobj.payee" placeholder="" style="width: 80%;" clearable /> <!-- <el-input v-model="formobj.payee" placeholder="" style="width: 80%;" clearable /> -->
<!-- <span>{{formobj.supplierName}}</span> --> <span>{{formobj.payee}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
@ -138,8 +139,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<!-- <span>{{formobj.arrivalDate}}</span> --> <span>{{formobj.payeeBank}}</span>
<el-input v-model="formobj.payeeBank" placeholder="" style="width: 80%;" clearable /> <!-- <el-input v-model="formobj.payeeBank" placeholder="" style="width: 80%;" clearable /> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -151,13 +152,13 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<el-input v-model="formobj.paymentSummary" placeholder="" type="textarea" :rows="5" style="width: 100%;" <!-- <el-input v-model="formobj.paymentSummary" placeholder="" type="textarea" :rows="5"
clearable /> style="width: 100%;" clearable /> -->
<!-- <span>{{formobj.supplierName}}</span> --> <span>{{formobj.paymentSummary}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div>
<el-collapse v-model="activeNames"> <el-collapse v-model="activeNames">
<el-collapse-item name="1" title="商品信息"> <el-collapse-item name="1" title="商品信息">
@ -170,7 +171,7 @@
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" /> <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="name" align="center" />
<el-table-column label="商品编码" prop="number" align="center" /> <el-table-column label="商品编码" prop="number" align="center" />
<el-table-column label="单位" prop="sss" align="center" /> <el-table-column label="单位" prop="unit" align="center" />
<el-table-column label="单价" prop="price" align="center" /> <el-table-column label="单价" prop="price" align="center" />
<el-table-column label="重量" prop="weight" align="center" /> <el-table-column label="重量" prop="weight" align="center" />
</el-table> </el-table>
@ -178,23 +179,122 @@
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<el-collapse v-model="activeNames">
<el-collapse-item name="2" title="审批流程">
<el-table v-loading="listLoading" :data="recordList" 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="approvalDate" align="center" />
<el-table-column label="审批人员" prop="approverName" align="center" />
<el-table-column label="部门名称" prop="approver" align="center" />
<el-table-column label="审批操作" prop="operateValue" align="center" />
<el-table-column label="审批意见" prop="approvalOpinions" align="center" />
</el-table>
</el-collapse-item>
</el-collapse>
</el-form> </el-form>
</div> </div>
</div> </div>
<el-dialog title="请填写审核意见" :visible.sync="editDialog" width="40%" @close='handleCancle'>
<table class="e-table" cellspacing="0">
<tr>
<td>审核操作</td>
<td>
<div>
<el-radio v-model="radio" label="3">同意</el-radio>
<el-radio v-model="radio" label="4">不同意</el-radio>
</div>
</td>
</tr>
<tr>
<td>审核意见</td>
<td>
<el-input v-model="form.approvalOpinions" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款日期</td>
<td>
<el-date-picker v-model="form.paymentDate" type="date" style="width: 100%;" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" placeholder="请选择" />
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款金额</td>
<td>
<el-input v-model="form.payment" @input="limitInput($event)" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款单位</td>
<td>
<el-input v-model="form.payer" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>付款单位开户行</td>
<td>
<el-input v-model="form.payerBank" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>收款单位</td>
<td>
<el-input v-model="form.payee" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>收款单位开户行</td>
<td>
<el-input v-model="form.payeeBank" placeholder="" clearable></el-input>
</td>
</tr>
<tr v-show="radio=='3'&&formobj.state == '5'">
<td>摘要</td>
<td>
<el-input v-model="form.paymentSummary" placeholder="" clearable></el-input>
</td>
</tr>
</table>
<div style="margin-top: 20px; text-align: center">
<el-button type="primary" @click="save()">提交</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import req from '@/api/oilTypeYuanliao/index.js' import req from '@/api/oilTypeYuanliao/index.js'
import req2 from '@/api/Common/approval.js'
export default { export default {
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
listLoading: false, listLoading: false,
activeNames: ['1'], activeNames: ['1', "2"],
recordList: [],
state: "提交",
editDialog: false,
radio: "0",
form: {
sid: "",
operate: "",
approvalOpinions: "",
paymentDate: "",
payment: "",
payerBank: "",
payee: '',
payeeBank: '',
paymentSummary: ""
},
formobj: { formobj: {
sid: "", sid: "",
orderNumber: "", orderNumber: "",
@ -211,6 +311,7 @@
payeeBank: "", payeeBank: "",
paymentSummary: "", paymentSummary: "",
commodityList: [], commodityList: [],
state: ""
} }
} }
}, },
@ -233,11 +334,9 @@
.match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数 .match(/^\d*(\.?\d{0,2})/g)[0] || ""; // 第五步：最终匹配得到结果 以数字开头，只有一个小数点，而且小数点后面只能有0到2位小数
}, },
submitData() { submitData() {
if (this.formobj.state == 5) { console.log(">>>>>>>>>submit", this.formobj)
// 财务审批 需要填数据
} else { if (this.formobj.state == "1") {
// 财务之前 直接提交
req.submit(this.formobj) req.submit(this.formobj)
.then(resp => { .then(resp => {
if (resp.success) { if (resp.success) {
@ -252,8 +351,55 @@
} }
}) })
.catch(() => {}) .catch(() => {})
} else {
this.editDialog = true;
}
console.log(">>>>>>>>>submit", this.formobj)
},
save() {
this.form.sid = this.formobj.sid
this.form.operate = this.radio
console.log(">>>>>>>>>", this.form)
req.updateByState(this.form)
.then(resp => {
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.editDialog = false;
this.handleReturn("true")
} else {
// 根据resp.code进行异常情况处理
} }
})
.catch(() => {})
},
handleCancle() {
this.editDialog = false
this.radio = "0"
this.form = {
sid: "",
operate: "",
approvalOpinions: "",
paymentDate: "",
payment: "",
payment: "",
payerBank: "",
payee: '',
payeeBank: '',
paymentSummary: ""
}
}, },
handleReturn(isreload) { handleReturn(isreload) {
@ -274,6 +420,7 @@
payeeBank: "", payeeBank: "",
paymentSummary: "", paymentSummary: "",
commodityList: [], commodityList: [],
state: ""
} }
}, },
@ -289,6 +436,18 @@
.catch(e => { .catch(e => {
this.formobj = row this.formobj = row
}) })
req2.getRecordBySid(row.sid)
.then(resp => {
if (resp.success) {
this.recordList = resp.data
}
})
.catch(e => {
this.recordList = []
})
}, },
// 序号 // 序号
indexMethod(index) { indexMethod(index) {
@ -297,6 +456,7 @@
return index + 1 return index + 1
}, },
} }
} }
</script> </script>

4
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/oilTypeInBound/index.vue
View File

@ -114,7 +114,7 @@
formobj: { formobj: {
sid: "", sid: "",
procSid: "", procSid: "",
contractNumber: "", salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
warehousingDate: "", warehousingDate: "",
crudeSid: "", crudeSid: "",
@ -227,7 +227,7 @@
this.formobj = { this.formobj = {
sid: "", sid: "",
procSid: "", procSid: "",
contractNumber: "", salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
warehousingDate: "", warehousingDate: "",
crudeSid: "", crudeSid: "",

42
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/packagInBound/index.vue
View File

@ -18,7 +18,11 @@
<el-card class="box-card"> <el-card class="box-card">
<div class="item"> <div class="item">
<span class="item_text">合同编号：</span> <span class="item_text">合同编号：</span>
<el-input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable /> <el-select v-model="formobj.salesContractNumber" filterable placeholder="请选择订单编号" class="item_input"
@change="getSalesContractNumberer">
<el-option v-for="item in salesContractNumber" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable /> -->
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">供货商名称：</span> <span class="item_text">供货商名称：</span>
@ -85,6 +89,7 @@
<script> <script>
import req from '@/api/packagInAndOutBound/packagInAndOutBound' import req from '@/api/packagInAndOutBound/packagInAndOutBound'
import req3 from '@/api/supplier/supplier' import req3 from '@/api/supplier/supplier'
import req2 from '@/api/packagProcure/packagProcure.js'
import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao' import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao'
export default { export default {
components: { components: {
@ -93,6 +98,8 @@
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
salesContractNumbers: [],
salesContractNumber: [],
supplierLists: [], supplierLists: [],
supplierList: [], supplierList: [],
typeLists: [], typeLists: [],
@ -102,7 +109,8 @@
imgList: [], imgList: [],
formobj: { formobj: {
sid: "", sid: "",
contractNumber: "", procSid: "",
salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
warehousingDate: "", warehousingDate: "",
typeSid: "", typeSid: "",
@ -120,10 +128,30 @@
} }
}, },
created() { created() {
this.procureOrderList()
this.supplierInfoList() this.supplierInfoList()
this.getTypeList() this.getTypeList()
}, },
methods: { methods: {
procureOrderList() {
req2.procureOrderList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>2222222", res.data)
this.salesContractNumbers = res.data
for (var i = 0; i < this.salesContractNumbers.length; i++) {
let item = {
name: this.salesContractNumbers[i].orderNumber,
sid: this.salesContractNumbers[i].sid,
}
this.salesContractNumber.push(item)
}
}
})
},
supplierInfoList() { supplierInfoList() {
req3.supplierList().then((res) => { req3.supplierList().then((res) => {
if (res.success) { if (res.success) {
@ -193,7 +221,8 @@
}) })
this.formobj = { this.formobj = {
sid: "", sid: "",
contractNumber: "", procSid: "",
salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
warehousingDate: "", warehousingDate: "",
typeSid: "", typeSid: "",
@ -220,6 +249,13 @@
this.$store.dispatch('tagsView/delView', this.$route) this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1) this.$router.go(-1)
}, },
getSalesContractNumberer(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.salesContractNumbers.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.salesContractNumber = choose[0].orderNumber
this.formobj.procSid = value
},
getSupplier(value) { getSupplier(value) {
console.log(">>>>>>>>>getType", value) console.log(">>>>>>>>>getType", value)
const choose = this.supplierLists.filter((item) => item.sid === value) const choose = this.supplierLists.filter((item) => item.sid === value)

42
yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/rawMaterialInBound/index.vue
View File

@ -18,7 +18,11 @@
<el-card class="box-card"> <el-card class="box-card">
<div class="item"> <div class="item">
<span class="item_text">合同编号：</span> <span class="item_text">合同编号：</span>
<el-input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable /> <el-select v-model="formobj.salesContractNumber" filterable placeholder="请选择订单编号" class="item_input"
@change="getSalesContractNumberer">
<el-option v-for="item in salesContractNumber" :key="item.sid" :label="item.name" :value="item.sid" />
</el-select>
<!-- <el-input v-model="formobj.contractNumber" placeholder="" class="item_input" clearable /> -->
</div> </div>
<div class="item"> <div class="item">
<span class="item_text">供货商名称：</span> <span class="item_text">供货商名称：</span>
@ -79,11 +83,14 @@
<script> <script>
import req from '@/api/rawMaterialInAndOutBound/rawMaterialInAndOutBound' import req from '@/api/rawMaterialInAndOutBound/rawMaterialInAndOutBound'
import req2 from '@/api/oilTypeYuanliao/index.js'
import req3 from '@/api/supplier/supplier' import req3 from '@/api/supplier/supplier'
export default { export default {
data() { data() {
return { return {
submitdisabled: false, submitdisabled: false,
salesContractNumbers: [],
salesContractNumber: [],
supplierLists: [], supplierLists: [],
supplierList: [], supplierList: [],
typeLists: [], typeLists: [],
@ -92,7 +99,8 @@
inventoryList: [], inventoryList: [],
formobj: { formobj: {
sid: "", sid: "",
contractNumber: "", procSid: "",
salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
warehousingDate: "", warehousingDate: "",
inventoryName: "", inventoryName: "",
@ -109,10 +117,30 @@
} }
}, },
created() { created() {
this.procureOrderList()
this.supplierInfoList() this.supplierInfoList()
this.inventoryTypeList() this.inventoryTypeList()
}, },
methods: { methods: {
procureOrderList() {
req2.procureOrderList().then((res) => {
if (res.success) {
console.log(">>>>>>>>>2222222", res.data)
this.salesContractNumbers = res.data
for (var i = 0; i < this.salesContractNumbers.length; i++) {
let item = {
name: this.salesContractNumbers[i].orderNumber,
sid: this.salesContractNumbers[i].sid,
}
this.salesContractNumber.push(item)
}
}
})
},
supplierInfoList() { supplierInfoList() {
req3.supplierList().then((res) => { req3.supplierList().then((res) => {
if (res.success) { if (res.success) {
@ -193,7 +221,8 @@
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj = { this.formobj = {
sid: "", sid: "",
contractNumber: "", procSid: "",
salesContractNumber: "",
contractSigningDate: "", contractSigningDate: "",
warehousingDate: "", warehousingDate: "",
inventoryName: "", inventoryName: "",
@ -210,6 +239,13 @@
} }
this.$emit('doback') this.$emit('doback')
}, },
getSalesContractNumberer(value) {
console.log(">>>>>>>>>getType", value)
const choose = this.salesContractNumbers.filter((item) => item.sid === value)
console.log(">>>>>>>>>getType", choose[0])
this.formobj.salesContractNumber = choose[0].orderNumber
this.formobj.procSid = value
},
getSupplier(value) { getSupplier(value) {
console.log(">>>>>>>>>getType", value) console.log(">>>>>>>>>getType", value)
const choose = this.supplierLists.filter((item) => item.sid === value) const choose = this.supplierLists.filter((item) => item.sid === value)

Write Preview
Loading…
Cancel
Save