冲突处理

src/views/firstOrder/inbound.vue

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

src/views/firstOrder/outbound.vue

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