Browse Source

去掉pdf插件 无用 导致打包失误

master
ruanqi 2 years ago
parent
commit
3278ff057e
  1. 3
      src/api/production/schedule.js
  2. 25
      src/assets/scss/global.scss
  3. 71
      src/views/modules/base/defect.vue
  4. 71
      src/views/modules/base/workCenter.vue

3
src/api/production/schedule.js

@ -33,3 +33,6 @@ export const searchDefectHistByReport=data => createAPI(`schedule/searchDefectHi
export const getdefectList=data => createAPI(`schedule/getdefectList`, 'post', data);
export const saveDefectList=data => createAPI(`schedule/saveDefectList`, 'post', data);
export const deleteDefectList=data => createAPI(`schedule/deleteDefectList`, 'post', data);
export const searchWorkCenterDefect=data => createAPI(`schedule/searchWorkCenterDefect`, 'post', data);
export const saveWorkCenterDefect=data => createAPI(`schedule/saveWorkCenterDefect`, 'post', data);

25
src/assets/scss/global.scss

@ -497,3 +497,28 @@ a:hover{
left: 0;
}
//.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
// padding-left: 0px;
//}
.rq .el-table .cell {
line-height: 20px;
font-size: 12px;
height: 20px;
}
.sl-svg {
overflow: hidden;
float: right;
}
.rq-bmPic {
position: relative;
width: 100%;
height: 100px;
float: top;
margin-top: 0%;
margin-left: 0%;
overflow: hidden;
display: flex;
justify-content: center; /* 水平居中 */
}

71
src/views/modules/base/defect.vue

@ -2,13 +2,13 @@
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'不良原因'">
<el-input v-model="searchData.seqNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
<el-input v-model="searchData.defectNo" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'不良代码'">
<el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
<el-input v-model="searchData.defectDesc" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'是否在用'">
<el-select v-model="searchData.reportType" style="width: 130px">
<el-select v-model="searchData.active" style="width: 130px">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="Y"></el-option>
<el-option label="否" value="N"></el-option>
@ -43,6 +43,7 @@
<template slot-scope="scope">
<a type="text" size="small" @click="updateModel(scope.row)">编辑 </a>
<a type="text" size="small" @click="deleteData(scope.row)">删除</a>
<a type="text" size="small" @click="workCenterModel(scope.row)">加工中心</a>
</template>
</el-table-column>
<el-table-column
@ -87,6 +88,27 @@
<el-button type="primary" @click="badModalFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- BU授权 -->
<el-dialog
style="font-size: 12px"
v-drag
:title="'加工中心授权'"
:visible.sync="workCenterVisible"
width="518px"
:append-to-body="true">
<el-transfer class="rq" filterable v-model="selectWorkCenterList" :props="{
key: 'workCenterNo',
label: 'workCenterDesc'
}" :data="workCenterList" :titles="['未授权', '已授权']"></el-transfer>
<span slot="footer" class="dialog-footer">
<div style="margin-top: 5px">
<el-button type="primary" @click="saveWorkCenterDefect()">确定</el-button>
<el-button @click="workCenterVisible = false" type="primary">取消</el-button>
</div>
</span>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -96,6 +118,8 @@
getdefectList,
saveDefectList,
deleteDefectList,
searchWorkCenterDefect,
saveWorkCenterDefect,
} from '@/api/production/schedule.js'
import Chooselist from '@/views/modules/common/Chooselist'
@ -201,6 +225,10 @@
remark:'',
},
badModalFlag:false,
workCenterVisible: false,
workCenterList: [],
selectWorkCenterList: [],
chooseDefectNo:'',
}
},
mounted () {
@ -331,8 +359,43 @@
return Y + M + D + H + MM + S;
},
workCenterModel(row) {
this.chooseDefectNo=row.defectNo
this.workCenterVisible = true
this.searchWorkCenterList()
},
searchWorkCenterList(){
searchWorkCenterDefect({site:this.$store.state.user.site,
defectNo: this.chooseDefectNo,
}).then(({data}) => {
this.selectWorkCenterList = data.selectWorkCenterList
this.workCenterList=data.workCenterList
})
},
saveWorkCenterDefect(){
if(this.selectWorkCenterList.length==0){
this.$message.warning("请选择加工中心")
return false;
}
let inList=[];
for (let i = 0; i < this.selectWorkCenterList.length; i++) {
let inData={
site:this.$store.state.user.site,
workCenterNo:this.selectWorkCenterList[i],
defectNo:this.chooseDefectNo
}
inList.push(inData)
}
saveWorkCenterDefect(inList).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.workCenterVisible = false
} else {
this.$message.error(data.msg)
}
})
},
},
created () {
// this.getTableUserColumn()

71
src/views/modules/base/workCenter.vue

@ -136,6 +136,34 @@
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane :label="labels.defect" name="forth">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-button @click="jumpCalendar()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.defectModel}}</el-button>
</el-form>
<el-table
:height="height"
:data="dataList4"
border
v-loading="dataListLoading"
style="width: 100%;">
<el-table-column
v-for="(item,index) in columnList4" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<el-dialog :title="labels.dataList" :close-on-click-modal="false" v-drag :visible.sync="modelFlag2" width="680px" >
<el-table
@ -436,7 +464,8 @@ export default {
siteIn:'请输入工厂编码!',
createdDateIn:'请选择新增日期!',
workCenterDeleteAsk:'是否删除此加工中心',
defect:'不良原因',
defectModel:'编辑不良原因',
},
buttons:{
search:'查询',
@ -1042,10 +1071,49 @@ export default {
columnWidth: 80
}
],
columnList4:[
{
userId: this.$store.state.user.name,
functionId: 103004,
serialNumber: '103004Table4DefectNo',
tableId: "103004Table4",
tableName: "不良原因表",
columnProp: "defectNo",
headerAlign: "center",
align: "left",
columnLabel: "不良原因编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 103004,
serialNumber: '103004Table4DefectDesc',
tableId: "103004Table4",
tableName: "不良原因表",
columnProp: "defectDesc",
headerAlign: "center",
align: "left",
columnLabel: "不良原因名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 200
},
],
authEdit: false,
authAdd: false,
authDelete: false,
menuId: this.$route.meta.menuId,
dataList4:[],
}
},
mounted() {
@ -1419,6 +1487,7 @@ export default {
getWorkCenterDataDetail(this.modelData).then(({data}) => {
this.dataList2 = data.rows2;
this.dataList = data.rows1;
this.dataList4 = data.rows3;
})
},
getProLineNo(){

Loading…
Cancel
Save