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

计划管理模块缺陷修复

Browse Source
dev-scheduling
jinna 2 months ago
parent 5bcd8f38f9
commit 226d3090b2
14 changed files with 62 additions and 44 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. 4
      src/api/orderManagement/planYieIdOrder.js
  2. 4
      src/views/orderManagement/components/exception/dataMissing.vue
  3. 5
      src/views/orderManagement/components/exception/deliveryDate.vue
  4. 4
      src/views/orderManagement/components/exception/processMissing.vue
  5. 4
      src/views/orderManagement/components/exception/resourceMissing.vue
  6. 1
      src/views/orderManagement/components/orderUpdateDailog.vue
  7. 4
      src/views/orderManagement/planYieIdOrder.vue
  8. 4
      src/views/orderManagement/plannedOrder.vue
  9. 4
      src/views/orderManagement/sinTerPlanOrder.vue
  10. 56
      src/views/orderManagement/sinTerYieIdOrder.vue
  11. 6
      src/views/productionManagement/components/coatingAddDialog.vue
  12. 4
      src/views/productionManagement/components/coatingMater/addRequirements.vue
  13. 2
      src/views/productionManagement/components/coatingMater/assayedContent.vue
  14. 4
      src/views/productionManagement/components/coatingMater/materialRequirements.vue

4
src/api/orderManagement/planYieIdOrder.js
Unescape View File

@ -51,7 +51,7 @@ export const closeBatchs = ids => {
return request({ return request({
url: '/blade-desk/order/yieldOrder/closeBatch', url: '/blade-desk/order/yieldOrder/closeBatch',
method: 'post', method: 'post',
data: ids, params: ids,
}); });
}; };
@ -61,7 +61,7 @@ export const closeBatchs = ids => {
return request({ return request({
url: '/blade-desk/order/yieldOrder/updatePreference', url: '/blade-desk/order/yieldOrder/updatePreference',
method: 'post', method: 'post',
data: row, params: row,
}); });
}; };

4
src/views/orderManagement/components/exception/dataMissing.vue
Unescape View File

@ -122,7 +122,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 100, menuWidth: 80,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -141,7 +141,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

5
src/views/orderManagement/components/exception/deliveryDate.vue
Unescape View File

