wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
qiezi 12 months ago
parent
bad1e31e6c 4720d23b26
commit
b81a861729
10 changed files with 79 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/assets/scss/rq.scss
  2. 14
      src/views/modules/Abnormal/AbnormalFeedBack.vue
  3. 1
      src/views/modules/oss/oss.vue
  4. 6
      src/views/modules/print/print_liuhua_card.js
  5. 22
      src/views/modules/production/dailyPlan.vue
  6. 19
      src/views/modules/production/productionBlankingSearch.vue
  7. 11
      src/views/modules/production/scheduleForSOTask.vue
  8. 10
      src/views/modules/production/scheduleForShopOrder.vue
  9. 11
      src/views/modules/production/scheduleForVPShopOrder.vue
  10. 2
      src/views/modules/sys/user.vue

3
src/assets/scss/rq.scss
View File

@ -62,3 +62,6 @@
.redModel .el-form-item__label {
font-weight:bold;color:#bd0b06
}
.el-table .yellow-row {
background: #e7e756;
}

14
src/views/modules/Abnormal/AbnormalFeedBack.vue
View File

@ -36,6 +36,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'异常原因：'">
<el-input v-model="searchData.abnormalDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item label="状态：" >
<el-select v-model="searchData.status" style="width: 120px">
<el-option label="全部" value=""></el-option>
@ -181,7 +184,7 @@
width="340"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" v-if="searchData.userId==='admin'||searchData.userId==='E0002'" @click="updateModel(scope.row)">修改</a>
<a type="text" size="small" v-if="(searchData.userId==='admin'||searchData.userId==='E0002')&&scope.row.status!='已完结'" @click="updateModel(scope.row)">修改</a>
<a type="text" size="small" @click="getFileModel(scope.row)">整改文件</a>
<a type="text" size="small" @click="getDetailModel(scope.row)">查看</a>
<a type="text" size="small" @click="doPrint(scope.row)">打印</a>
@ -428,7 +431,7 @@
</el-dialog>
<el-dialog title="整改文件" :close-on-click-modal="false" v-drag :visible.sync="fileModalFlag" width="650px" >
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-form :inline="true" label-position="top" style="margin-top: 0px" v-if="fileSearchData.status!=='已完结'">
<el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
</el-form>
</el-form>
@ -463,7 +466,7 @@
<template slot-scope="scope">
<!-- <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>-->
<a @click="downloadFile(scope.row)" >下载</a>
<a type="text" size="small" @click="deleteHandle(scope.row.id)">删除</a>
<a type="text" size="small" v-if="fileSearchData.status!=='已完结'" @click="deleteHandle(scope.row.id)">删除</a>
</template>
</el-table-column>
</el-table>
@ -521,6 +524,7 @@
startDate:'',
endDate:'',
abnormalCode:'',
abnormalDesc:'',
site:'',
status:'',
operatorDesc:'',
@ -596,7 +600,8 @@
fileSearchData:{
fileTypeCode:'Abnormal',
orderRef1:'',
orderRef2:''
orderRef2:'',
status:'',
},
tableData:[],
addData:{
@ -1039,6 +1044,7 @@
fileTypeCode:'Abnormal',
orderRef1:row.site,
orderRef2:row.id,
status:row.status,
}
this.getFileList()
this.fileModalFlag=true;

1
src/views/modules/oss/oss.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="mod-oss">
<el-form :inline="true" :model="dataForm">
<el-form-item>
<el-button type="primary" @click="configHandle()">云存储配置</el-button>

6
src/views/modules/print/print_liuhua_card.js
View File

