suojin
/
smartpark_durable_front
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冲突处理

Browse Source
master
wangmeng 4 months ago
parent c9a11dd5ac
commit 0fded34840
2 changed files with 0 additions and 108 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. 70
      src/views/firstOrder/inbound.vue
  2. 38
      src/views/firstOrder/outbound.vue

70
src/views/firstOrder/inbound.vue
Unescape View File

@ -134,7 +134,6 @@ export default {
{ {
label: "采购单名称", label: "采购单名称",
prop: "purchaseEndInfo", prop: "purchaseEndInfo",
<<<<<<< HEAD
width: 150, width: 150,
align: "center", align: "center",
formatter: (row, column) => { formatter: (row, column) => {
@ -144,23 +143,12 @@ export default {
} }
return value; // 有值时显示原内容 return value; // 有值时显示原内容
} }
=======
width: 180,
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "入库单号", label: "入库单号",
prop: "orderNo", prop: "orderNo",
<<<<<<< HEAD
width: 160, width: 160,
align: "center" align: "center"
=======
width: 110,
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "入库日期", label: "入库日期",
@ -170,18 +158,10 @@ export default {
searchRange: true, searchRange: true,
startPlaceholder: "开始时间", startPlaceholder: "开始时间",
endPlaceholder: "结束时间", endPlaceholder: "结束时间",
<<<<<<< HEAD
format: 'yyyy-MM-dd HH:mm:ss', format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss',
width: 160, width: 160,
align: "center" align: "center"
=======
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
width: 140,
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
// searchParam: 'startTime', // searchParam: 'startTime',
// searchEndParam: 'endTime' // searchEndParam: 'endTime'
}, },
@ -189,42 +169,25 @@ export default {
label: "入库人", label: "入库人",
prop: "inOperatorName", prop: "inOperatorName",
search: true, search: true,
<<<<<<< HEAD
searchParam: 'inOperator', searchParam: 'inOperator',
align: "center" align: "center"
=======
searchParam: "inOperator",
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "来源", label: "来源",
prop: "source", prop: "source",
search: false, search: false,
<<<<<<< HEAD
align: "center" align: "center"
=======
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "事由", label: "事由",
prop: "reason", prop: "reason",
search: false, search: false,
<<<<<<< HEAD
align: "center" align: "center"
=======
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "物资类型", label: "物资类型",
prop: "materialType", prop: "materialType",
search: false, search: false,
<<<<<<< HEAD
type: 'select', type: 'select',
align: "center", align: "center",
dicData: [{ dicData: [{
@ -235,41 +198,16 @@ export default {
label: '其他物资', label: '其他物资',
value: '2' value: '2'
}] }]
=======
type: "select",
headerAlign: "center",
align: "center",
dicData: [
{
label: "办公物资",
value: "1",
},
{
label: "其他物资",
value: "2",
},
],
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "审批人员", label: "审批人员",
prop: "approvers", prop: "approvers",
<<<<<<< HEAD
align: "center" align: "center"
=======
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "状态", label: "状态",
prop: "status", prop: "status",
<<<<<<< HEAD
type: 'select', type: 'select',
=======
type: "select",
headerAlign: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
align: "center", align: "center",
dicData: [ dicData: [
{ {
@ -310,19 +248,11 @@ export default {
}, },
// 详情 // 详情
handleDetails(row) { handleDetails(row) {
<<<<<<< HEAD
this.inDialogVisible = true this.inDialogVisible = true
this.inDialogType = 'details' this.inDialogType = 'details'
this.inDialogTiltle = '详情' this.inDialogTiltle = '详情'
this.id = row.id this.id = row.id
console.log(this.id, 'id') console.log(this.id, 'id')
=======
this.inDialogVisible = true;
this.inDialogType = "details";
this.inDialogTiltle = "详情";
this.id = row.id;
console.log(this.id, "id");
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {

38
src/views/firstOrder/outbound.vue
Unescape View File

@ -86,26 +86,14 @@ export default {
{ {
label: "需求单名称", label: "需求单名称",
prop: "demandEndInfo", prop: "demandEndInfo",
<<<<<<< HEAD
width: 150, width: 150,
align: "center" align: "center"
=======
width: 180,
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "出库单号", label: "出库单号",
prop: "orderNo", prop: "orderNo",
<<<<<<< HEAD
width: 160, width: 160,
align: "center" align: "center"
=======
width: 110,
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "出库日期", label: "出库日期",
@ -117,14 +105,8 @@ export default {
endPlaceholder: "结束时间", endPlaceholder: "结束时间",
format: 'yyyy-MM-dd HH:mm:ss', format: 'yyyy-MM-dd HH:mm:ss',
valueFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss',
<<<<<<< HEAD
width: 160, width: 160,
align: "center" align: "center"
=======
width: 140,
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
// searchParam: 'startTime', // searchParam: 'startTime',
// searchEndParam: 'endTime' // searchEndParam: 'endTime'
}, },
@ -132,22 +114,13 @@ export default {
label: "事由", label: "事由",
prop: "reason", prop: "reason",
search: false, search: false,
<<<<<<< HEAD
align: "center" align: "center"
=======
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "物资类型", label: "物资类型",
prop: "materialType", prop: "materialType",
search: false, search: false,
type: 'select', type: 'select',
<<<<<<< HEAD
=======
headerAlign: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
align: "center", align: "center",
dicData: [{ dicData: [{
label: '办公物资', label: '办公物资',
@ -161,25 +134,14 @@ export default {
{ {
label: "部门", label: "部门",
prop: "department", prop: "department",
<<<<<<< HEAD
align: "center" align: "center"
=======
headerAlign: "center",
align: "center",
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
{ {
label: "出库人", label: "出库人",
prop: "shipperName", prop: "shipperName",
search: true, search: true,
<<<<<<< HEAD
searchParam: 'inOperator', searchParam: 'inOperator',
align: "center" align: "center"
=======
headerAlign: "center",
align: "center",
searchParam: 'inOperator'
>>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
}, },
// { // {

Write Preview
Loading…
Cancel
Save