Explorar o código

修改报表和箱量最小值

caojunjie hai 9 meses
pai
achega
54aa71cc7c

+ 2 - 0
src/components/boxManagement/reports.vue

@@ -1001,7 +1001,9 @@ export default {
         }
         this.$refs.crud.rowEdit(scope.row, scope.$index);
       } else if (type == 3) {
+        console.log(this.businessValue,123456)
         this.bbDisabled = false;
+        this.$set(this.form,"businessType",this.businessValue)
         this.$refs.crud.rowAdd();
       }
     },

+ 11 - 6
src/views/ow/owPut/detailsPage.vue

@@ -7,6 +7,11 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button size="small" style="margin-right: 8px" :disabled="!form.id" @click="$refs.print.openDialog()">预 览
+        </el-button>
+        <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px" :disabled="!form.id"
+          @click="$refs.report.openDialog()">报表设计
+        </el-button>
         <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small" v-if="editButton"
           :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)"
           @click="inEdit">编 辑
@@ -95,7 +100,7 @@
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
               <template slot="boxNumber">
-                <el-input-number v-model="form.boxNumber" :disabled="editDisabled || form.whetherEnable == '是'" :min="0"
+                <el-input-number v-model="form.boxNumber" :disabled="editDisabled || form.whetherEnable == '是'" :min="1"
                   :controls="false" placeholder="请输入 箱量" style="width: 100%;"></el-input-number>
               </template>
             </avue-form>
@@ -453,10 +458,10 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL" :type="true"></business-reports>
-    <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="MYDL" classifyCode="费用"
+    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="OW-F" :type="true"></business-reports>
+    <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="OW-F" classifyCode="费用"
       groupCode="应付" :selecList="selectionfeecList"></business-reports>
-    <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
+    <reports :id="form.id" :assemblyForm="form" businessValue="OW-F" ref="report"></reports>
     <!--审核弹窗-->
     <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -546,8 +551,8 @@ import {
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
-import businessReports from "@/components/tradeAgency/businessReports.vue";
-import reports from "@/components/tradeAgency/reports.vue";
+import businessReports from "@/components/boxManagement/businessReports.vue";
+import reports from "@/components/boxManagement/reports.vue";
 import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
 import { getToken } from "@/util/auth";
 import _ from "lodash";

+ 3 - 3
src/views/ow/owTask/detailsPage.vue

@@ -102,7 +102,7 @@
                 <!-- <el-link type="primary" :underline="false" @click.stop="openRtDialog">箱租金条款</el-link> -->
               </template>
               <template slot="boxNumber">
-                <el-input-number v-model="form.boxNumber" :disabled="editDisabled || form.whetherEnable == '是'" :min="0"
+                <el-input-number v-model="form.boxNumber" :disabled="editDisabled || form.whetherEnable == '是'" :min="1"
                   :controls="false" placeholder="请输入 箱量" style="width: 100%;"></el-input-number>
               </template>
             </avue-form>
@@ -127,9 +127,9 @@
                   :disabled="editDisabled || !form.id || form.tradingBoxItemsList.length == 0"
                   @click="allClick('导出')">导出</el-button>
                 <!-- <el-button type="primary" size="small" @click="allClick('卖箱')">卖箱</el-button> -->
-                <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
+                <!-- <el-button size="small" style="margin-right: 8px" :disabled="!form.id || true"
                   @click="$refs.print.openDialog()">打印报表
-                </el-button>
+                </el-button> -->
               </template>
               <template slot="index" slot-scope="{row,index}">
                 <span>{{ index + 1 }}</span>