修改bug

src/components/dicSelect/main.vue

@@ -318,10 +318,8 @@ export default {
             })
         },
         clear() {
-            if (this.remote) {
-                this.data = this.$options.data().data
-                this.getDicData()
-            }
+            this.data = this.$options.data().data
+            this.getDicData()
             this.$emit('selectChange', null)
         },
         importData() {

src/views/iosBasicData/bunits/index.vue

@@ -293,6 +293,11 @@ export default {
       getWorkDicts('number_rule').then(res=>{
           this.findObject(this.option.column, "quantityRule").dicData = res.data.data
       })
+      if (this.$route.query.type == 'new') {
+      setTimeout(() => {
+        this.$refs.crud.rowAdd()
+      }, 200);
+    }
   },
   methods: {
       // 禁用启用按钮

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -102,20 +102,23 @@
                             <dic-select style="margin-right: 4px;" v-model="form.srcType" placeholder="业务来源" key="dictKey"
                                 keyValue="dictKey" label="dictValue"
                                 url="/blade-system/dict-biz/dictionary?code=source_Type" :filterable="true"
-                                :disabled="editDisabled" @selectChange="dicChange('srcType', $event)"></dic-select>
+                                :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
+                                @selectChange="dicChange('srcType', $event)"></dic-select>
                             <el-input v-show="!form.srcType" v-model="form.srcCnName" placeholder="请选择" :disabled="true">
                             </el-input>
                             <dic-select v-show="form.srcType == 'OWN'" v-model="form.srcCnName" placeholder="所属公司" key="id"
                                 label="deptName" url="/blade-system/dept/lazy-list?parentId=0" :filterable="true"
-                                @selectChange="dicChange('srcCnName', $event)" :disabled="editDisabled"></dic-select>
+                                @selectChange="dicChange('srcCnName', $event)"
+                                :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                             <dic-select v-show="form.srcType == 'AGENT'" v-model="form.srcCnName" placeholder="代理" key="id"
                                 label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=代理客户"
                                 :filterable="true" :remote="true" dataName="cnName"
-                                @selectChange="dicChange('srcCnName', $event)" :disabled="editDisabled"></dic-select>
+                                @selectChange="dicChange('srcCnName', $event)"
+                                :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                             <dic-select v-show="form.srcType == 'SALES'" v-model="form.srcCnName" placeholder="业务员" key="id"
                                 label="realName" res="records" url="/blade-user/page" :filterable="true" :remote="true"
                                 dataName="realName" @selectChange="dicChange('srcCnName', $event)"
-                                :disabled="editDisabled"></dic-select>
+                                :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                         </div>
                     </tempalte>
                     <tempalte slot="hshipperCnName">
@@ -185,6 +188,10 @@
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
                         }}</span>
                     </template>
+                    <template slot="goodsTypeHeader" slot-scope="{column}">
+                        <span style="color: #1e9fff;cursor: pointer;" @click="inJump('类型')">{{ (column || {}).label
+                        }}</span>
+                    </template>
                     <template slot="index" slot-scope="{row,index}">
                         <span>{{ index + 1 }}</span>
                     </template>
@@ -212,9 +219,9 @@
                         <span v-else>{{ row.goodsName }}</span>
                     </template>
                     <tempalte slot="goodsType" slot-scope="{ row }">
-                        <dic-select v-if="row.$cellEdit && !row.srcId" v-model="row.goodsType" placeholder="类型"
-                            key="dictKey" label="dictValue" url="/blade-system/dict-biz/dictionary?code=goods-type"
-                            :filterable="true"></dic-select>
+                        <dic-select  v-if="row.$cellEdit && !row.srcId" v-model="row.goodsType"
+                            placeholder="类型" key="dictKey" label="dictValue"
+                            url="/blade-system/dict-biz/dictionary?code=goods-type" :filterable="true"></dic-select>
                         <span v-else>{{ row.goodsType }}</span>
                     </tempalte>
                     <tempalte slot="number" slot-scope="{ row }">
@@ -307,6 +314,10 @@
                 <avue-crud :option="option3" :data="form.inStorageList" id="out-table" ref="crud3"
                     @selection-change="selectionChange" @resetColumn="resetColumn('crud3', 'option3', 'optionBack3', 390)"
                     @saveColumn="saveColumn('crud3', 'option3', 'optionBack3', 390)">
