Skip to content

M
mes-pad
Commit e06cf83d authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

parents d65a0b96 72eea060
Show whitespace changes
Inline Side-by-side
Showing with 126 additions and 96 deletions
common/http.api.js
View file @ e06cf83d
...@@ -33,6 +33,11 @@ const install = (Vue, vm) => { ...@@ -33,6 +33,11 @@ const install = (Vue, vm) => {
vm.$u.get( vm.$u.get(
config.adminPath + '/md/appconfig/getVersion' config.adminPath + '/md/appconfig/getVersion'
), ),
quantitywaitsum: (params = {}) =>
vm.$u.postJson(
config.adminPath + '/mes/pro/workorder/quantitywaitsum',
params
),
/** /**
* 系统设置API * 系统设置API
*/ */
...@@ -100,11 +105,6 @@ const install = (Vue, vm) => { ...@@ -100,11 +105,6 @@ const install = (Vue, vm) => {
config.adminPath + '/pro/packagePrintRecord/rePackageInfoPrint', config.adminPath + '/pro/packagePrintRecord/rePackageInfoPrint',
params params
), ),
quantitywaitsum: (params = {}) =>
vm.$u.postJson(
config.adminPath + '/mes/pro/workorder/quantitywaitsum',
params
),
// 生产指令列表 // 生产指令列表
workOrderSoDirectiveApi: (params = {}) => workOrderSoDirectiveApi: (params = {}) =>
vm.$u.postJson( vm.$u.postJson(
...@@ -286,6 +286,14 @@ const install = (Vue, vm) => { ...@@ -286,6 +286,14 @@ const install = (Vue, vm) => {
params params
), ),
//补料申请记录
getMaterialRequest: (params = {}) =>
vm.$u.get(
config.adminPath + '/pro/materialRequest/recordList',
params
),
//退料申请 //退料申请
listMaterialReturn: (params = {}) => listMaterialReturn: (params = {}) =>
vm.$u.post( vm.$u.post(
...@@ -311,7 +319,7 @@ const install = (Vue, vm) => { ...@@ -311,7 +319,7 @@ const install = (Vue, vm) => {
'/system/autocode/get/' + ruleCode '/system/autocode/get/' + ruleCode
), ),
//获取最后一道工序 //获取最下一道工序
getNextProcess: (params = {}) => getNextProcess: (params = {}) =>
vm.$u.get(config.adminPath + '/mobile/pro/protask/feedBackNextProcess', params), vm.$u.get(config.adminPath + '/mobile/pro/protask/feedBackNextProcess', params),
......
manifest.json
View file @ e06cf83d
{ {
"name" : "mes-pad", "name" : "mes-pad",
"appid" : "__UNI__EFAA56F", "appid" : "__UNI__EFA4D96",
"description" : "MES-PAD", "description" : "MES-PAD",
"versionName" : "1.0.4", "versionName" : "1.0.4",
"versionCode" : "100", "versionCode" : "100",
......
pages/mes/prodReport/index.vue
View file @ e06cf83d
...@@ -416,8 +416,8 @@ ...@@ -416,8 +416,8 @@
v-model="feedback.feedbackTime" /> v-model="feedback.feedbackTime" />
</u-form-item> </u-form-item>
</u-col> </u-col>
<u-col span="6"> <u-col span="6" v-if="feedback.taskType&&feedback.taskType===3">
<u-form-item label="是否关单:" prop="closeType" v-if="feedback.taskType&&feedback.taskType===3"> <u-form-item label="是否关单:" prop="closeType" >
<view class="uni-list-item__extra"> <view class="uni-list-item__extra">
<u-radio-group v-model="feedback.closeType"> <u-radio-group v-model="feedback.closeType">
<u-radio :name="1">是</u-radio> <u-radio :name="1">是</u-radio>
...@@ -425,7 +425,15 @@ ...@@ -425,7 +425,15 @@
</u-radio-group> </u-radio-group>
</view> </view>
</u-form-item> </u-form-item>
<u-form-item label="打印:" prop="whether" v-else> </u-col>
<u-col :span="6" v-if="!feedback.taskType || feedback.taskType!==3">
<u-form-item label="报工人:" prop="nickName">
<u-input v-model="feedback.nickName"></u-input>
<u-button @tap="getCode(feedback)" type="success" size="mini">报工人员</u-button>
</u-form-item>
</u-col>
<u-col span="6" v-if="!feedback.taskType || feedback.taskType!==3">
<u-form-item label="打印:" prop="whether">
<view class="uni-list-item__extra"> <view class="uni-list-item__extra">
<u-radio-group v-model="feedback.whether"> <u-radio-group v-model="feedback.whether">
<u-radio :name="1">是</u-radio> <u-radio :name="1">是</u-radio>
...@@ -434,15 +442,7 @@ ...@@ -434,15 +442,7 @@
</view> </view>
</u-form-item> </u-form-item>
</u-col> </u-col>
</u-row>
<u-row v-if="!feedback.taskType || feedback.taskType!==3">
<u-col :span="6">
<u-form-item label="报工人:" prop="nickName">
<u-input v-model="feedback.nickName"></u-input>
<u-button @tap="getCode(feedback)" type="success" size="mini">报工人员</u-button>
</u-form-item>
</u-col>
</u-row>
<!-- <u-row> --> <!-- <u-row> -->
<!-- <u-col span="3" width: max-content> <!-- <u-col span="3" width: max-content>
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
</view> --> </view> -->
<!-- </u-row> --> </u-row>
</u-form> </u-form>
</view> </view>
</view> </view>
...@@ -679,6 +679,7 @@ ...@@ -679,6 +679,7 @@
</view> </view>
</u-modal> </u-modal>
<u-modal title="补料申请" @confirm="materialRequestSave()" show-cancel-button <u-modal title="补料申请" @confirm="materialRequestSave()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialRequestVisible" width="1300rpx"> v-model="materialRequestVisible" width="1300rpx">
...@@ -704,51 +705,44 @@ ...@@ -704,51 +705,44 @@
</u-col> </u-col>
</u-row> </u-row>
</u-form> </u-form>
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
<uni-table ref="materialRequestTable" border stripe :loading="loading" emptyText="未查询到数据">
<uni-tr> <uni-tr>
<uni-th width="100px" align="center">操作</uni-th> <uni-th width="100px" align="center">操作</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th> <uni-th width="150px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th> <uni-th width="250px" align="center">产品物料名称</uni-th>
<uni-th width="80px" align="center">补取数量</uni-th> <uni-th width="170px" align="center">补取数量</uni-th>
</uni-tr> </uni-tr>
<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight/2 - 150 + 'px' }">
<uni-table ref="materialRequestTable" border stripe :loading="loading" >
<uni-tr v-for="(line, index) in materialRequestArrays" :key="index"> <uni-tr v-for="(line, index) in materialRequestArrays" :key="index">
<uni-td align="center"> <uni-td align="center" style="width: 100px">
<view class="uni-group"> <view class="uni-group">
<button class="uni-button" size="mini" type="primary" <button class="uni-button" size="mini" type="primary"
@click="materialRequestFormShow(line)">补料</button> @click="materialRequestFormShow(line)">补料</button>
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td> <uni-td align="center" style="width: 140px">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td>
<uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td> <uni-td align="center" style="width: 160px">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{ line.applyNum }}</uni-td> <uni-td align="center" style="width: 150px">{{ line.applyNum }}</uni-td>
</uni-tr> </uni-tr>
</uni-table> </uni-table>
</scroll-view>
</view>
</u-modal>
<u-modal title="补料申请数量" @confirm="materialRequestSetting()" show-cancel-button </scroll-view>
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" <uni-tr>
v-model="materialRequestFormVisible" width="700rpx"> <uni-th width="200px" align="center">申请单号</uni-th>
<view class=""> <uni-th width="200px" align="center">产品物料名称</uni-th>
<u-form label-width="100px"> <uni-th width="160px" align="center">申请数量</uni-th>
<u-row> <uni-th width="160px" align="center">状态</uni-th>
<u-col> </uni-tr>
<u-form-item label="产品物料名称"> <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight/2 - 200 + 'px' }" >
{{ materialRequestFormData.itemName }} <uni-table ref="materialRequestTable" border stripe :loading="loading" >
</u-form-item> <uni-tr v-for="(line, index) in materialRequestArrayList" :key="index">
</u-col> <uni-td align="center" style="width: 125px">{{line.applyNo}}</uni-td>
</u-row> <uni-td align="center" style="width: 150px">{{ line.sapItemCode.substring(line.sapItemCode.length - 8, line.sapItemCode.length) }}</uni-td>
<u-row> <uni-td align="center" style="width: 100px">{{ line.applyNum }}</uni-td>
<u-col> <uni-td align="center" style="width: 100px">{{ line.attr1 }}</uni-td>
<u-form-item label="补料数量"> </uni-tr>
<u-number-box v-model="materialRequestFormData.applyNum" :long-press="false" :positive-integer="false" </uni-table>
:input-width="190"></u-number-box> </scroll-view>
</u-form-item>
</u-col>
</u-row>
</u-form>
</view> </view>
</u-modal> </u-modal>
...@@ -1312,7 +1306,6 @@ export default { ...@@ -1312,7 +1306,6 @@ export default {
}, },
viewSopPicture: [], viewSopPicture: [],
viewSop: [], viewSop: [],
reasonList: [],
causeList: [], causeList: [],
reasonList: [], reasonList: [],
workorderList: [], workorderList: [],
...@@ -1368,6 +1361,8 @@ export default { ...@@ -1368,6 +1361,8 @@ export default {
recoilMaterialDetailList: [], recoilMaterialDetailList: [],
materialRequestList: [], materialRequestList: [],
materialRequestArrays: [], materialRequestArrays: [],
materialRequestArrayList: [],
materialRequestArrayLists: [],
materialRequests: [], materialRequests: [],
materialReturnList: [], materialReturnList: [],
materialRequestFormData: { materialRequestFormData: {
...@@ -1879,7 +1874,6 @@ export default { ...@@ -1879,7 +1874,6 @@ export default {
row.packUnitOfMeasure = ''; row.packUnitOfMeasure = '';
row.printContents = row.arrangeCode; row.printContents = row.arrangeCode;
row.tableDirectiveData = []; row.tableDirectiveData = [];
row.tableSizeColumn = [];
row.tableSizeData = []; row.tableSizeData = [];
row.tableOrderData = []; row.tableOrderData = [];
row.packNum = ''; row.packNum = '';
...@@ -2479,6 +2473,11 @@ export default { ...@@ -2479,6 +2473,11 @@ export default {
this.$set(this.feedbackForms[index], 'mergePack', this.copyFeedBackForms[index].mergePack); this.$set(this.feedbackForms[index], 'mergePack', this.copyFeedBackForms[index].mergePack);
console.log(this.feedbackForms[index], '889row'); console.log(this.feedbackForms[index], '889row');
} }
row.tableDirectiveData = [];
row.tableSizeData = []
row.tableOrderData = [];
row.listTabPro = [
];
console.log(88999); console.log(88999);
} }
}); });
...@@ -2708,8 +2707,14 @@ export default { ...@@ -2708,8 +2707,14 @@ export default {
}, },
async newlyAddss() { async newlyAddss() {
const res = await this.$u.api.abnormal.newlyAdd(this.ExceptionForms); const res = await this.$u.api.abnormal.newlyAdd(this.ExceptionForms).then((res)=>{
if(res.code === 200){
this.$u.toast('上报成功'); this.$u.toast('上报成功');
}else{
this.$u.toast(res.msg);
}
});
this.getTaskList(); this.getTaskList();
}, },
cancel() { cancel() {
...@@ -2946,6 +2951,13 @@ export default { ...@@ -2946,6 +2951,13 @@ export default {
this.materialRequestArrays = this.materialRequestList.concat([]); this.materialRequestArrays = this.materialRequestList.concat([]);
} }
}); });
this.$u.api.getMaterialRequest({taskId: taskInfo.taskId}).then((res) =>{
if(res.code === 200){
this.materialRequestArrayLists = res.rows;
this.materialRequestArrayList = this.materialRequestArrayLists.concat([]);
}
});
}, },
materialRequestFormShow(line) { materialRequestFormShow(line) {
this.materialRequestFormVisible = true; this.materialRequestFormVisible = true;
...@@ -3033,6 +3045,7 @@ export default { ...@@ -3033,6 +3045,7 @@ export default {
materialReturnWorkorderProcessItem(id) { materialReturnWorkorderProcessItem(id) {
if (!id) { if (!id) {
this.materialRequestArrays = this.materialRequestList.concat([]); this.materialRequestArrays = this.materialRequestList.concat([]);
this.materialRequestArrayList = this.materialRequestArrayLists.concat([]);
} else { } else {
const items = this.curTaskInfo.workorderOption.find((item) => item.value === this.curTaskInfo.workorderCode); const items = this.curTaskInfo.workorderOption.find((item) => item.value === this.curTaskInfo.workorderCode);
console.log(items); console.log(items);
...@@ -3051,6 +3064,15 @@ export default { ...@@ -3051,6 +3064,15 @@ export default {
console.log(this.materialRequestArrays, 'materialRequestArrays'); console.log(this.materialRequestArrays, 'materialRequestArrays');
} }
}); });
this.materialRequestArrayList =[]
this.$u.api.getMaterialRequest({ workorderId: id, taskId: this.curTaskInfo.taskId }).then((res) =>{
if(res.code === 200){
console.log(res.rows)
this.materialRequestArrayList = res.rows;
}
});
} }
}, },
......
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