Skip to content

M
mes-pad
Commit 93fdb87b authored by mengcheng's avatar mengcheng
Browse files
Options

修改主体样式

parent 250b3774
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 881 additions and 731 deletions
common/http.api.js
View file @ 93fdb87b
...@@ -64,6 +64,9 @@ const install = (Vue, vm) => { ...@@ -64,6 +64,9 @@ const install = (Vue, vm) => {
//根据字典类型查询字典数据信息 //根据字典类型查询字典数据信息
getDicts: (params = {}) => vm.$u.get(config.adminPath + '/system/dict/data/type/' + params), getDicts: (params = {}) => vm.$u.get(config.adminPath + '/system/dict/data/type/' + params),
//根据字典类型查询字典数据信息
getIssusLinebyWorkorderCodes: (params = {}) => vm.$u.post(config.adminPath + '/mobile/wm/issueline/listByWorkorderCodes', params),
/** /**
* 工艺工序相关API * 工艺工序相关API
......
components/DictData/index.js
View file @ 93fdb87b
...@@ -2,21 +2,35 @@ ...@@ -2,21 +2,35 @@
import DataDict from '@/common/dict' import DataDict from '@/common/dict'
// import http from '@/common/http.api' // import http from '@/common/http.api'
const cache = {}; // 用于缓存已请求的字典数据
const install = (Vue, vm) => { const install = (Vue, vm) => {
Vue.use(DataDict, { Vue.use(DataDict, {
metas: { metas: {
'*': { '*': {
labelField: 'dictLabel', labelField: 'dictLabel',
valueField: 'dictValue', valueField: 'dictValue',
request(dictMeta) { request(dictMeta) {
return vm.$u.api.getDicts(dictMeta.type).then(res => res.data) if (cache[dictMeta.type]) {
return Promise.resolve(cache[dictMeta.type]);
} else {
// return vm.$u.api.getDicts(dictMeta.type).then(res => res.data)
return vm.$u.api.getDicts(dictMeta.type).then(res => {
cache[dictMeta.type] = res.data;
return res.data;
});
}
}, },
}, },
}, },
}) })
} }
const logout = () => {
Object.keys(cache).forEach(key => delete cache[key]);
};
export default { export default {
install, install,
logout
} }
components/ScanInput/index.vue
View file @ 93fdb87b
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="inputp"> <div class="inputp">
<div class="inputs"> <div class="inputs">
<u-icon name="search" size="35" class='searchimg' @click='search'/> <u-icon name="search" size="35" class='searchimg' @click='search'/>
<input type="text" v-model="searchval" :placeholder="placeholder" @blur="search" confirm-type="search" inputmode="search" ref='searchinput' :focus='isfocus' <input type="text" v-model="value" :placeholder="placeholder" confirm-type="search"
class='scaninput' @confirm='search' > inputmode="search" ref='searchinput' :focus='isfocus' class='scaninput' @input='search'>
<u-icon name="scan" size="35" class="scanimg" @click='clickscan'/> <u-icon name="scan" size="35" class="scanimg" @click='clickscan'/>
</div> </div>
</div> </div>
...@@ -13,27 +13,24 @@ ...@@ -13,27 +13,24 @@
export default { export default {
name: 'SearchInput', name: 'SearchInput',
props: { props: {
hasscanbtn: Boolean,//是否有扫码按钮 hasscanbtn: Boolean,
isfocus: Boolean,//是否默认focus isfocus: Boolean,
hasgosearch: Boolean,//是否要跳转到搜索界面 hasgosearch: Boolean,
types: Number,//跳转的时候的参数type值 types: Number,
placeholder: { placeholder: {
type: String, type: String,
default: '搜索车辆编号' default: '搜索车辆编号'
}, },
gourl: {//跳转的搜索页面 gourl: {
type: String, type: String,
default: '/pages/scan/scan' default: '/pages/scan/scan'
},
value: {
type: String,
default: ''
} }
}, },
data() {
return {
showsearchbtn: false,
searchval: ''
};
},
methods: { methods: {
// 点击input的时候
clickinput() { clickinput() {
// var me = this; // var me = this;
// if (me.hasgosearch) { // if (me.hasgosearch) {
...@@ -43,19 +40,17 @@ export default { ...@@ -43,19 +40,17 @@ export default {
// }) // })
// } // }
}, },
// 搜索
search() { search() {
var me = this; var me = this;
if (me.searchval === '') { if (me.value === '') {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请先输入搜索内容' title: '请先输入搜索内容'
}) })
return; return;
} }
me.$emit('serach', me.searchval) me.$emit('serach', me.value)
}, },
// 点击扫码的时候
clickscan() { clickscan() {
var me = this; var me = this;
if (me.hasscanbtn) { if (me.hasscanbtn) {
...@@ -75,25 +70,19 @@ export default { ...@@ -75,25 +70,19 @@ export default {
code = arr[1]; code = arr[1];
} }
}) })
me.searchval = code; me.$emit('inputchange', code);
} }
}) })
} }
}, },
watch: { watch: {
searchval(v) { value(v) {
var me = this; var me = this;
me.$emit('inputchange', v) me.$emit('input', v)
if (v != '') {
me.showsearchbtn = true;
} else {
me.showsearchbtn = false;
}
} }
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.inputp { .inputp {
padding: 20upx; padding: 20upx;
......
pages/index/index.vue
View file @ 93fdb87b
...@@ -58,6 +58,7 @@ import ProContent from "../mes/pro/index.vue" ...@@ -58,6 +58,7 @@ import ProContent from "../mes/pro/index.vue"
import GxContent from "../mes/gx/index.vue" import GxContent from "../mes/gx/index.vue"
import QcContent from "../mes/qc/index.vue" import QcContent from "../mes/qc/index.vue"
import ProdReport from "../mes/prodReport/index.vue" import ProdReport from "../mes/prodReport/index.vue"
import DictData from '@/components/DictData'
export default { export default {
name: 'HomePage', name: 'HomePage',
...@@ -155,8 +156,9 @@ export default { ...@@ -155,8 +156,9 @@ export default {
this.$u.toast(res.msg); this.$u.toast(res.msg);
} }
if (res.code == '200') { if (res.code === 200) {
setTimeout(() => { setTimeout(() => {
DictData.logout();
uni.reLaunch({ uni.reLaunch({
url: '/pages/sys/login/login' url: '/pages/sys/login/login'
}); });
...@@ -172,7 +174,7 @@ export default { ...@@ -172,7 +174,7 @@ export default {
} }
</script> </script>
<style > <style>
.common-container { .common-container {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
......
pages/mes/prodReport/index.vue
View file @ 93fdb87b
...@@ -23,45 +23,42 @@ ...@@ -23,45 +23,42 @@
总报工订单数：{{ tableData.length }} 总报工订单数：{{ tableData.length }}
</view> </view>
<view class="prod-body-left-bom"> <view class="prod-body-left-bom">
<view class="prod-body-left-bom-type"> <!-- <view class="prod-body-left-bom-type">-->
<u-subsection :list="typeList" :current="currentType" type="primary" font-size="28" <!-- <u-subsection :list="typeList" :current="currentType" type="primary" font-size="28"-->
@change="typeChange"></u-subsection> <!-- @change="typeChange"></u-subsection>-->
</view> <!-- </view>-->
<view class="prod-body-left-bom-table"> <!-- <view class="prod-body-left-bom-table">-->
<u-form> <!-- <u-form>-->
<u-row gutter="16"> <!-- <u-row gutter="16">-->
<u-col span="3"> <!-- <u-col span="3">-->
<u-form-item label="任务单号" label-width="150"> <!-- <u-form-item label="任务单号" label-width="150">-->
{{ curTaskInfo.taskCode }} <!-- {{ curTaskInfo.taskCode }}-->
</u-form-item> <!-- </u-form-item>-->
</u-col> <!-- </u-col>-->
<u-col span="4"> <!-- <u-col span="4">-->
<u-form-item label="物料条码" label-width="150"> <!-- <u-form-item label="物料条码" label-width="150">-->
<SearchInput v-model="materialRecordInfo.materialBatchNumber" placeholder="请输入物料条码" <!-- <SearchInput v-model="materialRecordInfo.materialBatchNumber" placeholder="请输入物料条码"-->
hassearchbtn="true" <!-- hassearchbtn="true"-->
@inputchange="(val)=>{materialRecordInfo.materialBatchNumber=val}"/> <!-- @inputchange="(val)=>{materialRecordInfo.materialBatchNumber=val}"/>-->
</u-form-item> <!-- </u-form-item>-->
</u-col> <!-- </u-col>-->
<u-col span="2"> <!-- <u-col span="2">-->
<u-form-item label="数量"> <!-- <u-form-item label="数量">-->
<u-number-box :min="0" v-model="materialRecordInfo.quantity"></u-number-box> <!-- <u-number-box :min="0" v-model="materialRecordInfo.quantity"></u-number-box>-->
</u-form-item> <!-- </u-form-item>-->
</u-col> <!-- </u-col>-->
<u-col span="1"> <!-- <u-col span="1">-->
<u-button type="primary" size="mini" @click="commonClick('MaterialUsageRecord')">添加</u-button> <!-- <u-button type="primary" size="mini" @click="commonClick('MaterialUsageRecord')">添加</u-button>-->
</u-col> <!-- </u-col>-->
<!-- <u-col span="1">--> <!-- <u-col span="1">-->
<!-- <u-button type="primary" @click="commonClick('')">删除</u-button>--> <!-- </u-col>-->
<!-- </u-col>--> <!-- <u-col span="5">-->
<u-col span="1"> <!-- </u-col>-->
<!-- <u-button type="primary" size="mini" @click="commonClick('')">领料批次</u-button>--> <!-- </u-row>-->
</u-col> <!-- </u-form>-->
<u-col span="5"> <zb-table :columns="issusLineColumn" :stripe="true" :fit="true" :border="true"
</u-col> :data="issusLineList"></zb-table>
</u-row> <!-- </view>-->
</u-form>
<zb-table :columns="bomFeeColumn" :stripe="true" :border="true" :data="materialUsageRecordList"></zb-table>
</view>
</view> </view>
</view> </view>
<view class="prod-body-right"> <view class="prod-body-right">
...@@ -105,7 +102,7 @@ ...@@ -105,7 +102,7 @@
<u-row> <u-row>
<u-col span="6"> <u-col span="6">
<u-form-item label="报工总数量" prop="quantity"> <u-form-item label="报工总数量" prop="quantity">
{{ feedback.quantityQuanlify + feedback.quantityUnquanlify }} {{ feedback.quantityQualify + feedback.quantityUnqualify }}
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6">
...@@ -362,7 +359,45 @@ export default { ...@@ -362,7 +359,45 @@ export default {
tableSelectData: [], tableSelectData: [],
feedbackForms: [], feedbackForms: [],
materialUsageRecordList: [], materialUsageRecordList: [],
materialusagerecordLoading: false materialusagerecordLoading: false,
issusLineList: [],
issusLineColumn: [
{
name: 'itemCode',
label: '产品物料编码',
},
{
name: 'itemName',
label: '产品物料名称',
},
{
name: 'specification',
label: '规格型号',
},
{
name: 'unitOfMeasure',
label: '单位',
},
{
name: 'quantityIssued',
label: '领料数量',
},
{
name: 'batchCode',
label: '批次号',
},
{
name: 'warehouseName',
label: '仓库名称',
},
{
name: 'locationName',
label: '库区名称',
},
{
name: 'areaName',
label: '库位名称',
}]
} }
}, },
created() { created() {
...@@ -421,7 +456,9 @@ export default { ...@@ -421,7 +456,9 @@ export default {
this.tableSelectData.forEach((item) => { this.tableSelectData.forEach((item) => {
this.changeStatus(item.taskId, 'FINISHED') this.changeStatus(item.taskId, 'FINISHED')
}) })
this.getTaskList() setTimeout(() => {
this.getTaskList()
}, 666)
break; break;
case 'Prod': case 'Prod':
this.doFeedback() this.doFeedback()
...@@ -442,10 +479,18 @@ export default { ...@@ -442,10 +479,18 @@ export default {
this.knifeTempSearch.locationCode = ''; this.knifeTempSearch.locationCode = '';
this.knifeTempVisible = true this.knifeTempVisible = true
}, },
getIssusLinebyWorkorderCodes() {
this.issusLineList = []
this.$u.api.getIssusLinebyWorkorderCodes({workorderCodes: ['MO202401180001']}).then(res => {
if (res.code === 200) {
this.issusLineList = res.rows;
}
});
},
rowClick(row, index) { rowClick(row, index) {
this.curTaskInfo = row; this.curTaskInfo = row;
this.getMaterialUsageRecordList(); // this.getMaterialUsageRecordList();
this.getIssusLinebyWorkorderCodes();
}, },
toggleAllSelection(checked, arr) { toggleAllSelection(checked, arr) {
this.tableSelectData = arr this.tableSelectData = arr
...@@ -467,15 +512,18 @@ export default { ...@@ -467,15 +512,18 @@ export default {
}, },
getTaskList() { getTaskList() {
this.form = {} this.form = {}
this.tableData = []
this.$u.api.getTaskList({ this.$u.api.getTaskList({
workstationId: this.vuex_workstation.workstationId, workstationId: this.vuex_workstation.workstationId,
}).then(res => { }).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.tableData = res.rows; this.tableData = res.rows;
this.curTaskInfo = {}
this.materialUsageRecordList = []
if (this.tableData.length > 0) { if (this.tableData.length > 0) {
this.curTaskInfo = this.tableData[0] this.curTaskInfo = this.tableData[0]
this.getMaterialUsageRecordList(); // this.getMaterialUsageRecordList();
this.getIssusLinebyWorkorderCodes();
} else { } else {
} }
} }
...@@ -486,6 +534,7 @@ export default { ...@@ -486,6 +534,7 @@ export default {
this.getMaterialUsageRecordList() this.getMaterialUsageRecordList()
}, },
getMaterialUsageRecordList() { getMaterialUsageRecordList() {
this.materialUsageRecordList = []
this.materialusagerecordLoading = true this.materialusagerecordLoading = true
this.$u.api.materialusagerecordList({ this.$u.api.materialusagerecordList({
workstationId: this.vuex_workstation.workstationId, workstationId: this.vuex_workstation.workstationId,
...@@ -520,7 +569,8 @@ export default { ...@@ -520,7 +569,8 @@ export default {
this.materialRecordInfo.quantity = 0; this.materialRecordInfo.quantity = 0;
this.materialRecordInfo.materialBatchNumber = ''; this.materialRecordInfo.materialBatchNumber = '';
this.$u.toast('上报成功'); this.$u.toast('上报成功');
this.getMaterialUsageRecordList() this.getIssusLinebyWorkorderCodes();
// this.getMaterialUsageRecordList()
} }
}); });
}, },
...@@ -600,16 +650,24 @@ export default { ...@@ -600,16 +650,24 @@ export default {
} }
this.$u.api.feedback({ this.$u.api.feedback({
taskId: item.taskId, taskId: item.taskId,
taskCode: item.taskCode,
quantityFeedback: item.quantity, quantityFeedback: item.quantity,
quantityQualified: item.quantityQualify, quantityQualified: item.quantityQualify,
quantityUnquanlified: item.quantityUnqualify, quantityUnquanlified: item.quantityUnqualify,
userName: this.vuex_user.userName, userName: this.vuex_user.userName,
feedbackType: item.feedbackType, feedbackType: item.feedbackType,
routeId: item.routeId, routeId: item.routeId,
routeCode: item.routeCode,
processId: item.processId, processId: item.processId,
processCode: item.processCode,
processName: item.processName,
itemId: item.itemId, itemId: item.itemId,
itemCode: item.itemCode, itemCode: item.itemCode,
itemName: item.itemName itemName: item.itemName,
workstationId: item.workstationId,
workstationCode: item.workstationCode,
workstationName: item.workstationName,
startTime: item.startTime
}).then(res => { }).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$u.toast('上报成功'); this.$u.toast('上报成功');
......
pages/mes/qc/index.vue
View file @ 93fdb87b
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
<view class="list-bar"> <view class="list-bar">
<scroll-view scroll-y="true" class="scroll-list" :style="{ 'height': (this.screenHeight -280) + 'px' }"> <scroll-view scroll-y="true" class="scroll-list" :style="{ 'height': (this.screenHeight -280) + 'px' }">
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据"> <uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
<!-- <zb-table :columns="tableColumn" :stripe="true" @rowClick="rowClick"-->
<!-- @toggleRowSelection="toggleRowSelection" @toggleAllSelection="toggleAllSelection" :border="true"-->
<!-- :data="tableData"></zb-table>-->
<uni-tr> <uni-tr>
<uni-th width="160px" align="center">检验单编号</uni-th> <uni-th width="160px" align="center">检验单编号</uni-th>
<uni-th width="160px" align="center">检验单名称</uni-th> <uni-th width="160px" align="center">检验单名称</uni-th>
...@@ -73,16 +77,16 @@ ...@@ -73,16 +77,16 @@
<u-modal width="1800rpx" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true" <u-modal width="1800rpx" v-model="qcModalFlag" :showConfirmButton=true :showCancelButton="true"
title="请填写检验单" title="请填写检验单"
content="操作内容"> content="操作内容">
<u-form ref="qcForm" label-width="70px" :model="qcForm" :rules="qcRules"> <u-form ref="qcForm" label-width="70px">
<u-row> <u-row>
<u-col span="5"> <u-col span="5">
<u-form-item label="任务编号" prop="taskCode"> <u-form-item label="任务编号">
<SearchInput v-model="qcForm.taskCode" placeholder="请输入任务编号" hassearchbtn="true" <SearchInput v-model="qcForm.taskCode" placeholder="请输入任务编号" hassearchbtn="true"
@serach="searchTask"/> @serach="searchTask"/>
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="3"> <u-col span="3">
<u-form-item label="检验单名称" label-width="90px" prop="ipqcName"> <u-form-item label="检验单名称" label-width="90px">
<u-input v-model="qcForm.ipqcName" placeholder="请输入检验单名称"></u-input> <u-input v-model="qcForm.ipqcName" placeholder="请输入检验单名称"></u-input>
</u-form-item> </u-form-item>
</u-col> </u-col>
...@@ -122,7 +126,16 @@ ...@@ -122,7 +126,16 @@
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row> </u-row>
<u-button type="primary" @click="submitIpqc" class="submit-qc">提交</u-button> <u-row>
<u-col span="3"></u-col>
<u-col span="3">
<u-button type="primary" @click="submitIpqc">保存</u-button>
</u-col>
<u-col span="1"></u-col>
<u-col span="3">
<u-button type="success" @click="submitIpqc('CONFIRMED')">完成</u-button>
</u-col>
</u-row>
</u-form> </u-form>
<scroll-view scroll-y="true" scroll-x="true" class="line-list"> <scroll-view scroll-y="true" scroll-x="true" class="line-list">
<view class="line-content"> <view class="line-content">
...@@ -316,7 +329,8 @@ export default { ...@@ -316,7 +329,8 @@ export default {
this.taskInfo = res.data; this.taskInfo = res.data;
} }
}, },
async submitIpqc() {
async submitIpqc(status = 'PREPARE') {
if (!this.taskInfo) { if (!this.taskInfo) {
this.$u.toast('请输入任务单号！'); this.$u.toast('请输入任务单号！');
return return
...@@ -381,6 +395,7 @@ export default { ...@@ -381,6 +395,7 @@ export default {
}); });
}, },
addQC(type) { addQC(type) {
this.qcForm = {}
this.curQcType = type; this.curQcType = type;
if (type === 'QCMSG') { if (type === 'QCMSG') {
this.qcMsgVisible = true this.qcMsgVisible = true
...@@ -392,6 +407,7 @@ export default { ...@@ -392,6 +407,7 @@ export default {
qcLineClick(item) { qcLineClick(item) {
this.qcModalFlag = true; this.qcModalFlag = true;
this.qcForm = item this.qcForm = item
console.log(this.qcForm)
this.getTemplateLineList() this.getTemplateLineList()
}, },
qcLineItemClick(item) { qcLineItemClick(item) {
......
pages/sys/login/login.vue
View file @ 93fdb87b
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
</button> </button>
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
</template> </template>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
loading: false, loading: false,
loginForm: { loginForm: {
username: "admin", username: "admin",
password: "admin123", password: "000000",
rememberMe: false, rememberMe: false,
validCode:'', validCode:'',
uuid: "" uuid: ""
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
{ required: true, trigger: "blur", errorMessage: "请输入您的账号" } { required: true, trigger: "blur", errorMessage: "请输入您的账号" }
], ],
}, },
password: { password: {
rules: [ rules: [
{ required: true, trigger: "blur", errorMessage: "请输入您的密码" } { required: true, trigger: "blur", errorMessage: "请输入您的密码" }
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
} }
}); });
} }
}); });
} }
} }
} }
</script> </script>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
page { page {
background-image: url("@/static/images/login-background.jpg"); background-image: url("@/static/images/login-background.jpg");
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; height: 100%; width: 100%; height: 100%;
} }
.login { .login {
......
uni_modules/uv-sticky/components/uv-sticky/uv-sticky.vue
View file @ 93fdb87b
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<script> <script>
import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js' import mpMixin from '@/uni_modules/uv-ui-tools/libs/mixin/mpMixin.js'
import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js' import mixin from '@/uni_modules/uv-ui-tools/libs/mixin/mixin.js'
import props from './props.js';; import props from './props.js';
/** /**
* sticky 吸顶 * sticky 吸顶
* @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。 * @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。
......
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