guangfu
/
yxt-supervise-gf-ui
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

9.12

master
fengdong777 2 years ago
parent
6c33d8bc3c
commit
10d10360fa
4 changed files with 178 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .env.development
  2. 14
      src/api/gfApi/index.js
  3. 14
      src/views/MaterialBrand/index.vue
  4. 178
      src/views/supervise/churuku/index.vue

2
.env.development
View File

@ -8,5 +8,5 @@ VUE_APP_BASE_API = '/api'
# VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"
VUE_APP_URL = "http://192.168.1.103:7102"
VUE_APP_URL = "http://192.168.1.105:7102"
##VUE_APP_URL = "http://8.130.39.13:8112"

14
src/api/gfApi/index.js
View File

@ -180,4 +180,18 @@ export default {
method: 'get'
})
},
// 获取代理商
getAgentList: function() {
return request({
url: '/gf/stockRecord/getAgentList ',
method: 'get'
})
},
// 获取审核状态
getStatus: function() {
return request({
url: '/gf/stockRecord/getStatus',
method: 'get'
})
},
}

14
src/views/MaterialBrand/index.vue
View File

@ -28,14 +28,10 @@
clearable
/>
</el-form-item>
<el-form-item label="物料名称">
<el-input
v-model="listQuery.type"
maxlength="20"
placeholder="请输入物料名称"
class="addinputw"
clearable
/>
<el-form-item label="物料组">
<el-select v-model="listQuery.type" placeholder="请选择" clearable >
<el-option v-for="(item,i) in Materia" :key="i" :label="item" :value="i"></el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
@ -126,7 +122,7 @@ export default {
contractNumber: "",
date: "",
},
Materia:{}
Materia:{},
};
},
mounted() {

178
src/views/supervise/churuku/index.vue
View File

@ -19,24 +19,92 @@
:inline="true"
class="tab-header"
>
<el-form-item label="合同编号">
<el-form-item label="出库仓库">
<el-select v-model="listQuery.out_storehouse_id" placeholder="请选择" clearable >
<el-option v-for="(item,i) in storehouse" :key="i" :label="item.storehouse_name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="入库仓库">
<el-select v-model="listQuery.inp_storehouse_id" placeholder="请选择" clearable >
<el-option v-for="(item,i) in storehouse" :key="i" :label="item.storehouse_name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-select v-model="listQuery.supplier_id" placeholder="请选择" clearable >
<el-option v-for="(item,i) in SupplierList" :key="i" :label="item.supplier_name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="代理商">
<el-select v-model="listQuery.agent_id" placeholder="请选择" clearable >
<el-option v-for="(item,i) in AgentList" :key="i" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="客户名称">
<el-input
v-model="jmdListQuery.contractNumber"
v-model="listQuery.customer_name"
maxlength="20"
placeholder="请输入油罐编号"
placeholder="请输入客户名称"
class="addinputw"
clearable
/>
</el-form-item>
<el-form-item label="日期">
<el-date-picker
v-model="jmdListQuery.date"
type="date"
<el-form-item label="批次号">
<el-input
v-model="listQuery.batch_number"
maxlength="20"
placeholder="请输入批次号"
class="addinputw"
clearable
/>
</el-form-item>
<el-form-item label="审核状态">
<el-select v-model="listQuery.status" placeholder="请选择" clearable >
<el-option v-for="(item,i) in Status" :key="i" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="出入库类型">
<el-select v-model="listQuery.type" placeholder="请选择" clearable >
<el-option v-for="(item,i) in OutInType" :key="i" :label="item" :value="i"></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料编号">
<el-input
v-model="listQuery.materiel_no"
maxlength="20"
placeholder="请输入物料编号"
class="addinputw"
clearable
/>
</el-form-item>
<el-form-item label="物料名称">
<el-input
v-model="listQuery.materiel_name"
maxlength="20"
placeholder="请输入物料名称"
class="addinputw"
clearable
value-format="yyyy-MM-dd"
placeholder="选择日期"
/>
</el-form-item>
<el-form-item label="物料组">
<el-select v-model="listQuery.materiel_group" placeholder="请选择" clearable >
<el-option v-for="(item,i) in Materia" :key="i" :label="item" :value="i"></el-option>
</el-select>
</el-form-item>
<el-form-item label="选择出入库">
<el-select v-model="listQuery.record_type" placeholder="请选择" clearable >
<el-option v-for="(item,i) in outliArr" :key="i" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="出入库时间">
<el-date-picker
v-model="listQuery.materiel_group"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item> -->
</el-form>
<div class="btn" style="text-align: center">
<el-button
@ -74,38 +142,37 @@
</el-table-column>
<el-table-column
align="center"
prop="materiel_group_text"
prop="materiel_no"
label="物料编号"
>
</el-table-column>
<el-table-column
align="center"
prop="num"
width="100"
prop="materiel_name"
label="物料名称"
>
</el-table-column>
<el-table-column
align="center"
prop="actual_price"
prop="materiel_group_text"
label="物料组"
>
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="brand_name"
label="物料品牌"
>
</el-table-column>
<el-table-column
align="center"
prop="admin_name"
prop="price"
label="物料单价"
>
</el-table-column>
<el-table-column
align="center"
prop="admin_name"
prop="unit"
label="单位"
>
</el-table-column>
@ -153,15 +220,33 @@
},
],
logList: [],
tempList: [],
outliArr: [{name:'出库',id:'1'},{name:'入库',id:'2'}],
listQuery: {
page: 1,
limit: 10,
out_storehouse_id:'',
inp_storehouse_id:'',
agent_id:'',
supplier_id:'',
customer_name:'',
batch_number:'',
status:'',
type:'',
materiel_no:'',
materiel_name:'',
materiel_group:'',
record_type:'',
},
total: 0,
jmdListQuery: {
contractNumber: "",
date: "",
storehouse:[],
SupplierList:[],
Materia:{},
AgentList:[],
OutInType:{},
Status:{},
QueryList: {
page: 1,
limit: 100,
},
};
},
@ -172,6 +257,7 @@
created() {
// 初始化变量
this.init();
this.getMaterialGroup();
},
methods: {
// 搜索条件效果
@ -190,8 +276,21 @@
this.listQuery = {
page: 1,
limit: 10,
out_storehouse_id:'',
inp_storehouse_id:'',
agent_id:'',
supplier_id:'',
customer_name:'',
batch_number:'',
status:'',
type:'',
materiel_no:'',
materiel_name:'',
materiel_group:'',
record_type:'',
};
this.total = 0;
this.loadLogList();
},
// 右上角点击事件
btnHandle(btnKey) {
@ -223,6 +322,45 @@
resetState() {
this.viewState = 1;
},
getMaterialGroup(){
req.getMaterialGroup().then((res) => {
if(res.code==200){
this.Materia=res.data.data
}
});
req.getAgentList().then((res) => {
if(res.code==200){
this.AgentList=res.data.data
}
});
req.getStatus().then((res) => {
if(res.code==200){
this.Status=res.data.data
}
});
req.getWarehouse(this.QueryList).then((res) => {
if(res.code==200){
this.storehouse = res.data.data.list
}
});
req.getSupplierList(this.QueryList).then((res) => {
if(res.code==200){
this.SupplierList = res.data.data.list
}
});
req.getOutType().then((res) => {
if(res.code==200){
var OutList=res.data.data
req.getInType().then((res) => {
if(res.code==200){
var InList=res.data.data
this.OutInType=Object.assign({}, OutList, InList);
console.log(this.OutInType);
}
});
}
});
},
doClose() {
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);

Write Preview
Loading…
Cancel
Save