初版
This commit is contained in:
parent
cfa8bfb0d3
commit
7a6e9b234c
@ -1,18 +1,18 @@
|
||||
export default {
|
||||
|
||||
//正式接口
|
||||
base_scm:'/api',
|
||||
base_auth:'',//登录
|
||||
base_mes:'/mes',//面料
|
||||
base_process:'/mes',//工艺
|
||||
// base_scm:'/api',
|
||||
// base_auth:'',//登录
|
||||
// base_mes:'/mes',//面料
|
||||
// base_process:'/mes',//工艺
|
||||
|
||||
|
||||
//本地服务
|
||||
|
||||
// base_scm: 'http://192.168.1.222:7002',
|
||||
// // base_scm: 'https://scm.goodsilk.cn/api',
|
||||
// base_auth:'https://oauth.goodsilk.cn/api',//登录
|
||||
// base_mes:'https://scm.goodsilk.cn/mes',//面料
|
||||
// base_process:'https://scm.goodsilk.cn/mes',//工艺
|
||||
base_scm: 'https://scm.goodsilk.cn/api',
|
||||
base_auth:'https://oauth.goodsilk.cn/api',//登录
|
||||
base_mes:'https://scm.goodsilk.cn/mes',//面料
|
||||
base_process:'https://scm.goodsilk.cn/mes',//工艺
|
||||
|
||||
}
|
31
pages.json
31
pages.json
@ -490,7 +490,36 @@
|
||||
"path" : "pages/colorBlank/ColorBlankQuality1",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : ""
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": false,
|
||||
"disableScroll": true,
|
||||
"app-plus": {
|
||||
"bounce": "none"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/colorBlank/ScanCodeStorage",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": false,
|
||||
"disableScroll": true,
|
||||
"app-plus": {
|
||||
"bounce": "none"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/orderStatus/orderStatus",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom",
|
||||
"enablePullDownRefresh": false,
|
||||
"disableScroll": true,
|
||||
"app-plus": {
|
||||
"bounce": "none"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
|
@ -236,7 +236,7 @@
|
||||
id: form.value.ids[j],
|
||||
mlxq: l,
|
||||
testItems: testItems.value,
|
||||
status: '回修',
|
||||
status: '质检完成',
|
||||
})
|
||||
} else {
|
||||
data.push({
|
||||
@ -263,7 +263,7 @@
|
||||
id: form.value.ids[j],
|
||||
mlxq: l,
|
||||
testItems: testItems.value,
|
||||
status: '回修',
|
||||
status: '暂存',
|
||||
})
|
||||
} else {
|
||||
data.push({
|
||||
@ -332,7 +332,7 @@
|
||||
id: form.value.ids[j],
|
||||
mlxq: l,
|
||||
testItems: testItems.value,
|
||||
status: '回修',
|
||||
status: '待审核',
|
||||
})
|
||||
} else {
|
||||
data.push({
|
||||
|
@ -236,7 +236,7 @@
|
||||
id: form.value.ids[j],
|
||||
mlxq: l,
|
||||
testItems: testItems.value,
|
||||
status: '回修',
|
||||
status: '质检完成',
|
||||
})
|
||||
} else {
|
||||
data.push({
|
||||
@ -263,7 +263,7 @@
|
||||
id: form.value.ids[j],
|
||||
mlxq: l,
|
||||
testItems: testItems.value,
|
||||
status: '回修',
|
||||
status: '暂存',
|
||||
})
|
||||
} else {
|
||||
data.push({
|
||||
|
101
pages/colorBlank/ScanCodeStorage.vue
Normal file
101
pages/colorBlank/ScanCodeStorage.vue
Normal file
@ -0,0 +1,101 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
|
||||
const onClickLeft = () => {
|
||||
history.back()
|
||||
}
|
||||
|
||||
const h5ScanCode = ref(false);
|
||||
function scanCode() {
|
||||
// #ifdef H5
|
||||
h5ScanCode.value = true;
|
||||
// #endif
|
||||
// #ifndef H5
|
||||
uni.scanCode({
|
||||
success: (res) => {
|
||||
uni.showToast({
|
||||
icon: "none",
|
||||
title: res.result,
|
||||
});
|
||||
},
|
||||
faile: (err) => {
|
||||
console.log("err", err);
|
||||
},
|
||||
});
|
||||
// #endif
|
||||
}
|
||||
function handleSuccess(res : any) {
|
||||
h5ScanCode.value = false;
|
||||
}
|
||||
function handleFail(err : any) {
|
||||
uni.showModal({
|
||||
title: err.errName,
|
||||
content: err.errMsg,
|
||||
complete: () => {
|
||||
h5ScanCode.value = false;
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function handleClose() {
|
||||
h5ScanCode.value = false;
|
||||
}
|
||||
|
||||
const showDialog = ref(false)
|
||||
const form = ref({} as any)
|
||||
|
||||
const submit = () =>{
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="flex">
|
||||
<van-nav-bar title="扫描暂存" left-text="返回" left-arrow @click-left="onClickLeft" />
|
||||
<h3 style="text-align: center;">请扫描面料编码</h3>
|
||||
<view style="text-align: center;margin-top: 100rpx;">
|
||||
<van-image width="100" height="100" src="../../static/zhaoxiangji.png" @click="scanCode" />
|
||||
</view>
|
||||
</view>
|
||||
<cshaptx4869-scancode v-if="h5ScanCode" @success="handleSuccess" @fail="handleFail"
|
||||
@close="handleClose"></cshaptx4869-scancode>
|
||||
|
||||
<van-dialog v-model:show="showDialog">
|
||||
<view style="margin: 10rpx 5rpx;">
|
||||
<van-field label="质检时间" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="质检人员" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="供应商名" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="面料名称" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="面料编号" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="面料米数" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="入库人" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="白胚等级" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="面料状态" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
<van-field label="入库时间" label-width="5.5em" colon label-align="right" v-model="form.zjsj" readonly/>
|
||||
</view>
|
||||
<template #footer>
|
||||
<view class="footer-button">
|
||||
<van-button size="small" style="width: 25vw;" @click="showDialog=false">
|
||||
取消
|
||||
</van-button>
|
||||
<van-button size="small" type="success" style="width: 25vw;" @click="submit">
|
||||
暂存
|
||||
</van-button>
|
||||
</view>
|
||||
</template>
|
||||
</van-dialog>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.flex {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
}
|
||||
.footer-button {
|
||||
margin: 20px;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
}
|
||||
</style>
|
@ -77,6 +77,11 @@
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
const choose = () =>{
|
||||
list.value = []
|
||||
init()
|
||||
}
|
||||
|
||||
//日期选择
|
||||
const show = ref(false)
|
||||
@ -204,8 +209,8 @@
|
||||
<van-cell-group inset style="display: flex;">
|
||||
<van-field v-model="form.color" name="色号" label="色号" colon class="bor-a" label-width="5em" />
|
||||
<view style="display: flex;align-items: center;justify-content: space-around;width: 100%;">
|
||||
<van-button style="width: 5em;">重置</van-button>
|
||||
<van-button type="primary" style="width: 5em;">筛选</van-button>
|
||||
<van-button style="width: 5em;" @click="form={}">重置</van-button>
|
||||
<van-button type="primary" style="width: 5em;" @click="choose">筛选</van-button>
|
||||
</view>
|
||||
</van-cell-group>
|
||||
<view class="grid-container">
|
||||
|
@ -259,7 +259,7 @@
|
||||
<view v-for="(itemSecond,indexSecond) in bhms" :key="indexSecond">
|
||||
<view v-if="itemSecond.index==index" class="box">
|
||||
{{itemSecond.code}}<br>{{itemSecond.ms}}米
|
||||
<van-icon name="cross" color="red" @click="bhms.splice(indexSecond,1)" />
|
||||
<van-icon name="cross" color="red" @click="bhms.splice(indexSecond,1),conScanCode()" />
|
||||
</view>
|
||||
</view>
|
||||
<p :style="{color:totalMeter(index)>item.len?'red':''}">总米数:{{totalMeter(index)}}</p>
|
||||
@ -281,7 +281,7 @@
|
||||
readonly :rules="[{ required: true, message: '请填写' }]" @click="choosePic" />
|
||||
<van-field v-model="formItem.jcps" name="进厂匹数" label="进厂匹数" colon label-width="5em"
|
||||
class="bor-n" readonly />
|
||||
<van-field v-model="formItem.jcms" name="进厂米数" label="进厂米数" colon class="bor-n" readonly
|
||||
<van-field v-model="formItem.jcms" name="进厂米数" label="进厂米数" type="digit" colon class="bor-n" readonly
|
||||
label-width="5em" />
|
||||
</view>
|
||||
</van-cell-group>
|
||||
|
@ -252,7 +252,7 @@
|
||||
<view v-for="(itemSecond,indexSecond) in bhms" :key="indexSecond">
|
||||
<view v-if="itemSecond.index==index" class="box">
|
||||
{{itemSecond.code}}<br>{{itemSecond.ms}}米
|
||||
<van-icon name="cross" color="red" @click="bhms.splice(indexSecond,1)" />
|
||||
<van-icon name="cross" color="red" @click="bhms.splice(indexSecond,1),conScanCode()" />
|
||||
</view>
|
||||
</view>
|
||||
<p :style="{color:totalPs(index)>item.quantity?'red':''}">总匹数:{{totalPs(index)}}</p>
|
||||
@ -276,7 +276,7 @@
|
||||
readonly :rules="[{ required: true, message: '请填写' }]" @click="choosePic()" />
|
||||
<van-field v-model="formItem.jcps" name="进厂匹数" label="进厂匹数" colon label-width="5em"
|
||||
class="bor-n" readonly />
|
||||
<van-field v-model="formItem.jcms" name="进厂米数" label="进厂米数" colon class="bor-n" readonly
|
||||
<van-field v-model="formItem.jcms" name="进厂米数" label="进厂米数" type="digit" colon class="bor-n" readonly
|
||||
label-width="5em" />
|
||||
</view>
|
||||
</van-cell-group>
|
||||
|
@ -127,11 +127,16 @@ const ListData =ref([
|
||||
name:'质检结果查询',
|
||||
type:'testing',
|
||||
},
|
||||
// {
|
||||
// path:'../colorBlank/ColorBlankQuality',
|
||||
// name:'色胚质检',
|
||||
// type:'blemish',
|
||||
// },
|
||||
{
|
||||
path:'../colorBlank/ScanCodeStorage',
|
||||
name:'扫码暂存',
|
||||
type:'testing',
|
||||
},
|
||||
{
|
||||
path:'../orderStatus/orderStatus',
|
||||
name:'订单状态查询',
|
||||
type:'testing',
|
||||
},
|
||||
// {
|
||||
// path:'../colorBlank/chemical',
|
||||
// name:'理化报告',
|
||||
|
85
pages/orderStatus/orderStatus.vue
Normal file
85
pages/orderStatus/orderStatus.vue
Normal file
@ -0,0 +1,85 @@
|
||||
<script setup lang="ts">
|
||||
import { ref } from 'vue';
|
||||
|
||||
const form = ref({} as any)
|
||||
const onClickLeft = () => {
|
||||
history.back()
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="flex">
|
||||
<van-nav-bar title="订单状态查询" left-text="返回" left-arrow @click-left="onClickLeft" />
|
||||
<view style="display: flex;align-items: center;">
|
||||
<van-field class="bor" label="谁定" label-width="2.5em" colon v-model="form.jyy" />
|
||||
<van-field class="bor" label="做单人" label-width="3.5em" colon v-model="form.jyy" />
|
||||
<view style="width: 20%;margin-right: 5rpx;">
|
||||
<van-button type="primary" style="width: 3rem;">搜索</van-button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="content">
|
||||
<view class="card" v-for="(item,index) in 10">
|
||||
<view class="grid-container">
|
||||
<view class="grid-item">进厂日期:2025-01-05</view>
|
||||
<view class="grid-item" style="text-align: end;">当前进度:<text style="color: red;">排单</text></view>
|
||||
<view class="grid-item">百合白,莉定</view>
|
||||
<view class="grid-item" style="text-align: center;">做单人:小黑</view>
|
||||
<view class="grid-item">140/弹力缎19</view>
|
||||
<view class="grid-item" style="text-align: center;">约150米~3匹</view>
|
||||
<view class="grid-item">140/弹力缎19</view>
|
||||
<view class="grid-item" style="text-align: center;">约150米~3匹</view>
|
||||
<view class="grid-item">在厂天数:1天</view>
|
||||
<view class="grid-item" style="text-align: center;">预计出厂日期:2025-01-12</view>
|
||||
<view class="grid-item">当前进度:染色</view>
|
||||
<view class="grid-item" style="text-align: center;">当前操作日期:2025-01-06</view>
|
||||
<view class="grid-item"></view>
|
||||
<view class="grid-item" style="text-align: center;">预计下一步日期:2025-01-07</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.flex {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
overflow-y: hidden;
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
|
||||
.content {
|
||||
flex: 1;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.bor {
|
||||
::v-deep .van-field__control {
|
||||
border-bottom: 1px solid #d7d7d7;
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep .van-button--normal {
|
||||
padding: 5px 8px;
|
||||
height: 30px;
|
||||
}
|
||||
::v-deep .van-cell{
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
|
||||
.grid-container {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
font-size: 14px;
|
||||
.grid-item{
|
||||
padding: 10rpx 0;
|
||||
}
|
||||
}
|
||||
.card{
|
||||
background-color: #fff;
|
||||
padding: 5rpx 15rpx;
|
||||
margin-top: 10rpx;
|
||||
}
|
||||
</style>
|
BIN
static/zhaoxiangji.png
Normal file
BIN
static/zhaoxiangji.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.7 KiB |
Loading…
Reference in New Issue
Block a user