Browse Source

面损表列表调整

huxy 1 week ago
parent
commit
3bf7c439b1

+ 12 - 0
src/views/cost-allocation-total/inancialReconciliation.vue

@@ -116,6 +116,16 @@
               </a-form-item>
             </a-col>
             
+            <a-col :md="6" :sm="8">
+              <a-form-item label="面损表审核人">
+                <a-input placeholder="请输入" v-model="queryParam.msPlanMan"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="8">
+              <a-form-item label="成本表审核人">
+                <a-input placeholder="请输入" v-model="queryParam.cbPlanMan"></a-input>
+              </a-form-item>
+            </a-col>
             </template>
 
             <a-col :md="6" :sm="8">
@@ -236,6 +246,8 @@ export default {
                   return temp1.localeCompare(temp2);
               },
          },
+        { title: '面损表审核人', width: 150, dataIndex: 'msPlanMan', className: 'replacecolor'},
+        { title: '成本表审核人', width: 150, dataIndex: 'cbPlanMan', className: 'replacecolor'},
         //  {
         //   title: '创建时间',
         //   dataIndex: 'createTime',

+ 5 - 5
src/views/shipment-details/shipmentList.vue

@@ -370,7 +370,7 @@ export default {
         {
           title: '存货名称',
           dataIndex: 'inventoryName',
-          width: 220,
+          width: 240,
           className: 'replacecolor',
           customRender: t => ellipsis(t),
           ellipsis: true,
@@ -596,11 +596,11 @@ export default {
           { field: "salesman", key: "d", title: "业务员", align: "center", width: 100,sortBy: "", ellipsis: {showTitle: true,},},
           { field: "distributionPoint", key: "e", title: "分销点", align: "center", width: 110,sortBy: "", ellipsis: {showTitle: true,},},
           { field: "smallPo", key: "f", title: "小po", align: "center", width: 200,sortBy: "", ellipsis: {showTitle: true,},},
-          { field: "inventoryName", key: "g", title: "存货名称", align: "center", width: 220,sortBy: "", ellipsis: {showTitle: true},
+          { field: "inventoryName", key: "g", title: "存货名称", align: "center", width: 240,sortBy: "", ellipsis: {showTitle: true},
             renderBodyCell: ({ row, column, rowIndex }, h) => {
               const text = row[column.field];
-              if (text && text.length>18){
-                return text.substring(0,18)+'...';
+              if (text && text.length>15){
+                return text.substring(0,15)+'...';
               }
               return text;
             },},
@@ -639,7 +639,7 @@ export default {
           { field: "customsDeclarationUnitPrice", key: "m", title: "报关单价", align: "center", width: 100,sortBy: "",ellipsis: {showTitle: true,}, },
           { field: "garmentFactory", key: "l", title: "成衣工厂", align: "center", width: 100,sortBy: "" ,ellipsis: {showTitle: true,},},
           { field: "hsCode", key: "n", title: "HScode", align: "center", width: 120,sortBy: "",ellipsis: {showTitle: true,}, },
-          { field: "englishProductName", key: "o", title: "英文品名", align: "center", width: 150,sortBy: "",ellipsis: {showTitle: true,},
+          { field: "englishProductName", key: "o", title: "英文品名", align: "center", width: 180,sortBy: "",ellipsis: {showTitle: true,},
             renderBodyCell: ({ row, column, rowIndex }, h) => {
               const text = row[column.field];
               if (text && text.length>15){