Skip to content

H
hg-front
Commit d0f50eed by zhangzhen
Options

细节优化

parent 1a486554
Showing with 169 additions and 108 deletions
pages.json
......@@ -349,6 +349,17 @@
}
},
{
"path" : "pages/picking/add-sub",
"style" :
{
"navigationBarTitleText" : "新增明细",
"navigationBarBackgroundColor": "#0072fc",
"navigationBarTextStyle": "white",
"navigationStyle": "custom",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/pro-infor/index",
"style" :
{
......@@ -675,6 +686,13 @@
"navigationStyle": "custom",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/webPage/webPage",
"style" :
{
"navigationBarTitleText" : ""
}
}
],
"globalStyle": {
......
pages/picking/add.vue
......@@ -501,16 +501,21 @@
companyCode: this.factoryList[this.factoryIndex].value,
whCode: this.projectList[this.projectIndex].value,
}).then(res => {
this.inventRecordList = toJsonData(res.data.__blocks__.invent_code_box_block_id.rows, res.data
.__blocks__.invent_code_box_block_id.meta.columns).map(item => {
this.inventRecordEnum[item.valueField] = `[${item.valueField}]${item.textField}[${item.param1Field}]`
return {
...item,
label: `[${item.valueField}]${item.textField}[${item.param1Field}]` ,
value: item.valueField,
name: item.textField
}
});
let list = toJsonData(res.data.__blocks__.invent_code_box_block_id.rows, res.data
.__blocks__.invent_code_box_block_id.meta.columns)
if(list && list.length){
this.inventRecordList = list.map(item => {
this.inventRecordEnum[item.valueField] = `[${item.valueField}]${item.textField}[${item.param1Field}]`
return {
...item,
label: `[${item.valueField}]${item.textField}[${item.param1Field}]` ,
value: item.valueField,
name: item.textField
}
});
}else{
this.inventRecordList = []
}
this.$forceUpdate();
})
}
......
pages/picking/index.vue
......@@ -324,7 +324,6 @@
this.id = option.id
this.onLoading();
}
},
methods: {
onNavToSubPage(val) {
......@@ -335,7 +334,7 @@
})
} else {
uni.navigateTo({
url: `/pages/picking/edit?id=${this.id}`
url: `/pages/picking/add-sub?id=${this.id}`
})
}
}
......
pages/product-order/index.vue
......@@ -60,6 +60,16 @@
<text class="text-title">{{orderInfo.projName}}</text>
</view>
<view class="flex-row">
<text class="text-gray part-1">产品规格</text>
<text class="text-gray part-2">:</text>
<text class="text-title">{{orderInfo.spec}}</text>
</view>
<view class="flex-row">
<text class="text-gray part-1">产品长度</text>
<text class="text-gray part-2">:</text>
<text class="text-title">{{orderInfo.length}}</text>
</view>
<view class="flex-row">
<text class="text-gray part-1">计划完成日期</text>
<text class="text-gray part-2">:</text>
<text class="text-title">{{orderInfo.planEndDate}}</text>
......
pages/product-order/list.vue
<template>
<view>
<view :class="show? 'hidden-box':'' ">
<cu-custom bgColor="bg-blue" :isBack="true">
<block slot="backText">
<view class="list-icon" @tap="onBack">
......@@ -9,11 +9,11 @@
<block slot="content">
<text class="text-white">生产任务</text>
</block>
<!-- <block slot="right">
<block slot="right">
<view class="margin-right text-xxl" @tap="onPopOpen">
<text class="cuIcon-filter" :class="searchStatus? 'text-green': 'text-white'"></text>
</view>
</block> -->
</block>
</cu-custom>
......@@ -99,6 +99,16 @@
<text class="text-gray part-2">:</text>
<text class="text-title">{{item.groupName}}</text>
</view>
<view class="flex-row">
<text class="text-gray part-1">产品规格</text>
<text class="text-gray part-2">:</text>
<text class="text-title">{{item.spec}}</text>
</view>
<view class="flex-row">
<text class="text-gray part-1">产品长度</text>
<text class="text-gray part-2">:</text>
<text class="text-title">{{item.length}}</text>
</view>
<view class="flex-row">
<text class="text-gray part-1">计划完成日期</text>
<text class="text-gray part-2">:</text>
......@@ -154,56 +164,57 @@
</view>
</view>
<u-popup :show="show" mode="right" :closeOnClickOverlay="true" :zIndex="455" :safeAreaInsetBottom="true"
<u-popup :show="show" mode="right" :closeOnClickOverlay="true" :zIndex="455" :safeAreaInsetBottom="true"
:safeAreaInsetTop="true" round="6" @close="onPopClose">
<view class="flex-col filter-box">
<view class="content-black" :style="{height:statusBarHeight+45+'px'}">
</view>
<view class="flex-between text-xxl">
<view class=""></view>
<view class="text-title text-lg text-bold margin-left-sm">查询条件</view>
<text class="cuIcon-roundclose text-gray margin-right" @tap="onPopClose"></text>
</view>
<view v-if="!projValue || (projValue&& searchProjectList.length>1)" class="flex-col item">
<text class="text-title margin-bottom-sm">项目名称：</text>
<picker class="input-box" mode="selector" :range="searchProjectList" v-model="projValue" range-key="projName"
@change="onProjChange">
<view>
<text :class="projValue?'text-black':'text-gray'">{{searchProjectList[projValue].projName }}</text>
<view class="flex-col query-data">
<view class="flex-col part">
<view class="title">
<text class="text-title">项目名称：</text>
</view>
<view class="input">
<u-input border="surround" placeholder="请输入项目名称" v-model="queryData.projName" type="text" :maxlength="99" name="input"></u-input>
</view>
</view>
<view class="flex-col part">
<view class="title">
<text class="text-title">产品名称：</text>
</view>
</picker>
</view>
<view v-if="!prdtValue || (prdtValue&& searchPrdtSpecList.length>1)" class="flex-col item">
<text class="text-title margin-bottom-sm">部件名称：</text>
<picker class="input-box" mode="selector" :range="searchPrdtSpecList" v-model="prdtValue" range-key="prdtName"
@change="onPrdtChange">
<view>
<text :class="prdtValue?'text-black':'text-gray'">{{searchPrdtSpecList[prdtValue].prdtName}}</text>
<view class="input">
<u-input border="surround" placeholder="请输入产品名称" v-model="queryData.productName" type="text" :maxlength="99" name="input"></u-input>
</view>
</picker>
</view>
<view v-if="!partValue || (partValue&& searchPartList.length>1)" class="flex-col item">
<text class="text-title margin-bottom-sm">零件名称：</text>
<picker class="input-box" mode="selector" :range="searchPartList" v-model="partValue" range-key="partName"
@change="onPartChange">
<view>
<text :class="partValue?'text-black':'text-gray'">{{searchPartList[partValue].partName}}</text>
</view>
<view class="flex-col part">
<view class="title">
<text class="text-title">产品编号：</text>
</view>
</picker>
</view>
<view class="input">
<u-input border="surround" placeholder="请输入产品编号" v-model="queryData.productCode" type="text" :maxlength="99" name="input"></u-input>
</view>
</view>
</view>
<view class="list-btn">
<button class="cu-btn bg-gray" @tap="onReset">重 置</button>
<button class="cu-btn bg-blue" @tap="onFilterConfirm">确 定</button>
</view>
</view>
</u-popup>
</view>
</template>
......@@ -217,30 +228,8 @@
export default {
data() {
return {
projectDataList:[
// {
// projName:"2DL1吊车梁",
// projCode:"2DL1",
// gx:"组立",
// prodNo:"ZJRW20240001",
// gcName:"黄冈兴禹新材料科技有限公司",
// createdTime:"2024-06-01",
// status:1,
// totalNum:10,
// num:6
// },
// {
// projName:"2DL2吊车梁",
// projCode:"2DL2",
// gx:"焊接",
// prodNo:"ZJRW20240002",
// gcName:"黄冈兴禹新材料科技有限公司",
// createdTime:"2024-06-02",
// status:2,
// totalNum:10,
// num:10
// }
],
show: false,
projectDataList:[],
statusBarHeight: uni.getStorageSync("statusHeight") || 0,
status: 'nomore ',
loadingText: '努力加载中',
......@@ -255,11 +244,15 @@
value: ''
},
{
name: '未完工',
name: '未报工',
value: '0'
},
// {
// name: '部分报工',
// value: '1'
// },
{
name: '已完工',
name: '已报工',
value: '1'
}
],
......@@ -414,42 +407,34 @@
url:`/pages/product-order/index?id=`+val.id
})
},
onReset() {
this.searchParams = {
projCode: "",
prdtCode: "",
partCode: ""
}
this.projValue = 0;
this.prdtValue = 0;
this.partValue = 0;
this.onPopClose();
this.queryData = {
...this.queryData,
...this.searchParams
onReset(){
this.queryData.productName = "";
this.queryData.productCode = "";
this.queryData.projName = "";
this.pageData.offset = 0;
this.searchStatus = false;
this.show = false;
this.onGetList();
},
onFilterConfirm(){
if(!this.queryData.productCode&& !this.queryData.projName && !this.queryData.productName){
uni.showToast({
icon:"none",
title:"请输入至少一个查询条件"
})
return
}
this.searchStatus = !!this.projValue;
this.onStorageParams();
this.show = false;
this.searchStatus = true;
this.pageData.offset = 0;
this.onGetList();
},
onPopClose() {
this.show = false;
},
onPopOpen() {
if(this.searchProjectList.length <= 1){
getSearchProjectList({
companyCode: this.factoryList[this.index].value
}).then(res => {
this.searchProjectList = [{
projName: "请选择项目"
}]
if (res.data.status === 1 && res.data.result && res.data.result.length) {
this.searchProjectList = [...this.searchProjectList, ...res.data.result];
}
})
}
onPopOpen(){
this.show = true
}
},
}
}
</script>
......@@ -568,10 +553,6 @@
.part-3 {
flex-direction: column;
padding-bottom: 120upx;
.content-item {
display: flex;
flex-direction: column;
......@@ -724,4 +705,51 @@
}
}
}
.filter-box {
position: relative;
display: flex;
flex-direction: column;
width: 60vw;
height: 100%;
padding-top: 30upx;
.item {
margin: 20upx;
.input-box {
border: 1px solid #dadbde;
border-radius: 4px;
padding: 6px 9px;
font-size: 30upx;
}
}
.list-btn {
position: absolute;
left: 0;
bottom: 40upx;
width: 100%;
display: flex;
justify-content: space-between;
.cu-btn {
display: flex;
flex: 1;
margin: 20upx;
}
}
}
.query-data{
border-top: 1px solid #e5e5e5;
margin-top: 24upx;
.part{
.input{
margin: 0 24upx;
}
}
.title{
padding: 12upx 20upx;
}
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment