提交达沃特、箱管

src/components/trade-card/main.vue

@@ -5,7 +5,7 @@
         <div class="redcolumn"></div>
         <div class="container-title">{{ title }}</div>
       </div>
-      <div v-if="showBtn" class="container-foot" @click="show = !show">
+      <div v-if="showBtn" class="container-foot" @click="open">
         <div v-show="show" style="height: 20px">
           <span><i class="el-icon-arrow-up" /></span>
         </div>
@@ -60,6 +60,10 @@ export default {
     },
   },
   methods: {
+    open(){
+      this.show = !this.show
+      this.$emit("openClose",this.show)
+    }
   },
   computed: {
     styleName() {

src/views/approveData/index.vue

@@ -39,6 +39,8 @@
         <span v-else-if="scope.row.checkType == 'YPJ-XS'">易配件销售</span>
         <span v-else-if="scope.row.checkType == 'YPJ-CG'">易配件采购</span>
         <span v-else-if="scope.row.checkType == 'YPJ-XSJH'">销售计划</span>
+        <span v-else-if="scope.row.checkType == 'ZR'">租入</span>
+        <span v-else-if="scope.row.checkType == 'ZC'">租出</span>
       </template>
       <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批

src/views/boxManagement/exportShipment/detailsPage.vue

@@ -54,7 +54,7 @@
         </template>
       </avue-form>
     </trade-card>
-    <trade-card title="箱信息">
+    <trade-card title="箱信息" @openClose="key++">
       <avue-crud
           :option="option"
           :data="dataList"

src/views/boxManagement/importReturnTrip/detailsPage.vue

@@ -53,7 +53,7 @@
         </template>
       </avue-form>
     </trade-card>
-    <trade-card title="箱信息">
+    <trade-card title="箱信息" @openClose="key++">
       <avue-crud
           :option="option"
           :data="dataList"

src/views/boxManagement/leaseIn/detailsPage.vue

@@ -13,7 +13,7 @@
         <el-button class="el-button--small-yh" style="margin-right: 10px" type="primary" size="small" :disabled="form.status>0"
                    @click="confirmEdit" v-if="optionForm.disabled === true">编辑
         </el-button>
-        <el-dropdown style="margin-right: 10px" v-if="false">
+        <el-dropdown style="margin-right: 10px">
           <el-button type="primary" size="small">
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -21,7 +21,8 @@
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
             <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
-            <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
+            <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button class="el-button--small-yh" type="primary" size="small" :disabled="form.status>0"
@@ -190,6 +191,11 @@
           @choceScheduleFun="choceScheduleFun"
       ></check-schedule>
     </el-dialog>
+    <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
+               :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
+      </check>
+    </el-dialog>
   </div>
 </template>
 
@@ -212,6 +218,7 @@ import {getToken} from "@/util/auth";
 import {dateFormat, defaultDate} from "@/util/date";
 import reportDialog from "@/components/report-dialog/main.vue";
 import {generateStack} from "@/api/boxManagement/exportShipment";
+import check from "@/components/check/check.vue";
 export default {
   name: "detailsPage",
   props: {
@@ -219,10 +226,12 @@ export default {
     detailData: Object
   },
   components:{
-    checkSchedule,reportDialog
+    checkSchedule,reportDialog,check
   },
   data() {
     return {
+      checkData: {},
+      checkDialog: false,
       switchDialog:false,
       excelOption: {
         submitBtn: false,
@@ -797,6 +806,10 @@ export default {
     }
   },
   methods: {
+    //关闭审核
+    choceCheckFun() {
+      this.checkDialog = false;
+    },
     //堆存
     stockpiling() {
       this.title = "堆存"
@@ -1092,8 +1105,8 @@ export default {
       }).then(() => {
         const data = {
           id : this.form.id,
-          pageLabel:"买箱",
-          checkFlag: 1,
+          pageLabel:"租入",
+          checkFlag: 3,
         }
         const loading = this.$loading({
           lock: true,
@@ -1148,10 +1161,10 @@ export default {
             submit(data).then(res => {
               const data = {
                 id: res.data.data.id,
-                url: '/boxManagement/buyContainer/index',
+                url: '/boxManagement/leaseIn/index',
                 pageStatus: "this.$store.getters.domSaleStatus",
-                pageLabel: "买箱",
-                checkFlag: 1,
+                pageLabel: "租入",
+                checkFlag: 3,
               }
               pleaseCheck({
                 ...data,

src/views/boxManagement/leaseOut/detailsPage.vue

@@ -13,7 +13,7 @@
         <el-button class="el-button--small-yh" style="margin-right: 10px" type="primary" size="small" :disabled="form.status>0"
                    @click="confirmEdit" v-if="optionForm.disabled === true">编辑
         </el-button>
-        <el-dropdown style="margin-right: 10px" v-if="false">
+        <el-dropdown style="margin-right: 10px">
           <el-button type="primary" size="small">
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -21,7 +21,8 @@
             <el-dropdown-item @click.native="pleaseCheck" :disabled="form.status>0">请核数据</el-dropdown-item>
             <el-dropdown-item @click.native="checkScheduleDialog = true,checkId = form.id">审核进度</el-dropdown-item>
             <el-dropdown-item @click.native="repealCancel" :disabled="form.status === 0 || !form.status" v-if="!detailData.id">撤销请核</el-dropdown-item>
-            <!--            <el-dropdown-item @click.native="changeApproveOpen">特殊审批</el-dropdown-item>-->
+            <el-dropdown-item @click.native="checkDialog = true,checkData = detailData.check;" v-if="detailData.id">特殊审批
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-button class="el-button--small-yh" type="primary" size="small" :disabled="form.status>0"
@@ -186,6 +187,11 @@
           @choceScheduleFun="choceScheduleFun"
       ></check-schedule>
     </el-dialog>
+    <el-dialog append-to-body title="审批" class="el-dialogDeep" :visible.sync="checkDialog" width="50%"
+               :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+      <check :checkData="checkData" :checkDetail="false" :idList="[]" @choceCheckFun="choceCheckFun">
+      </check>
+    </el-dialog>
   </div>
 </template>
 
@@ -208,15 +214,18 @@ import {getToken} from "@/util/auth";
 import {dateFormat} from "@/util/date";
 import reportDialog from "@/components/report-dialog/main.vue";
 import {generateStack} from "@/api/boxManagement/exportShipment";
+import check from "@/components/check/check.vue";
 export default {
   name: "detailsPage",
   props: {
     onLoad: Object,
     detailData: Object
   },
-  components:{checkSchedule,reportDialog},
+  components:{checkSchedule,reportDialog,check},
   data() {
     return {
+      checkData: {},
+      checkDialog: false,
       switchDialog:false,
       excelOption: {
         submitBtn: false,
@@ -794,6 +803,10 @@ export default {
     }
   },
   methods: {
+    //关闭审核
+    choceCheckFun() {
+      this.checkDialog = false;
+    },
     //堆存
     stockpiling() {
       this.title = "堆存"
@@ -1100,8 +1113,8 @@ export default {
       }).then(() => {
         const data = {
           id : this.form.id,
-          pageLabel:"买箱",
-          checkFlag: 1,
+          pageLabel:"租出",
+          checkFlag: 4,
         }
         const loading = this.$loading({
           lock: true,
@@ -1158,8 +1171,8 @@ export default {
                 id: res.data.data.id,
                 url: '/boxManagement/buyContainer/index',
                 pageStatus: "this.$store.getters.domSaleStatus",
-                pageLabel: "买箱",
-                checkFlag: 1,
+                pageLabel: "租出",
+                checkFlag: 4,
               }
               pleaseCheck({
                 ...data,

src/views/statisticAnalysis/profitStatistics/index.vue

@@ -39,7 +39,8 @@ export default {
       form: {},
       search: {
         date:`${new Date().getFullYear()}-${(new Date().getMonth()+1)}-1 00:00:00`,
-        whetherStatistics:0
+        whetherStatistics:0,
+        show:0
       },
       condition: {},
       dataList: [],
@@ -112,10 +113,6 @@ export default {
           prop: "corpName",
           overHidden: true
         }, {
-          label: "所属公司",
-          prop: "company",
-          overHidden: true
-        }, {
           label: "日期",
           prop: "date",
           width: 100,
@@ -157,6 +154,21 @@ export default {
             label:'箱号',
             value:1
           }]
+        },{
+          label: '为0是否显示',
+          prop: 'show',
+          search: true,
+          type: 'select',
+          showColumn: false,
+          hide: true,
+          searchValue:0,
+          dicData:[{
+            label:'不显示',
+            value:0
+          },{
+            label:'显示',
+            value:1
+          }]
         }]
       }
     };