@ -87,7 +87,7 @@ export function printCardLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(64,379,80,25,"产品颜色:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(64,539,90,25,"外购件批号:");
LODOP.ADD_PRINT_TEXT(64,539,90,25,"催化剂类型:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(86,4,85,25,"原材料型号:");
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
@ -235,8 +235,8 @@ export function printCardLabel(printList) {
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(63,462,85,20,printData.cpys);//产品颜色
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
// LODOP.ADD_PRINT_TEXT(63,615,105,25,"外购件批号");//外购件批号
// LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(63,615,105,25,printData.chjlt);//催化剂类型
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(86,82,120,20,printData.yclxh);//原材料型号
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.ADD_PRINT_TEXT(87,283,105,25,printData.hljyd);//混炼胶硬度

22
src/views/modules/production/dailyPlan.vue
View File

@ -102,6 +102,7 @@
<el-table
:height="height"
:data="tableData"
:row-class-name="tableRowClassName"
border
style="width: 100%">
<el-table-column
@ -118,14 +119,14 @@
prop="site"
header-align="center"
align="left"
min-width="60"
min-width="40"
label="工厂编码">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
min-width="60"
min-width="70"
label="订单号">
</el-table-column>
<el-table-column
@ -146,7 +147,7 @@
prop="partDescription"
header-align="center"
align="left"
min-width="200"
min-width="140"
label="物料名称">
</el-table-column>
<el-table-column
@ -177,6 +178,13 @@
min-width="40"
label="订单数量">
</el-table-column>
<el-table-column
prop="weightFactor"
header-align="center"
align="right"
min-width="40"
label="产品净重">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
@ -860,6 +868,14 @@
this.scheduledingsData.qty=''
}
},
tableRowClassName ({row, rowIndex}) {
if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
return 'yellow-row'
}
return ''
},
},
created () {

19
src/views/modules/production/productionBlankingSearch.vue
View File

@ -319,13 +319,16 @@
this.dataListSelections = val
},
tableRowClassName ({row, rowIndex}) {
if (row.finishedFlag == '2') {
return 'success-row'
}
if (row.finishedFlag == '3') {
return 'false-row'
}
if (row.finishedFlag == '4') {
// if (row.finishedFlag == '2') {
// return 'success-row'
// }
// if (row.finishedFlag == '3') {
// return 'false-row'
// }
// if (row.finishedFlag == '4') {
// return 'yellow-row'
// }
if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
return 'yellow-row'
}
return ''
@ -458,6 +461,8 @@
}).catch(() => {
})
},
}
}
</script>

11
src/views/modules/production/scheduleForSOTask.vue
View File

@ -285,6 +285,13 @@
min-width="80"
label="订单数量">
</el-table-column>
<el-table-column
prop="weightFactor"
header-align="center"
align="right"
min-width="80"
label="产品净重">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
@ -989,7 +996,9 @@
}
},
tableRowClassName ({row, rowIndex}) {
if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
return 'yellow-row'
}
if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
return 'success-row'
}

10
src/views/modules/production/scheduleForShopOrder.vue
View File

@ -251,6 +251,13 @@
width="80"
label="订单数量">
</el-table-column>
<el-table-column
prop="weightFactor"
header-align="center"
align="right"
min-width="80"
label="产品净重">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
@ -1017,6 +1024,9 @@
},
tableRowClassName ({row, rowIndex}) {
if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
return 'yellow-row'
}
if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
return 'success-row'
}

11
src/views/modules/production/scheduleForVPShopOrder.vue
View File

@ -162,6 +162,13 @@
min-width="100"
label="组合件需求数量">
</el-table-column>
<el-table-column
prop="weightFactor"
header-align="center"
align="right"
min-width="80"
label="组合件净重">
</el-table-column>
<el-table-column
prop="weight"
header-align="center"
@ -813,7 +820,9 @@
},
tableRowClassName ({row, rowIndex}) {
if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
return 'yellow-row'
}
if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
return 'success-row'
}

2
src/views/modules/sys/user.vue
View File

@ -64,8 +64,8 @@
width="150"
label="操作">
<template slot-scope="scope">
<a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
<span v-if="scope.row.userId !==1">
<a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
<!-- <a v-if="isAuth('sys:user:update')&&scope.row.status==1 " type="text" size="small" @click="updateHandle(scope.row.userId,0)">禁用</a>-->
<!-- <a v-if="isAuth('sys:user:update')&&scope.row.status==0 " type="text" size="small" @click="updateHandle(scope.row.userId,1)">启用</a>-->
<a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</a>

Write Preview
Loading…
Cancel
Save