ysy hace 1 año
padre
commit
78fea1d494

+ 1 - 1
src/views/materialPlan/components/saleOrder-search.vue

@@ -18,7 +18,7 @@
 
             <el-col v-bind="styleResponsive ? { sm: 4 } : { span: 4 }">
                 <div class="ele-form-actions">
-                    <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+                    <el-button type="primary"  icon="el-icon-search" class="ele-btn-icon" @click="search">
                         查询
                     </el-button>
                     <el-button @click="reset">重置</el-button>

+ 2 - 2
src/views/saleOrder/components/order-search.vue

@@ -97,10 +97,10 @@
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 6 } : { span: 6 }">
         <div class="ele-form-actions">
-          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+          <el-button type="primary"   size="mini" icon="el-icon-search" class="ele-btn-icon" @click="search">
             查询
           </el-button>
-          <el-button @click="reset" icon="el-icon-refresh-left" type="primary">重置</el-button>
+          <el-button @click="reset"  size="mini" icon="el-icon-refresh-left" type="primary">重置</el-button>
         </div>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }" v-if="activeName == 'first'">

+ 9 - 1
src/views/saleOrder/index.vue

@@ -56,8 +56,15 @@
         </template>
 
         <template v-slot:productSumWeight="{ row }">
-          {{ row.productSumWeight }}
+          {{ row.productSumWeight }} {{ row.weightUnit }}
         </template>
+
+        <template v-slot:contractNum="{ row }">
+          {{ row.contractNum }} {{ row.measuringUnit }}
+        </template>
+
+        
+
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <template>
@@ -226,6 +233,7 @@
           },
           {
             prop: 'contractNum',
+            slot: 'contractNum',
             label: this.clientEnvironmentId == '4' ? '交付数量' : '订单数量',
             align: 'center'
           },