suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
jinna 1 month ago
parent 9d0ffccade 05b62a35cf
commit ac86a97d91
7 changed files with 78 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/views/inboundOutboundManagement/components/addEditDialog.vue
  2. 5
      src/views/logisticsManagement/siteBasic.vue
  3. 1
      src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
  4. 8
      src/views/qualityManagement/tankSolutionSystem/info.vue
  5. 8
      src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
  6. 34
      src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
  7. 51
      src/views/warehouseManagement/workwearPlan/index.vue

7
src/views/inboundOutboundManagement/components/addEditDialog.vue
Unescape View File

@ -284,7 +284,7 @@ export default {
{ warehousingReason: 4, value: '领用入库' }, { warehousingReason: 4, value: '领用入库' },
// { warehousingReason: 5, value: '料头入库' }, // { warehousingReason: 5, value: '料头入库' },
{ warehousingReason: 6, value: '物料入库' }, { warehousingReason: 6, value: '物料入库' },
{ warehousingReason: 7, value: '生产入库' }, { warehousingReason: 7, value: '玻璃饼入库' },
], ],
keeperList: [], keeperList: [],
wareList: [], wareList: [],
@ -409,6 +409,11 @@ export default {
goodsCode:this.tableData[index].goodsCode, goodsCode:this.tableData[index].goodsCode,
}).then(res => { }).then(res => {
console.log('res--------', res); console.log('res--------', res);
this.tableData[index].printMark = res.data.data.printMark;
this.tableData[index].powderWeight = res.data.data.powderWeight;
this.tableData[index].materialNo = res.data.data.materialNo;
this.tableData[index].thickness = res.data.data.thickness;
// this.tableData[index].glassPieList = res.data.data;
}); });
}, },
submit() { submit() {

5
src/views/logisticsManagement/siteBasic.vue
Unescape View File

@ -23,10 +23,11 @@
</template> </template>
<template #menu-right> </template> <template #menu-right> </template>
<template #menu="scope"> <template #menu="scope">
<el-button v-if="permission.site_inIdle&&s(cope.row.stationStatus == '0'||scope.row.stationStatus == '2')" type="text" @click="handleEdit(scope.row)"
<el-button v-if="permission.site_inIdle&&(scope.row.stationStatus == 0||scope.row.stationStatus == 2)" type="text" @click="handleEdit(scope.row)"
>占用</el-button >占用</el-button
> >
<el-button v-if="permission.site_occupation&&(scope.row.stationStatus == '1')" type="text" @click="handleEdit(scope.row)" <el-button v-if="permission.site_occupation&&(scope.row.stationStatus == 1)" type="text" @click="handleEdit(scope.row)"
>闲置</el-button >闲置</el-button
> >
</template> </template>

1
src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
Unescape View File

@ -394,6 +394,7 @@ export default {
drugMaterialId:res.data.data.drugMaterialId + '', drugMaterialId:res.data.data.drugMaterialId + '',
workCenterId:res.data.data.workCenterId + '', workCenterId:res.data.data.workCenterId + '',
testUserId:res.data.data.testUserId + '', testUserId:res.data.data.testUserId + '',
processUserId:res.data.data.processUserId + '',
} }
if(this.form.jobType == 1){ if(this.form.jobType == 1){
this.form = { this.form = {

8
src/views/qualityManagement/tankSolutionSystem/info.vue
Unescape View File

@ -111,7 +111,9 @@ export default {
'1', '2', '3', '4', '5', '6', '1', '2', '3', '4', '5', '6',
'7', '8', '9', '10', '11', '12', , '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31' '7', '8', '9', '10', '11', '12', , '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31'
], ],
query:{}, query:{
descs:'UPDATE_TIME'
},
isShowImport:false, isShowImport:false,
excelBox: false, excelBox: false,
loading: false, loading: false,
@ -795,7 +797,9 @@ export default {
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {
descs:"UPDATE_TIME"
};
this.onLoad(this.page); this.onLoad(this.page);
}, },
searchChange(params, done) { searchChange(params, done) {

8
src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
Unescape View File

@ -122,7 +122,9 @@ export default {
formRules: { formRules: {
userId: [{ required: true, message: '请选择检测员', trigger: 'blur' }], userId: [{ required: true, message: '请选择检测员', trigger: 'blur' }],
}, },
query: {}, query: {
descs:"CREATE_TIME"
},
loading: true, loading: true,
issueForm: {}, issueForm: {},
option: { option: {
@ -660,7 +662,9 @@ export default {
this.issueDialog = true this.issueDialog = true
}, },
searchReset() { searchReset() {
this.query = {}; this.query = {
descs:"CREATE_TIME"
};
this.onLoad(this.page); this.onLoad(this.page);
}, },
searchChange(params, done) { searchChange(params, done) {

34
src/views/qualityManagement/tankSolutionSystem/workTankLine.vue
Unescape View File

@ -17,7 +17,7 @@
</template> </template>
</avue-crud> </avue-crud>
<el-dialog title="生成曲线" append-to-body v-model="lineBox" fullscreen width="70%"> <el-dialog title="生成曲线" append-to-body v-model="lineBox" fullscreen width="70%">
<el-form :inline="true" v-model="lineForm" label-width="80px"> <el-form :inline="true" ref="lineForm" :model="lineForm" :rules="lineRules" label-width="80px">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="作业中心" prop="wcId"> <el-form-item label="作业中心" prop="wcId">
@ -108,6 +108,10 @@ export default {
form: {}, form: {},
query: {}, query: {},
lineForm: {}, lineForm: {},
lineRules:{
wcId:[{ required: true, message: '请选择作业中心', trigger: 'blur' }],
timeRange:[{ required: true, message: '请选择时间范围', trigger: 'blur' }],
},
nameForm: {}, nameForm: {},
detailBox: false, detailBox: false,
detailForm: {}, detailForm: {},
@ -262,17 +266,21 @@ export default {
this.lineBox = true this.lineBox = true
}, },
createLine(){ createLine(){
createLineList({ this.$refs.lineForm.validate(valid => {
workCenterId:this.lineForm.wcId, if (valid) {
createTimeStart:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[0] , createLineList({
createTimeEnd:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[1] , workCenterId:this.lineForm.wcId,
}).then(res =>{ createTimeStart:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[0] ,
console.log('res--------------',res) createTimeEnd:this.lineForm.timeRange && this.lineForm.timeRange.length != 0 && this.lineForm.timeRange[1] ,
this.isShowBox = true }).then(res =>{
this.lineData = res.data.data.waveData console.log('res--------------',res)
this.$nextTick(() =>{ this.isShowBox = true
this.createChart() this.lineData = res.data.data.waveData
}) this.$nextTick(() =>{
this.createChart()
})
})
}
}) })
}, },
@ -443,7 +451,7 @@ export default {
const option = { const option = {
title: { title: {
text: item.workTankName + item.testElement, text: item.workTankName ? item.workTankName + item.testElement : item.testElement,
left: "center", left: "center",
}, },
legend: { legend: {

51
src/views/warehouseManagement/workwearPlan/index.vue
Unescape View File

@ -64,21 +64,21 @@
></el-option> ></el-option>
</el-select> --> </el-select> -->
<jhSelect <jhSelect
v-model="scope.row.moCode" v-model="scope.row.moCode"
placeholder="请搜索选择" placeholder="请搜索选择"
api-url="/blade-wms/stGoods/list" api-url="/blade-wms/stGoods/list"
echo-api="/blade-wms/stGoods/list" echo-api="/blade-wms/stGoods/list"
echoParamsKey="goodsCode" echoParamsKey="goodsCode"
echo-method="get" echo-method="get"
api-method="get" api-method="get"
list-key="records" list-key="records"
total-key="total" total-key="total"
label-key="goodsCode" label-key="goodsCode"
value-key="id" value-key="goodsCode"
search-key="goodsCode" search-key="goodsCode"
:debounce-time="100" :debounce-time="100"
@change="(val, item) => changeMoData(val, item, scope.row, scope.$index)" @change="(val, item) => changeMoData(val, item, scope.row, scope.$index)"
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="工装名称" prop="moName"></el-table-column> <el-table-column align="center" label="工装名称" prop="moName"></el-table-column>
@ -418,7 +418,7 @@ export default {
{ {
label: '保管员', label: '保管员',
prop: 'keeper', prop: 'keeperName',
search: false, search: false,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
@ -469,6 +469,25 @@ export default {
overHidden: true, overHidden: true,
width: 200, width: 200,
searchOrder: 20, searchOrder: 20,
type: 'select',
dicData: [
{
label: '新建',
value: 1,
},
{
label: '已申请',
value: 2,
},
{
label: '已完成',
value: 3,
},
{
label: 'erp已删除',
value: 4,
},
],
rules: [ rules: [
{ {
required: true, required: true,

Write Preview
Loading…
Cancel
Save