修改禅道bug

src/router/views/index.js

@@ -4335,7 +4335,7 @@ export default [{
   hidden: true,
   children: [{
     path: '/boxManagement/podComeback/index',
-    name: 'POD返场',
+    name: '空箱返场',
     meta: {
       i18n: '/boxManagement/podComeback/index',
       keepAlive: true,

src/views/boxManagement/podComeback/index.vue

@@ -59,13 +59,26 @@ export default {
               message: " ",
               trigger: "blur"
             }],
+          },
+          {
+            label: '返空日期',
+            prop: 'returnEmptyTime',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd 00:00:00",
+            span: 24,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }],
           }
         ]
       },
       form: {},
       query: {
         whether: '0',
-        businessType:"SI",
+        businessType: "SI",
         actualEtaList: defaultDate2()
       },
       loading: false,
@@ -233,7 +246,7 @@ export default {
             prop: 'cntrTypeCode',
             overHidden: true,
           },
-            {
+          {
             label: '是否录入',
             prop: 'whether',
             hide: true,

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -386,6 +386,9 @@ export default {
             etdEnd: defaultDate3()[1],
         }
     },
+    activated() {
+        this.$refs.crud.doLayout();
+    },
     methods: {
         // 导出
         exportfun() {

src/views/iosBasicData/businessCenter/bookingCabin/index.vue

@@ -240,7 +240,6 @@ export default {
                     {
                         label: '毛重(KGS)',
                         prop: "grossWeight",
-
                         width: "100",
                         overHidden: true,
                     },

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -24,7 +24,7 @@
           :disabled="isSaveBtn || form.issueStatus == 1 || form.status == 3" @click="submit">保 存
         </el-button>
         <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
-          :disabled="form.issueStatus == 1||form.status == 1" @click="allClick('生成订单')">生成订单
+          :disabled="form.issueStatus == 1 || form.status == 1" @click="allClick('生成订单')">生成订单
         </el-button>
         <el-button v-if="form.id" class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
           :disabled="form.status != 0 || form.issueStatus == 1" @click="application">运费申请
@@ -248,11 +248,12 @@
                   @click="allClick('一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0"
                   @click="allClick('批量删除')">批量删除</el-button>
-                <el-button type="success" plain size="small" :disabled="editDisabled || form.preContainersList.length==0"
+                <el-button type="success" plain size="small"
+                  :disabled="editDisabled || form.preContainersList.length == 0"
                   @click="allClick('提取价格')">提取价格</el-button>
               </template>
               <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled|| !form.id" circle
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled || !form.id" circle
                   @click="addRow()">
                 </el-button>
               </template>
@@ -287,8 +288,10 @@
                   <i class="el-icon-coin"></i>
                   <span>应付费用</span>
                 </div>
-                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id" @click="allClick('费用一键保存')">一键保存</el-button>
-                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id" @click="allClick('费用一键编辑')">一键编辑</el-button>
+                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id"
+                  @click="allClick('费用一键保存')">一键保存</el-button>
+                <el-button type="info" plain size="small" :disabled="editDisabled || !form.id"
+                  @click="allClick('费用一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="selectionfeecList.length == 0"
                   @click="allClick('费用批量删除')">批量删除</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
@@ -1215,7 +1218,7 @@ export default {
           }
         })
         this.form = res.data.data
-        if (res.data.data.issueStatus == 1 || res.data.data.status >0) {
+        if (res.data.data.issueStatus == 1 || res.data.data.status > 0) {
           // this.editButton = true
           this.editDisabled = true
           this.optionForm.disabled = true
@@ -1290,18 +1293,32 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          for (let row of this.form.preContainersList) {
+            if (!row.cntrTypeCode || !row.quantity) {
+              this.$refs.crud.rowCell(row, row.$index)
+              return this.$message.error("请完善明细信息");
+            }
+          }
+          this.form.businessType = 'KHTS'
+          this.form.billNoFormat = 'KHTS'
+          this.form.businessTypeCode = 'KHTS'
           const loading = this.$loading({
             lock: true,
             text: '加载中',
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
-          submitBookingCabin(this.form).then(res => {
-            this.$message.success("操作成功");
-            this.getDetails(this.form.id)
-          }).finally(() => {
-            loading.close();
+          submit(this.form).then(res => {
+            submitBookingCabin(this.form).then(res => {
+              this.$message.success("操作成功");
+              this.getDetails(this.form.id)
+            }).finally(() => {
+              loading.close();
+            })
+          }).catch(()=>{
+             loading.close();
           })
+
         });
 
       }
@@ -1482,7 +1499,6 @@ export default {
           }).finally(() => {
             loading.close();
           })
-
         } else {
           return false;
         }

src/views/iosBasicData/businessCenter/customerLetter/index.vue

@@ -74,7 +74,7 @@ export default {
                 menuWidth: 140,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 24,
+                searchMenuSpan: 18,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -146,33 +146,7 @@ export default {
                         },
                         overHidden: true,
                     },
-                    // {
-                    //     label: "订单状态",
-                    //     prop: "billStatus",
-                    //     width: "120",
-                    //     overHidden: true,
-                    //     // search: true,
-                    //     type: 'select',
-                    //     dicData: [{
-                    //         label: '全部',
-                    //         value: 0,
-                    //     }, {
-                    //         label: '录入',
-                    //         value: 1,
-                    //     }, {
-                    //         label: '提交',
-                    //         value: 2,
-                    //     }, {
-                    //         label: '受理',
-                    //         value: 3,
-                    //     }, {
-                    //         label: '待确认',
-                    //         value: 4,
-                    //     }, {
-                    //         label: '已审核',
-                    //         value: 5,
-                    //     }],
-                    // },
+
                     {
                         label: "起运港",
                         prop: "polCnName",
@@ -207,6 +181,74 @@ export default {
                             res: 'data.records'
                         },
                     },
+                             {
+                        label: "生成状态",
+                        prop: "issueStatus",
+                        width: "80",
+                        overHidden: true,
+                        // search: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '否',
+                            value: '0',
+                        }, {
+                            label: '是',
+                            value: '1',
+                        }],
+                    },
+                    {
+                        label: "审核状态",
+                        prop: "status",
+                        width: "80",
+                        overHidden: true,
+                        // search: true,
+                        type: 'select',
+                        dicData: [{
+                            label: '录入',
+                            value: 0,
+                        }, {
+                            label: '提交审核',
+                            value: 1,
+                        }, {
+                            label: '已审核',
+                            value: 3,
+                        },{
+                            label: '驳回',
+                            value: 4,
+                        }],
+                    },
+                    {
+                        label: "OP",
+                        prop: "operatorName",
+                        width: "80",
+                        overHidden: true,
+                        hide: true,
+                        showColumn: false,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        dicUrl: "/api/blade-user/userListAll?roleAlias=操作员",
+                        props: {
+                            label: 'realName',
+                            value: 'realName',
+                        },
+                    },
+                    {
+                        label: "客服",
+                        prop: "customerServiceName",
+                        width: "80",
+                        overHidden: true,
+                        hide: true,
+                        showColumn: false,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        dicUrl: "/api/blade-user/userListAll?roleAlias=客服",
+                        props: {
+                            label: 'realName',
+                            value: 'realName',
+                        },
+                    },
                     {
                         label: 'ETD',
                         prop: "etd",
@@ -354,7 +396,7 @@ export default {
     activated() {
         setTimeout(() => {
             if (this.$route.query.billId) {
-               this.isShow = false
+                this.isShow = false
             }
             this.$refs.crud.doLayout();
         }, 100);

src/views/iosBasicData/costStatistics/index.vue

@@ -298,6 +298,9 @@ export default {
             })
         }
     },
+    activated() {
+        this.$refs.crud.doLayout();
+    },
     methods: {
         rowCell(row) {
             if (row.type == 'MYDL') {

src/views/iosBasicData/decisionAnalysis/index.vue

@@ -100,7 +100,7 @@ export default {
                         },
                         search: false,
                     },
-                     {
+                    {
                         label: "所属公司",
                         prop: "branchName",
                         width: "120",
@@ -720,6 +720,9 @@ export default {
         }
         // this.option.height = window.innerHeight - 370;
     },
+    activated() {
+        this.$refs.crud.doLayout();
+    },
     methods: {
         rowCell(row) {
             if (row.businessType == 'SE') {

src/views/iosBasicData/financeProfit/index.vue

@@ -560,6 +560,9 @@ export default {
         this.getWorkDictsfun()
         this.getLazylistfun() // 获取部门数据
     },
+    activated() {
+        this.$refs.crud.doLayout();
+    },
     methods: {
         // 导出
         exportfun() {
@@ -745,7 +748,7 @@ export default {
                 this.loading = false;
                 financeStatisticsFinanceProfitSum(Object.assign(params, this.query)).then(re => {
                     this.commodityData = [re.data.data]
-               this.$nextTick(() => {
+                    this.$nextTick(() => {
                         this.$refs.crud.doLayout();
                         this.$refs.crud.dicInit();
                     });

src/views/iosBasicData/paymentDetail/index.vue

@@ -421,6 +421,9 @@ export default {
         }
 
     },
+      activated() {
+        this.$refs.crud.doLayout();
+    },
     methods: {
         // 导出
         exportfun() {

src/views/iosBasicData/paymentSummary/index.vue

@@ -355,6 +355,9 @@ export default {
             })
         }
     },
+    activated() {
+        this.$refs.crud.doLayout();
+    },
     methods: {
         // 设计报表
         designReportStart() {

src/views/iosBasicData/podStation/index.vue

@@ -59,7 +59,7 @@ export default {
               message: " ",
               trigger: "blur"
             }],
-          }
+          },
         ]
       },
       form: {},