@ -103,7 +103,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 100, menuWidth: 80,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -116,13 +116,12 @@ export default {
viewBtnIcon: ' ', viewBtnIcon: ' ',
delBtnIcon: ' ', delBtnIcon: ' ',
editBtnIcon: ' ', editBtnIcon: ' ',
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

4
src/views/orderManagement/components/exception/processMissing.vue
Unescape View File

@ -104,7 +104,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 100, menuWidth: 80,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -123,7 +123,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

4
src/views/orderManagement/components/exception/resourceMissing.vue
Unescape View File

@ -113,7 +113,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 150, menuWidth: 140,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -132,7 +132,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

1
src/views/orderManagement/components/orderUpdateDailog.vue
Unescape View File

@ -280,6 +280,7 @@ export default {
update(this.formData).then(res => { update(this.formData).then(res => {
console.log(res); console.log(res);
if(res.data.code===200){ if(res.data.code===200){
this.$message.success('修改成功')
this.openShow = false; this.openShow = false;
this.$emit("closeDialog",true) this.$emit("closeDialog",true)

4
src/views/orderManagement/planYieIdOrder.vue
Unescape View File

@ -171,7 +171,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 160, menuWidth: 140,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -189,7 +189,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

4
src/views/orderManagement/plannedOrder.vue
Unescape View File

@ -172,7 +172,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 120, menuWidth: 100,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -191,7 +191,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

4
src/views/orderManagement/sinTerPlanOrder.vue
Unescape View File

@ -157,7 +157,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 120, menuWidth: 100,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -175,7 +175,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

56
src/views/orderManagement/sinTerYieIdOrder.vue
Unescape View File

@ -214,7 +214,7 @@ export default {
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
// searchLabelWidth: 120, // searchLabelWidth: 120,
menuWidth: 160, menuWidth: 140,
dialogWidth: 900, dialogWidth: 900,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -233,7 +233,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',
@ -415,26 +415,38 @@ export default {
align: 'center', align: 'center',
type: 'select', type: 'select',
dicData: [ dicData: [
{ // YIELD_TYPE_1("热表订单", 12001),
label: '烧结订单', // YIELD_TYPE_2("烧结订单", 12002),
value: 0, // YIELD_TYPE_3("玻璃饼", 12003),
}, // YIELD_TYPE_4("壳体", 12004),
{ // YIELD_TYPE_5("插针", 12005),
label: '玻璃饼订单', // YIELD_TYPE_6("石墨模", 12006),
value: 1, {label: '热表订单', value: 12001},
}, {label: '烧结订单', value: 12002},
{ {label: '玻璃饼', value: 12003},
label: '石墨模订单', {label: '壳体', value: 12004},
value: 2, {label: '插针', value: 12005},
}, {label: '石墨模', value: 12006}
{ // {
label: '插针订单', // label: '烧结订单',
value: 3, // value: 0,
}, // },
{ // {
label: '壳体订单', // label: '玻璃饼订单',
value: 4, // value: 1,
}, // },
// {
// label: '石墨模订单',
// value: 2,
// },
// {
// label: '插针订单',
// value: 3,
// },
// {
// label: '壳体订单',
// value: 4,
// },
], ],
rules: [ rules: [
{ {

6
src/views/productionManagement/components/coatingAddDialog.vue
Unescape View File

@ -133,6 +133,12 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log('11111111111')
this.submitForm = {}
this.searchForm = {
materalType: 1,
}
this.tableData = []
this.getWorkCenterList() this.getWorkCenterList()
}, },
methods: { methods: {

4
src/views/productionManagement/components/coatingMater/addRequirements.vue
Unescape View File

@ -101,7 +101,7 @@ export default {
labelWidth: 120, labelWidth: 120,
searchLabelWidth: 120, searchLabelWidth: 120,
menu: true, menu: true,
menuWidth: 70, menuWidth: 80,
dialogWidth: 600, dialogWidth: 600,
dialogClickModal: false, dialogClickModal: false,
searchEnter: true, searchEnter: true,
@ -113,7 +113,7 @@ export default {
filterBtn: true, filterBtn: true,
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

2
src/views/productionManagement/components/coatingMater/assayedContent.vue
Unescape View File

@ -102,7 +102,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

4
src/views/productionManagement/components/coatingMater/materialRequirements.vue
Unescape View File

@ -35,7 +35,7 @@
<el-button type="text" v-show="row.status == 10000" @click="approveRow(row)">审核</el-button> <el-button type="text" v-show="row.status == 10000" @click="approveRow(row)">审核</el-button>
</template> </template>
</avue-crud> </avue-crud>
<coating-add-dialog :show-dialog="showDialog" @closeDialog="closeDialog"></coating-add-dialog> <coating-add-dialog v-if="showDialog" :show-dialog="showDialog" @closeDialog="closeDialog"></coating-add-dialog>
<material-detail :material-dialog="materialDialog" @closeDialog="closeDialog" :id="id"></material-detail> <material-detail :material-dialog="materialDialog" @closeDialog="closeDialog" :id="id"></material-detail>
<!-- <add-quantity :add-quantity="addQuantity" @closeDialog="closeDialog"></add-quantity> <!-- <add-quantity :add-quantity="addQuantity" @closeDialog="closeDialog"></add-quantity>
<add-dialog :add-dialog="addDialog" @closeDialog="closeDialog"></add-dialog> --> <add-dialog :add-dialog="addDialog" @closeDialog="closeDialog"></add-dialog> -->
@ -129,7 +129,7 @@ export default {
searchLabelPosition: 'left', searchLabelPosition: 'left',
searchGutter: 24, searchGutter: 24,
searchSpan: 6, searchSpan: 6,
menuAlign: 'left', menuAlign: 'center',
gridBtn: false, gridBtn: false,
searchMenuPosition: 'right', searchMenuPosition: 'right',
align: 'center', align: 'center',

Write Preview
Loading…
Cancel
Save