Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/aps/capacity/index.vue

@@ -35,6 +35,9 @@
         <template v-slot:plannedCapacity="{ row }">
           {{ row.plannedCapacity }}{{row.plannedCapacityUnit?row.plannedCapacityUnit:''}}
         </template>
+        <template v-slot:averageDailyCapacity="{ row }">
+          {{ row.averageDailyCapacity }}{{row.plannedCapacityUnit?row.plannedCapacityUnit:''}}
+        </template>
         <template v-slot:action="{ row }">
           <el-link type="primary" :underline="false" icon="el-icon-edit" @click="handleUpdate(row)">
             修改
@@ -66,9 +69,9 @@
                 :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="规划产能(吨)" prop="plannedCapacity">
+          <el-form-item label="规划产能" prop="plannedCapacity">
             <div style="display: flex;align-items: center;justify-content: space-between;">
-              <el-input v-model="form.plannedCapacity" placeholder="请输入规划产能(吨)" style="width: calc(100% - 100px)" />
+              <el-input v-model="form.plannedCapacity" placeholder="请输入规划产能" style="width: calc(100% - 100px)" />
               <DictSelection dictName="计量单位" v-model="form.plannedCapacityUnit" filterable clearable style="width: 100px;">
               </DictSelection>
             </div>
@@ -93,7 +96,7 @@
           <el-table-column label="年份" align="center" prop="year" />
           <el-table-column label="月份" align="center" prop="month" />
           <el-table-column label="日期" align="center" prop="day" />
-          <el-table-column label="规划产能(吨)" align="center" prop="plannedCapacity" />
+          <el-table-column label="规划产能" align="center" prop="plannedCapacity" />
           <el-table-column label="已排产产能" align="center" prop="plannedSumCapacity" />
           <el-table-column label="已排产单号" align="center" prop="plannedOrder" />
           <el-table-column label="已排产产能" align="center" prop="plannedOrderCapacity" />
@@ -197,7 +200,8 @@ export default {
         },
         {
           prop: 'averageDailyCapacity',
-          label: '平均天产能(KG)',
+          label: '平均天产能',
+          slot: 'averageDailyCapacity',
           align: 'center',
         },
         {

src/views/aps/presalesorder/index.vue

@@ -600,7 +600,8 @@ export default {
       console.log(this.whereForm, 'this.whereForm')
 
       this.loading = true;
-      exportFile(this.whereForm).then(res => {
+      let params = this.whereForm?this.whereForm:[]
+      exportFile(params).then(res => {
         this.loading = false;
 
       });