+                    <template slot="storageUnitHeader" slot-scope="{column}">
+                        <span style="color: #1e9fff;cursor: pointer;" @click="inJump('入库单位')">{{ (column || {}).label
+                        }}</span>
+                    </template>
                     <template slot="warehouseName" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.warehouseName" placeholder="入库" key="id" label="cname"
                             url="/blade-los/storage/list" res="records" :filterable="true" :remote="true" dataName="cname"
@@ -403,6 +414,8 @@
                 <el-button type="primary" @click="boxSubmit(boxForm)">确 定</el-button>
             </span>
         </el-dialog>
+        <dictbiz-dialog ref="dictbiz" :title="dicTitle" :code="dicCode" :parentId="parentId" @closed="getAllWorkDicts">
+        </dictbiz-dialog>
     </div>
 </template>
 
@@ -419,6 +432,9 @@ export default {
     name: "detailsPage",
     data() {
         return {
+            dicTitle:null,
+            parentId: null,
+            dicCode:null,
             carForm: {
                 // id: null,
                 // inspectionFleetId: null,
@@ -1028,7 +1044,7 @@ export default {
             optionBack2: {
                 height: 'auto',
                 calcHeight: 30,
-                menuWidth: 320,
+                menuWidth: 360,
                 tip: false,
                 border: true,
                 index: true,
@@ -1542,6 +1558,23 @@ export default {
                     query: { type: 'new' },
                 })
             }
+            if (name == '类型') {
+                this.$refs.dictbiz.open()
+                this.dicTitle='添加类型'
+                this.parentId = '1813125517193330690'
+                this.dicCode = 'goods-type'
+            }
+            if (name == '入库单位') {
+                this.$router.push({
+                    path: "/iosBasicData/bunits/index",
+                    query: { type: 'new' },
+                })
+            }
+        },
+        getAllWorkDicts() {
+            this.dicTitle=null
+            this.parentId = null
+            this.dicCode = null
         },
         getDetaiByMblno(billNo) {
             this.editButton = true

src/views/wel/components/losAssembly/IosBox.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="home-container">
+        <el-card class="home-container__card">
+            <div class="title">
+                <span>还箱提醒</span>
+                <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
+            </div>
+            <div class="content" v-loading="loading">
+                <avue-crud id="out-table" :data="data" :option="option"></avue-crud>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script>
+import { indexStatisticsTrend, salesTrend, boxReturnReminder } from "@/api/wel";
+import { defaultDate2, defaultDate3, getYearDate } from "@/util/date";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+
+export default {
+    components: { SearchQuery },
+    data() {
+        return {
+            loading: false,
+            data: [],
+            option: {
+                header: false,
+                border: true,
+                stripe: true,
+
+                menu: false,
+                align: 'center',
+                column: [
+                    {
+                        label: '提单号',
+                        prop: 'mblno',
+                        overHidden: true,
+                    }, {
+                        label: '客户',
+                        prop: 'corpName',
+                        overHidden: true,
+                    }, {
+                        label: '到港日期',
+                        prop: 'eta',
+                        overHidden: true,
+                    }, {
+                        label: '免箱天数',
+                        prop: 'iqNo',
+                        overHidden: true,
+                    }
+                ]
+            }
+        }
+    },
+    created() {
+
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        refresh() {
+            this.init();
+        },
+        init() {
+            this.loading = true
+            boxReturnReminder().then(res => {
+                this.data = res.data.data
+            }).finally(() => {
+                this.loading = false
+            })
+        },
+        // 获取数据
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep .el-table--small td,
+.el-table--small th {
+    padding: 2px !important;
+}
+.home-container {
+    padding: 0px 5px 5px 0px;
+    box-sizing: border-box;
+    height: 100%;
+
+    ::v-deep .el-card__body {
+        padding: 10px 15px;
+        font-size: 14px;
+    }
+
+    &__card {
+        width: 100%;
+        height: 100%;
+    }
+
+    .title {
+        display: flex;
+        justify-content: space-between;
+
+        .right {
+            display: flex;
+            align-items: center;
+
+            &_but {
+                margin: 0 10px;
+                border: 1px solid #409eff;
+                width: 80px;
+                border-radius: 3px;
+                display: flex;
+
+                &_left {
+                    width: 40px;
+                    text-align: center;
+                    color: #409eff;
+                    border-right: 1px solid #409eff;
+                    cursor: pointer;
+                }
+
+                &_right {
+                    width: 40px;
+                    text-align: center;
+                    color: #409eff;
+                    cursor: pointer;
+                }
+
+                &_active {
+                    color: #fff;
+                    background-color: #409eff;
+                }
+            }
+        }
+    }
+}
+</style>

src/views/wel/components/losAssembly/IosDeposit.vue

@@ -0,0 +1,147 @@
+<template>
+    <div class="home-container">
+        <el-card class="home-container__card">
+            <div class="title">
+                <span>退押提醒</span>
+                <i class="el-icon-refresh-right" style="cursor: pointer;font-size:20px" @click="refresh"></i>
+            </div>
+            <div class="content" v-loading="loading">
+                <avue-crud id="out-table" :data="data" :option="option"></avue-crud>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script>
+import { indexStatisticsTrend, salesTrend, withdrawalReminder } from "@/api/wel";
+import { defaultDate2, defaultDate3, getYearDate } from "@/util/date";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+
+export default {
+    components: { SearchQuery },
+    data() {
+        return {
+            loading: false,
+            data: [],
+            option: {
+                header: false,
+                border: true,
+                stripe: true,
+
+                menu: false,
+                align: 'center',
+                column: [
+                    {
+                        label: '提单号',
+                        prop: 'mblno',
+                        overHidden: true,
+                    }, {
+                        label: '客户',
+                        prop: 'corpName',
+                        overHidden: true,
+                    }, {
+                        label: '到港日期',
+                        prop: 'eta',
+                        overHidden: true,
+                    }
+                ]
+            }
+        }
+    },
+    created() {
+
+    },
+    mounted() {
+        this.init();
+    },
+    methods: {
+        refresh() {
+            this.init();
+        },
+        init() {
+            this.loading = true
+            withdrawalReminder().then(res => {
+                this.data = res.data.data
+            }).finally(() => {
+                this.loading = false
+            })
+        },
+        // 获取数据
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+    text-align: center;
+    padding: 4px 0;
+}
+
+::v-deep .el-table--small td,
+.el-table--small th {
+    padding: 2px !important;
+}
+.home-container {
+    padding: 0px 5px 5px 0px;
+    box-sizing: border-box;
+    height: 100%;
+
+    ::v-deep .el-card__body {
+        padding: 10px 15px;
+        font-size: 14px;
+    }
+
+    &__card {
+        width: 100%;
+        height: 100%;
+    }
+
+    .title {
+        display: flex;
+        justify-content: space-between;
+
+        .right {
+            display: flex;
+            align-items: center;
+
+            &_but {
+                margin: 0 10px;
+                border: 1px solid #409eff;
+                width: 80px;
+                border-radius: 3px;
+                display: flex;
+
+                &_left {
+                    width: 40px;
+                    text-align: center;
+                    color: #409eff;
+                    border-right: 1px solid #409eff;
+                    cursor: pointer;
+                }
+
+                &_right {
+                    width: 40px;
+                    text-align: center;
+                    color: #409eff;
+                    cursor: pointer;
+                }
+
+                &_active {
+                    color: #fff;
+                    background-color: #409eff;
+                }
+            }
+        }
+    }
+}
+</style>

src/views/wel/components/losAssembly/losleftform.vue

@@ -76,8 +76,6 @@ export default {
   created() {
     this.saberTenantId = JSON.parse(localStorage.getItem('saber-tenantId')).content
     this.realDate = defaultDate2();
-    boxReturnReminder()
-    withdrawalReminder()
   },
   mounted() {
     this.init();

src/views/wel/components/losHome.vue

@@ -5,6 +5,8 @@
         <losrealtime class="item3"></losrealtime>
         <losleftform class="item4" ></losleftform>
         <losrightform class="item5" ></losrightform>
+        <IosBox class="item6" ></IosBox>
+        <IosDeposit class="item7" ></IosDeposit>
     </div>
 </template>
 
@@ -14,13 +16,17 @@ import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
 import losrealtime from "@/views/wel/components/losAssembly/losrealtime.vue";
 import losrightform from "@/views/wel/components/losAssembly/losrightform.vue";
 import losleftform from "@/views/wel/components/losAssembly/losleftform.vue";
+import IosDeposit from "@/views/wel/components/losAssembly/IosDeposit.vue";
+import IosBox from "@/views/wel/components/losAssembly/IosBox.vue";
     export default {
         components:{
             losquick,
             losaudit,
             losrealtime,
             losleftform,
-            losrightform
+            losrightform,
+            IosBox,
+            IosDeposit
         },
         props:{
             sysType:Number,