From e4418b60a9e80a1438919e618d2e5e2048d404bc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 17 Oct 2022 11:23:11 +0800
Subject: [PATCH] 农场图片显示优化；加工产品管理去除导入功能；修复加工、销售、出库、损耗记录表的查询功能
---
src/views/farmplant/inventorylist.vue | 23 ++++++++---
src/views/farmplant/salelist.vue | 19 ++++++++-
src/views/farmplant/processlist.vue | 16 +++++---
src/views/farmplant/retrievallist.vue | 21 ++++++++--
src/page/login/userlogin.vue | 2
src/views/farm/farm.vue | 4 +
src/views/machining/machining.vue | 34 ++++++++--------
7 files changed, 80 insertions(+), 39 deletions(-)
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index c8de5e0..2fc320e 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -175,7 +175,7 @@
this.loginInfoByToken();
}else{
//跳转到本地登录页时跳转到统一登录
- window.location.replace('http://dev.jxpskj.com:8020/ncny/login.html')
+ // window.location.replace('http://dev.jxpskj.com:8020/ncny/login.html')
}
},
mounted() {
diff --git a/src/views/farm/farm.vue b/src/views/farm/farm.vue
index 2703ced..2c6d852 100644
--- a/src/views/farm/farm.vue
+++ b/src/views/farm/farm.vue
@@ -83,7 +83,7 @@
addBtn: true,
searchMenuSpan: 6,
height: 583,
- menuWidth: 300,
+ menuWidth: 250,
border: true,
viewBtn: false,
align: "center",
@@ -98,6 +98,7 @@
prop: "farmName",
labelWidth: 145,
maxlength:40,
+ width: 200,
rules: [{
required: true,
message: "请输入农场名称",
@@ -170,6 +171,7 @@
label: "农场面积",
prop: "farmArea",
labelWidth: 145,
+ width:70,
rules: [{
required: true,
message: "请输入农场面积",
diff --git a/src/views/farmplant/inventorylist.vue b/src/views/farmplant/inventorylist.vue
index 71c062d..c007d5b 100644
--- a/src/views/farmplant/inventorylist.vue
+++ b/src/views/farmplant/inventorylist.vue
@@ -60,15 +60,19 @@
column: [
{
label: "品种",
- prop: "strainId",
+ prop: "kind",
search: true,
hide: true,
- display: true,
+ display: false,
type: "select",
- dicUrl: '/api/strain/strain-tree',
+ dicUrl: '/api/strain/kind-tree',
+ dicFormatter:(res)=>{
+ this.kindList = res.data
+ return res.data
+ },
props: {
- label: "strainName",
- value: "id"
+ label: "kindName",
+ value: "id"
}
},
{
@@ -140,6 +144,13 @@
this.onLoad(this.page)
},
searchChange (params, done) {
+ if (params.kind){
+ this.kindList.forEach(e=>{
+ if (e.id == params.kind){
+ params.type = e.type
+ }
+ })
+ }
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
@@ -161,7 +172,7 @@
message: "操作成功!"
});
});
- },
+ },
}
}
</script>
diff --git a/src/views/farmplant/processlist.vue b/src/views/farmplant/processlist.vue
index 37b26a6..3502a99 100644
--- a/src/views/farmplant/processlist.vue
+++ b/src/views/farmplant/processlist.vue
@@ -62,15 +62,19 @@
column: [
{
label: "品种",
- prop: "strainId",
+ prop: "kind",
search: true,
hide: true,
display: false,
type: "select",
- dicUrl: '/api/strain/strain-tree',
+ dicUrl: '/api/strain/kind-tree',
+ dicFormatter:(res)=>{
+ this.kindList = res.data
+ return res.data
+ },
props: {
- label: "strainName",
- value: "id"
+ label: "kindName",
+ value: "id"
}
},
{
@@ -111,7 +115,7 @@
this.onLoad(this.page)
}
}
- },
+ },
methods: {
currentChange (currentPage) {
this.page.currentPage = currentPage
@@ -169,4 +173,4 @@
<style>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/farmplant/retrievallist.vue b/src/views/farmplant/retrievallist.vue
index ab38a09..97c4ed0 100644
--- a/src/views/farmplant/retrievallist.vue
+++ b/src/views/farmplant/retrievallist.vue
@@ -60,15 +60,19 @@
column: [
{
label: "品种",
- prop: "strainId",
+ prop: "kind",
search: true,
hide: true,
- display: true,
+ display: false,
type: "select",
- dicUrl: '/api/strain/strain-tree',
+ dicUrl: '/api/strain/kind-tree',
+ dicFormatter:(res)=>{
+ this.kindList = res.data
+ return res.data
+ },
props: {
- label: "strainName",
- value: "id"
+ label: "kindName",
+ value: "id"
}
},
{
@@ -140,6 +144,13 @@
this.onLoad(this.page)
},
searchChange (params, done) {
+ if (params.kind){
+ this.kindList.forEach(e=>{
+ if (e.id == params.kind){
+ params.type = e.type
+ }
+ })
+ }
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
diff --git a/src/views/farmplant/salelist.vue b/src/views/farmplant/salelist.vue
index 352ed01..51985c7 100644
--- a/src/views/farmplant/salelist.vue
+++ b/src/views/farmplant/salelist.vue
@@ -37,6 +37,8 @@
total: 0,
},
selectionList: [],
+ //种类集合
+ kindList:[],
option: {
tip: false,
searchShow: true,
@@ -60,14 +62,18 @@
column: [
{
label: "品种",
- prop: "strainId",
+ prop: "kind",
search: true,
hide: true,
display: false,
type: "select",
- dicUrl: '/api/strain/strain-tree',
+ dicUrl: '/api/strain/kind-tree',
+ dicFormatter:(res)=>{
+ this.kindList = res.data
+ return res.data
+ },
props: {
- label: "strainName",
+ label: "kindName",
value: "id"
}
},
@@ -146,6 +152,13 @@
this.onLoad(this.page)
},
searchChange (params, done) {
+ if (params.kind){
+ this.kindList.forEach(e=>{
+ if (e.id == params.kind){
+ params.type = e.type
+ }
+ })
+ }
this.query = params
this.page.currentPage = 1
this.onLoad(this.page, params)
diff --git a/src/views/machining/machining.vue b/src/views/machining/machining.vue
index 087f4c0..18f59f1 100644
--- a/src/views/machining/machining.vue
+++ b/src/views/machining/machining.vue
@@ -29,25 +29,25 @@
v-if="permission.machining_delete"
@click="handleDelete"
>删 除</el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >导入</el-button>
+<!-- <el-button-->
+<!-- type="success"-->
+<!-- size="small"-->
+<!-- plain-->
+<!-- icon="el-icon-upload2"-->
+<!-- @click="handleImport"-->
+<!-- >导入</el-button>-->
</template>
</avue-crud>
- <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载
- <i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
+<!-- <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">-->
+<!-- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">-->
+<!-- <template slot="excelTemplate">-->
+<!-- <el-button type="primary" @click="handleTemplate">-->
+<!-- 点击下载-->
+<!-- <i class="el-icon-download el-icon--right"></i>-->
+<!-- </el-button>-->
+<!-- </template>-->
+<!-- </avue-form>-->
+<!-- </el-dialog>-->
</basic-container>
</template>
--
Gitblit v1.9.3