代码提交

src/views/firstOrder/outbound.vue

@@ -86,26 +86,16 @@ 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 +107,9 @@ 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 +117,15 @@ 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 +139,19 @@ export default {
           {
             label: "部门",
             prop: "department",
-<<<<<<< HEAD
-            align: "center"
-=======
+            align: "center",
             headerAlign: "center",
             align: "center",
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
           },
           {
             label: "出库人",
             prop: "shipperName",
             search: true,
-<<<<<<< HEAD
             searchParam: 'inOperator',
-            align: "center"
-=======
+            align: "center",
             headerAlign: "center",
             align: "center",
             searchParam: 'inOperator'
->>>>>>> 8b1ca70a0fedc4bfbcc6caa65f87be7eec4bd817
           },
 
           // {