Browse Source

修改bug

Qukatie 10 months ago
parent
commit
683e307d02

+ 7 - 1
src/api/index.js

@@ -98,4 +98,10 @@ export function deleteAttachment(fId){
     method:'post'
   })
 }
-
+// 客户欠款
+export function expirationReminder(){
+  return request({
+    url:'/warehouseBusiness/enclosure/expirationReminder',
+    method:'get'
+  })
+}

+ 3 - 3
src/views/Warehousing/components/upLoadContract.vue

@@ -34,13 +34,13 @@
       </el-table-column>
       <el-table-column prop="effectiveDateStare" header-align="center" align="center" label="有效期起">
         <template slot-scope="scope">
-          <el-date-picker v-model="scope.row.effectiveDateStare" type="date" placeholder="选择日期" style="width: 100%;">
+          <el-date-picker v-model="scope.row.effectiveDateStare" :disabled="browseStatus" type="date" placeholder="选择日期" style="width: 100%;">
           </el-date-picker>
         </template>
       </el-table-column>
       <el-table-column prop="effectiveDateEnd" header-align="center" align="center" label="有效期止">
         <template slot-scope="scope">
-          <el-date-picker v-model="scope.row.effectiveDateEnd" type="date" placeholder="选择日期"  style="width: 100%;">
+          <el-date-picker v-model="scope.row.effectiveDateEnd" :disabled="browseStatus" type="date" placeholder="选择日期"  style="width: 100%;">
           </el-date-picker>
         </template>
       </el-table-column>
@@ -111,7 +111,7 @@ export default {
     browseStatus: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   data() {
     return {

+ 1 - 1
src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -1984,7 +1984,7 @@ export default {
     this.getConfigKey("warehouse.show.feesConfirm").then((response) => {
       this.isShowFeesConfirm = response.msg;
     });
-    listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
+    listWarehousesss({ fStatus: 0, delFlag: 0, approvalStatus: '审核通过' }).then((response) => {
       this.warehouseOptions = response.rows;
     });
     listFees({ fDc: "C" }).then((response) => {

+ 44 - 37
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -21,7 +21,8 @@
         </el-button>
         <el-button type="info" size="small" @click="ordersRevoke" v-if="form.warehouseStatus == 6">撤销接单请核
         </el-button>
-        <el-button type="info" size="small" @click="revokeTwo('warehouse_status')" v-if="form.warehouseStatus == 4">撤销接单审批
+        <el-button type="info" size="small" @click="revokeTwo('warehouse_status')"
+          v-if="form.warehouseStatus == 4">撤销接单审批
         </el-button>
       </div>
       <!-- <el-button icon="el-icon-refresh" circle size="mini"></el-button> -->
@@ -169,8 +170,8 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="计划件数" prop="fPlanqty">
-            <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" v-input-limit="0" placeholder="计划件数"
-              :disabled="browseStatus || current !== before || form.warehouseStatus > 3
+            <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" v-input-limit="0"
+              placeholder="计划件数" :disabled="browseStatus || current !== before || form.warehouseStatus > 3
                 " />
           </el-form-item>
         </el-col>
@@ -185,8 +186,8 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="计划净重(kg)" prop="fPlannetweight">
-            <el-input v-model="form.fPlannetweight" style="width: 80%" maxlength="16" v-input-limit="3" placeholder="计划净重"
-              @change="changePlannetWeight" :disabled="browseStatus || current !== before || form.warehouseStatus > 3
+            <el-input v-model="form.fPlannetweight" style="width: 80%" maxlength="16" v-input-limit="3"
+              placeholder="计划净重" @change="changePlannetWeight" :disabled="browseStatus || current !== before || form.warehouseStatus > 3
                 " @input="tfNetweight">
               <template slot="append">{{ tfNetweightnum }}吨</template>
             </el-input>
@@ -194,16 +195,14 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="溢短装(kg)" prop="fActualWeight">
-            <el-input v-model="form.fActualWeight" v-input-limit="3" style="width: 100%"
-              disabled placeholder="溢短装(kg)">
-              <template slot="append">{{ ((form.fActualWeight?form.fActualWeight:0) / 1000).toFixed(4) }}吨</template>
+            <el-input v-model="form.fActualWeight" v-input-limit="3" style="width: 100%" disabled placeholder="溢短装(kg)">
+              <template slot="append">{{ ((form.fActualWeight ? form.fActualWeight : 0) / 1000).toFixed(4) }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="溢短装(件数)" prop="fActualNumber">
-            <el-input v-model="form.fActualNumber" v-input-limit="3" style="width: 100%"
-              disabled placeholder="溢短装(件数)" >
+            <el-input v-model="form.fActualNumber" v-input-limit="3" style="width: 100%" disabled placeholder="溢短装(件数)">
             </el-input>
           </el-form-item>
         </el-col>
@@ -296,8 +295,8 @@
               message: '请选择',
               trigger: ['blur', 'change'],
             }">
-              <el-input v-model="form.fDriverName" style="width: 80%" :disabled="browseStatus || form.warehouseStatus > 3"
-                placeholder="司机姓名" />
+              <el-input v-model="form.fDriverName" style="width: 80%"
+                :disabled="browseStatus || form.warehouseStatus > 3" placeholder="司机姓名" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -396,7 +395,8 @@
                 <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
                   <template slot-scope="scope">
                     <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
-                      <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName" :value="item.fId">
+                      <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
+                        :value="item.fId">
                       </el-option>
                     </el-select>
                   </template>
@@ -682,12 +682,14 @@
         <el-checkbox v-model="allCheck" label="全选" @change="allChecked"></el-checkbox>
       </div>
       <div style="padding: 4px; display: flex; justify-content: center">
-        <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd" handle=".indraggable">
+        <draggable v-model="setRowList" group="site" animation="300" @start="onStart" @end="onEnd"
+          handle=".indraggable">
           <transition-group>
             <div v-for="(item, index) in setRowList" :key="index" class="listStyle">
               <div style="width: 500px" class="indraggable">
                 <div class="progress" :style="{ width: item.width + 'px' }">
-                  <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name }}
+                  <el-checkbox :label="item.name" v-model="item.checked" :true-label="0" :false-label="1">{{ item.name
+                    }}
                   </el-checkbox>
                 </div>
               </div>
@@ -940,7 +942,7 @@
             <el-col :span="6">
               <el-form-item label="件数" prop="fQty">
                 <el-input v-input-limit="0" v-model.number="importList.fQty" style="width: 100%" placeholder="件数"
-                  @input="imporComputer" @change="computerChange(importList,'fQty')"/>
+                  @input="imporComputer" @change="computerChange(importList, 'fQty')" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -954,7 +956,7 @@
             <el-col :span="6">
               <el-form-item label="净重(kg)" prop="fNetweight">
                 <el-input v-model="importList.fNetweight" v-input-limit="3" style="width: 100%" placeholder="净重"
-                  @change="tfNetweight2();computerChange(importList,'fNetweight')">
+                  @change="tfNetweight2(); computerChange(importList, 'fNetweight')">
                   <template slot="append">{{ tfNetweightnum2 }}吨</template>
                 </el-input>
               </el-form-item>
@@ -1004,26 +1006,30 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="溢短装(kg)" prop="fActualWeight">
-                <el-input v-model="importList.fActualWeight" style="width: 100%" placeholder="溢短装(kg)" v-input-limit="3" @change="computerChange(importList,'fActualWeight')">
+                <el-input v-model="importList.fActualWeight" style="width: 100%" placeholder="溢短装(kg)" v-input-limit="3"
+                  @change="computerChange(importList, 'fActualWeight')">
                   <template slot="append">{{ (importList.fActualWeight / 1000).toFixed(4) }}吨</template>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="溢短装(件数)" prop="fActualNumber">
-                <el-input v-model="importList.fActualNumber" style="width: 100%" placeholder="溢短装(件数)" v-input-limit="3" @change="computerChange(importList,'fActualNumber')"> 
+                <el-input v-model="importList.fActualNumber" style="width: 100%" placeholder="溢短装(件数)" v-input-limit="3"
+                  @change="computerChange(importList, 'fActualNumber')">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="溢短装比例(KG)" prop="fActualWeightProportion">
-                <el-input v-model="importList.fActualWeightProportion" style="width: 100%" placeholder="溢短装比例(KG)" v-input-limit="3" disabled> 
+                <el-input v-model="importList.fActualWeightProportion" style="width: 100%" placeholder="溢短装比例(KG)"
+                  v-input-limit="3" disabled>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="溢短装比例(件数)" prop="fActualNumberProportion">
-                <el-input v-model="importList.fActualNumberProportion" style="width: 100%" placeholder="溢短装比例(件数)" v-input-limit="3" disabled> 
+                <el-input v-model="importList.fActualNumberProportion" style="width: 100%" placeholder="溢短装比例(件数)"
+                  v-input-limit="3" disabled>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -3955,8 +3961,8 @@
               <td>{{ item.fQty }}</td>
               <td>{{
                 item.fWarehouseInformation ?
-                item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf('/')) + 1,
-                  item.fWarehouseInformation.length) : ''
+                  item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf('/')) + 1,
+                    item.fWarehouseInformation.length) : ''
               }}
               </td>
               <td>{{ item.fQty }}</td>
@@ -4994,7 +5000,7 @@
               <td>{{ item.fQty }}</td>
               <td></td>
               <td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
-                         
+                           
               <td>{{ item.fMarks }}</td>
               <td></td>
               <td></td>
@@ -5073,7 +5079,8 @@
     <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
+      <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments"
+        @refreshDataList="returnData"></approval-comments>
       <el-button type="primary" :disabled="approvalStatus" v-if="form.fBillstatus > 3"
         @click="addOrUpdateHandle(form, 'f_billstatus')">查看审批
       </el-button>
@@ -5089,7 +5096,8 @@
       </el-button>
       <el-button type="primary" @click="saveForm()">保 存
       </el-button>
-      <el-button :disabled="form.fBillstatus > 3" style="background-color: #008000; color: #fff" @click="submitForm()">请核
+      <el-button :disabled="form.fBillstatus > 3" style="background-color: #008000; color: #fff"
+        @click="submitForm()">请核
       </el-button>
       <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke"
         v-hasPermi="['warehouseBusiness:revoke']">撤销请核
@@ -5636,7 +5644,7 @@ export default {
       eId: '',
       eRow: {},
       showGenerate: 0,
-      fActualNumber:0
+      fActualNumber: 0
     }
   },
   async created() {
@@ -5753,7 +5761,7 @@ export default {
     selectUserByRole().then(res => {
       this.fSalesmanOption = res.rows
     })
-    listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
+    listWarehousesss({ fStatus: 0, delFlag: 0, approvalStatus: '审核通过' }).then((response) => {
       this.warehouseOptions = response.rows
     })
     listFees({ fDc: 'C' }).then((response) => {
@@ -5957,9 +5965,9 @@ export default {
     }
   },
   methods: {
-    computerChange(row){
-      row.fActualWeightProportion=Number(Number(row.fActualWeight?row.fActualWeight:0)/Number(row.fNetweight?row.fNetweight:1)).toFixed(2)
-      row.fActualNumberProportion=Number(Number(row.fActualNumber?row.fActualNumber:0)/Number(row.fQty?row.fQty:1)).toFixed(2)
+    computerChange(row) {
+      row.fActualWeightProportion = Number(Number(row.fActualWeight ? row.fActualWeight : 0) / Number(row.fNetweight ? row.fNetweight : 1)).toFixed(2)
+      row.fActualNumberProportion = Number(Number(row.fActualNumber ? row.fActualNumber : 0) / Number(row.fQty ? row.fQty : 1)).toFixed(2)
     },
     init() {
       this.approVal = false
@@ -7364,9 +7372,9 @@ export default {
             fPlannetweight: this.importList.fPlannetweight,
             fPlangrossweight: this.importList.fPlangrossweight,
             fActualWeight: this.importList.fActualWeight,
-            fActualNumber:this.importList.fActualNumber,
-            fActualWeightProportion:this.importList.fActualWeightProportion,
-            fActualNumberProportion:this.importList.fActualNumberProportion,
+            fActualNumber: this.importList.fActualNumber,
+            fActualWeightProportion: this.importList.fActualWeightProportion,
+            fActualNumberProportion: this.importList.fActualNumberProportion,
           })
           if (this.detailList[0].fGoodsid) {
             for (let item in this.goodsOptions) {
@@ -7504,7 +7512,7 @@ export default {
           column.property === 'fNetweight' ||
           column.property === 'fQty' ||
           column.property === 'fCntqty' ||
-          column.property === 'fActualWeight'||
+          column.property === 'fActualWeight' ||
           column.property === 'fActualNumber'
         ) {
           sums[index] = values.reduce((prev, curr) => {
@@ -8828,5 +8836,4 @@ export default {
 //.print_table table::after {
 //  content: '';
 //  background: var(--url);
-//}
-</style>
+//}</style>

+ 1 - 1
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -4917,7 +4917,7 @@ export default {
     this.getConfigKey('warehouse.outStockItem.ApprovalFlow').then((response) => {
       this.showMXApproval = response.msg
     })
-    listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
+    listWarehousesss({ fStatus: 0, delFlag: 0, approvalStatus: '审核通过' }).then((response) => {
       this.warehouseOptions = response.rows
     })
     listFees({ fDc: 'C' }).then((response) => {

+ 1 - 1
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -3597,7 +3597,7 @@ export default {
     this.getConfigKey("warehouse.show.feesConfirm").then((response) => {
       this.isShowFeesConfirm = response.msg;
     });
-    listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
+    listWarehousesss({ fStatus: 0, delFlag: 0, approvalStatus: '审核通过' }).then((response) => {
       this.warehouseOptions = response.rows;
     });
     listFees({ fDc: "C" }).then((response) => {

+ 29 - 16
src/views/basicdata/dept/index.vue

@@ -13,7 +13,8 @@
       </el-form-item>
       <el-form-item label="仓库类型" prop="fType">
         <el-select v-model="queryParams.fType" placeholder="仓库类型" clearable size="small">
-          <el-option v-for="dict in fTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
+          <el-option v-for="dict in fTypeOptions" :key="dict.dictValue" :label="dict.dictLabel"
+            :value="dict.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="货物类型" prop="fGoodsType">
@@ -99,7 +100,8 @@
           <el-button size="mini" type="text" icon="el-icon-plus" v-if="scope.row.parentId === 100"
             @click="handleView(scope.row)">查看监控</el-button>
           <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
-            @click="handleDelete(scope.row)" v-hasPermi="['basicdata:warehouse:remove']">删除</el-button>
+            @click="handleDelete(scope.row)" v-hasPermi="['basicdata:warehouse:remove']"
+            :disabled="!(scope.row.approvalStatus == null || scope.row.approvalStatus == '录入')">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -144,7 +146,8 @@
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
+            <span
+              style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
             添加仓库
           </span>
           <div class="avue-crud__dialog__menu enlarge" @click="full">
@@ -154,11 +157,12 @@
         </div>
       </template>
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="form.approvalStatus == '审核通过'||form.approvalStatus == '审核中'">
         <el-row>
           <el-col :span="8" v-if="form.parentId !== 0">
             <el-form-item label="上级仓库" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级仓库" />
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级仓库"
+                :disabled="form.approvalStatus == '审核通过'||form.approvalStatus == '审核中'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -238,7 +242,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="电话" prop="fTel">
-              <el-input v-model="form.fTel" placeholder="请输入电话" oninput='this.value=this.value.replace(/[^\-?\d]/g,"")' />
+              <el-input v-model="form.fTel" placeholder="请输入电话"
+                oninput='this.value=this.value.replace(/[^\-?\d]/g,"")' />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -257,7 +262,8 @@
           <el-col :span="8">
             <el-form-item label="状态">
               <el-radio-group v-model="form.fStatus">
-                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}
+                <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel
+                  }}
                 </el-radio>
               </el-radio-group>
             </el-form-item>
@@ -292,6 +298,11 @@
               <el-input v-model="form.fCoverArea" placeholder="请输入占地面积" @change="nameChange" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="审核状态" prop="approvalStatus">
+              <el-input v-model="form.approvalStatus" placeholder="审核状态" disabled />
+            </el-form-item>
+          </el-col>
         </el-row>
         <!--<el-form-item label="状态,默认 T ,正常T 停用F 下拉选择">
           <el-radio-group v-model="form.fStatus">
@@ -328,17 +339,17 @@
         </el-table-column>
         <el-table-column label="联系人" align="center" prop="contacts">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.contacts" placeholder="联系人" />
+            <el-input v-model="scope.row.contacts" placeholder="联系人" :disabled="form.approvalStatus == '审核通过'||form.approvalStatus == '审核中'" />
           </template>
         </el-table-column>
         <el-table-column label="电话" align="center" prop="tel">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.tel" placeholder="电话" />
+            <el-input v-model="scope.row.tel" placeholder="电话" :disabled="form.approvalStatus == '审核通过'||form.approvalStatus == '审核中'" />
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" placeholder="备注" />
+            <el-input v-model="scope.row.remark" placeholder="备注" :disabled="form.approvalStatus == '审核通过'||form.approvalStatus == '审核中'" />
           </template>
         </el-table-column>
 
@@ -349,15 +360,16 @@
           </template>
         </el-table-column>
       </el-table>
-      <upload-Contract v-if="form.fLocation == 0" :relevantAttachments="relevantAttachments"
-        :createBy="username"></upload-Contract>
+      <upload-Contract v-if="form.fLocation == 0" :relevantAttachments="relevantAttachments" :createBy="username"
+        :browseStatus="form.approvalStatus == '审核通过'||form.approvalStatus == '审核中'"></upload-Contract>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" v-if="$route.query.id&&form.approvalStatus == '审核提交'"
+        <el-button type="primary" v-if="$route.query.id && form.approvalStatus == '审核提交'||form.approvalStatus == '审核中'"
           @click="addOrUpdateHand(form, 'approval_status')">审批
         </el-button>
-        <el-button type="success" @click="approve" v-if="form.fLocation == 0 && form.fId && form.approvalStatus == '录入'">审
+        <el-button type="success" @click="approve"
+          v-if="form.fLocation == 0 && form.fId && (form.approvalStatus == '审核提交' || form.approvalStatus == '录入' || form.approvalStatus == null)">审
           核</el-button>
-        <el-button type="danger" @click="reApprove" v-if="form.approvalStatus == '审核提交'">撤销审核</el-button>
+        <el-button type="danger" @click="reApprove" v-if="form.approvalStatus == '审核提交'||form.approvalStatus == '审核中'||(username=='admin'&&form.approvalStatus == '审核通过')">撤销审核</el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -714,7 +726,7 @@ export default {
       this.dialogVideoList = true;
       this.loading = true;
       let data = {
-        fWarehouseId: row.parentId,
+        fWarehouseId:row.fId,
         // libraryPositionId: row.parentId
       }
       list(data).then(response => {
@@ -1008,6 +1020,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      if (!(row.approvalStatus == null || row.approvalStatus == '录入')) return this.$message.error('不允许删除');
       this.$confirm('是否确认删除名称为"' + row.fName + '"的数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

+ 163 - 321
src/views/index.vue

@@ -6,19 +6,13 @@
           <ul class="block" v-if="sysType == 1 || sysType == 3">
             <li @click="jump('/business/inStock')">
               <div>
-                <i
-                  class="el-icon-download"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-download" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>常规入库</p>
             </li>
             <li @click="jump('/business/outStock')">
               <div>
-                <i
-                  class="el-icon-upload2"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-upload2" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>常规出库</p>
             </li>
@@ -42,55 +36,37 @@
             <!--            </li>-->
             <li @click="jump('/business/goodsTransfer')">
               <div>
-                <i
-                  class="el-icon-takeaway-box"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-takeaway-box" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>货权转移</p>
             </li>
             <li @click="jump('/business/stockTransfer')">
               <div>
-                <i
-                  class="el-icon-connection"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-connection" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>库间调拨</p>
             </li>
             <li @click="smartScreen()" v-if="showDataCenter == 0">
               <div>
-                <i
-                  class="el-icon-s-order"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-s-order" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>数据中心</p>
             </li>
             <li @click="jump('/finance/charge')">
               <div>
-                <i
-                  class="el-icon-wallet"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-wallet" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>收款</p>
             </li>
             <li @click="jump('/finance/payment')">
               <div>
-                <i
-                  class="el-icon-money"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-money" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>付款</p>
             </li>
             <li @click="jump('/finance/contrast')">
               <div>
-                <i
-                  class="el-icon-s-management"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-s-management" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>对账</p>
             </li>
@@ -114,77 +90,42 @@
             <!--            </li>-->
             <li @click="openDialog('inStock')">
               <div>
-                <i
-                  class="el-icon-s-unfold"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-s-unfold" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>快速入库</p>
             </li>
             <li @click="openDialog('outStock')">
               <div>
-                <i
-                  class="el-icon-s-fold"
-                  style="font-size: 25px; text-align: center"
-                ></i>
+                <i class="el-icon-s-fold" style="font-size: 25px; text-align: center"></i>
               </div>
               <p>快速出库</p>
             </li>
           </ul>
-          <el-table
-            ref="remind"
-            :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
-            :cell-style="cellStyle"
-            :data="remindList"
-            height="280"
-          >
-            <el-table-column
-              :show-overflow-tooltip="true"
-              label="协议到期 客户"
-              prop="fCorpid"
-            >
+          <el-table ref="remind" :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }" :cell-style="cellStyle"
+            :data="remindList" height="280">
+            <el-table-column :show-overflow-tooltip="true" label="协议到期 客户" prop="fCorpid">
             </el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              label="开始日期"
-              prop="fBegindate"
-            >
+            <el-table-column :show-overflow-tooltip="true" label="开始日期" prop="fBegindate">
             </el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              label="结束日期"
-              prop="fEnddate"
-            >
+            <el-table-column :show-overflow-tooltip="true" label="结束日期" prop="fEnddate">
             </el-table-column>
-            <el-table-column
-              :show-overflow-tooltip="true"
-              label="类型"
-              prop="fFeetypeid"
-            >
+            <el-table-column :show-overflow-tooltip="true" label="类型" prop="fFeetypeid">
               <template slot-scope="scope">
                 {{ scope.row.fFeetypeid == 0 ? "仓储费协议" : "作业费协议" }}
               </template>
             </el-table-column>
           </el-table>
+
         </div>
         <div style="width: 30%">
           <div style="width: 100%">
             <div style="display: flex">
               <div id="box" style="width: 100%; height: 350px"></div>
 
-              <el-select
-                v-model="select"
-                slot="prepend"
-                size="mini"
-                :select="query()"
-                placeholder="点击切换仓库"
-                style="position: absolute; width: 8%; right: 1%"
-              >
+              <el-select v-model="select" slot="prepend" size="mini" :select="query()" placeholder="点击切换仓库"
+                style="position: absolute; width: 8%; right: 1%">
                 <div v-for="(item, index) in warehouse" :key="index">
-                  <el-option
-                    :label="item.fName"
-                    :value="item.fWarehouseid"
-                  ></el-option>
+                  <el-option :label="item.fName" :value="item.fWarehouseid"></el-option>
                 </div>
               </el-select>
             </div>
@@ -192,10 +133,9 @@
         </div>
       </div>
       <div style="display: flex; margin-bottom: 40px">
-        <div style="width: 70%">
+        <div style="width: 48%;margin-right: 10px;">
           <div>
-            <div
-              style="
+            <div style="
                 display: flex;
                 color: #515a6e;
                 font-weight: 600;
@@ -204,30 +144,22 @@
                 font-size: 13px;
                 justify-content: space-between;
                 border-bottom: 1px dashed #dfe6ec;
-              "
-            >
+              ">
               <div class="home_stock_table">客户</div>
               <div class="home_stock_table">日期</div>
               <div class="home_stock_table">提单号</div>
               <div class="home_stock_table">业务类型</div>
               <div class="home_stock_table_right">
                 <div>操作</div>
-                <el-link type="primary" @click="jump('/morePage/stock')"
-                  >更多></el-link
-                >
+                <el-link type="primary" @click="jump('/morePage/stock')">更多></el-link>
               </div>
             </div>
             <div v-if="tableData.length > 0">
-              <div
-                style="
+              <div style="
                   display: flex;
                   height: 42.6px;
                   border-bottom: 1px dashed #dfe6ec;
-                "
-                v-for="(item, index) in tableData"
-                :key="index"
-                v-if="index < 5"
-              >
+                " v-for="(item, index) in tableData" :key="index" v-if="index < 5">
                 <div class="home_stock_table">
                   <p>{{ item.refno1 }}</p>
                 </div>
@@ -257,17 +189,11 @@
                   <span v-else-if="item.refno2 === 'KHSF'">凯和收费</span>
                   <span v-else-if="item.refno2 === 'KHFF'">凯和付费</span>
                   <span v-else-if="item.refno2 === 'CKSP'">仓库</span>
-                  <span v-else-if="item.refno2 === 'ApplyFP'"
-                    >凯和开票申请</span
-                  >
+                  <span v-else-if="item.refno2 === 'ApplyFP'">凯和开票申请</span>
                   <span v-else-if="item.refno2 === 'KHDD'">凯和订单</span>
                   <span v-else-if="item.refno2 === 'SE'">下单配船</span>
-                  <span v-else-if="item.refno2 === 'SJRKITEM'"
-                    >入库明细审批</span
-                  >
-                  <span v-else-if="item.refno2 === 'SJCKITEM'"
-                    >出库明细审批</span
-                  >
+                  <span v-else-if="item.refno2 === 'SJRKITEM'">入库明细审批</span>
+                  <span v-else-if="item.refno2 === 'SJCKITEM'">出库明细审批</span>
                   <span v-else-if="item.refno2 === 'XGDD'">申请变更</span>
                   <span v-else-if="item.refno2 === 'XGTJ'">提交变更</span>
                   <span v-else-if="item.refno2 === 'DDSC'">申请删单</span>
@@ -277,15 +203,12 @@
                 </div>
               </div>
             </div>
-            <div
-              v-else
-              style="
+            <div v-else style="
                 display: flex;
                 justify-content: center;
                 height: 213px;
                 border-bottom: 1px solid #dfe6ec;
-              "
-            >
+              ">
               <div style="align-self: center; color: #909399; font-size: 14px">
                 暂无数据
               </div>
@@ -344,7 +267,30 @@
             </el-table-column>
           </el-table> -->
         </div>
-        <div style="width: 30%">
+        <div style="width: 50%">
+          <el-table ref="remind" :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }" :cell-style="cellStyle"
+            :data="expirationList" height="256">
+            <el-table-column :show-overflow-tooltip="true" label="客户/仓库名称" prop="name">
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" label="开始日期" prop="startDate">
+              <template slot-scope="scope">
+                <span>{{
+                  scope.row.startDate ? scope.row.startDate.slice(0, 10) : ""
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" label="结束日期" prop="endDate">
+              <template slot-scope="scope">
+                <span>{{
+                  scope.row.endDate ? scope.row.endDate.slice(0, 10) : ""
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" label="类型" prop="type">
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- <div style="width: 30%">
           <el-table
             :data="tableDataTwo"
             :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
@@ -366,37 +312,22 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div style="display: flex">
         <div style="width: 70%">
-          <div
-            id="commoDity"
-            style="width: 100%; height: 350px; margin-left: 40px"
-          ></div>
+          <div id="commoDity" style="width: 100%; height: 350px; margin-left: 40px"></div>
         </div>
         <div style="width: 30%">
           <div id="cargoOwner" style="width: 100%; height: 350px"></div>
         </div>
       </div>
     </div>
-    <el-dialog
-      v-if="sysType == 1 || sysType == 3"
-      title="消息提示"
-      :visible.sync="dialogVisible"
-      width="80%"
-      :before-close="handleClose"
-      :close-on-click-modal="false"
-    >
-      <span
-        v-html="text"
-        class="text"
-        style="max-width: 100%; height: auto"
-      ></span>
+    <el-dialog v-if="sysType == 1 || sysType == 3" title="消息提示" :visible.sync="dialogVisible" width="80%"
+      :before-close="handleClose" :close-on-click-modal="false">
+      <span v-html="text" class="text" style="max-width: 100%; height: auto"></span>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-          >关 闭</el-button
-        >
+        <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
       </span>
     </el-dialog>
     <div class="home-fleet" v-if="sysType == 2">
@@ -405,92 +336,61 @@
           <div slot="content">
             <div class="content-top">
               <div class="content-top-left">
-                <div
-                  style="display: flex; align-self: center; margin-left: 5px"
-                >
+                <div style="display: flex; align-self: center; margin-left: 5px">
                   <div style="align-self: center">
-                    <svg
-                      t="1616396514864"
-                      class="icon"
-                      viewBox="0 0 1024 1024"
-                      version="1.1"
-                      xmlns="http://www.w3.org/2000/svg"
-                      p-id="9805"
-                      width="20"
-                      height="20"
-                    >
+                    <svg t="1616396514864" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                      xmlns="http://www.w3.org/2000/svg" p-id="9805" width="20" height="20">
                       <path
                         d="M314.324 292.999c24.207 0.095 44.072-19.16 44.72-43.36L359.044 52.6c-0.647-24.2-20.512-43.455-44.72-43.36-23.945 0-43.36 19.415-43.36 43.36l0 197.04C271.012 273.567 290.397 292.952 314.324 292.999L314.324 292.999zM707.923 292.999c24.21 0.095 44.07-19.16 44.72-43.36L752.643 52.6c-0.65-24.2-20.51-43.455-44.72-43.36-23.945 0-43.36 19.415-43.36 43.36l0 197.04C664.563 273.584 683.978 292.999 707.923 292.999L707.923 292.999zM402.084 118.36l219.279 0 0 65.6L402.084 183.96 402.084 118.36 402.084 118.36zM878.003 118.36l-81.52 0 0 65.2 84.64 0c25.2 0.345 45.535 20.72 45.84 45.92l0 152L96.085 381.48 96.085 229.56c0.48-25.232 21-45.472 46.24-45.6l85.2 0 0-65.6-81.36 0c-63.345 0.265-114.592 51.615-114.72 114.96l0 666.558c-0.752 62.69 49.455 114.12 112.152 114.87 0.16 0 0.328 0 0.488 0.01l733.758 0c63.31-0.265 114.545-51.57 114.72-114.88L992.563 233.32C992.432 170.04 941.282 118.712 878.003 118.36L878.003 118.36zM497.929 810.758c-74.175 0.185-134.465-59.815-134.645-133.995-0.177-74.175 59.815-134.465 133.995-134.645 74.175-0.18 134.46 59.815 134.645 133.995 0 0.11 0 0.215 0 0.325C632.023 750.533 572.023 810.658 497.929 810.758L497.929 810.758 497.929 810.758z"
-                        p-id="9806"
-                        fill="#000000"
-                      ></path>
+                        p-id="9806" fill="#000000"></path>
                     </svg>
                   </div>
-                  <div
-                    style="
+                  <div style="
                       align-self: center;
                       font-size: 16px;
                       margin: 2px 0 0 5px;
-                    "
-                  >
+                    ">
                     今日新增柜数
                   </div>
                 </div>
-                <div
-                  style="
+                <div style="
                     font-size: 36px;
                     align-self: center;
                     font-weight: 600;
                     color: #014da1;
-                  "
-                >
+                  ">
                   {{ upperLeftCntrs.planQuantity }}
                 </div>
               </div>
               <div class="content-top-right">
-                <div
-                  style="
+                <div style="
                     display: flex;
                     align-self: center;
                     min-width: 120px;
                     margin-left: 5px;
-                  "
-                >
+                  ">
                   <div style="align-self: center">
-                    <svg
-                      t="1616400289333"
-                      class="icon"
-                      viewBox="0 0 1024 1024"
-                      version="1.1"
-                      xmlns="http://www.w3.org/2000/svg"
-                      p-id="22417"
-                      width="20"
-                      height="20"
-                    >
+                    <svg t="1616400289333" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                      xmlns="http://www.w3.org/2000/svg" p-id="22417" width="20" height="20">
                       <path
                         d="M864.425973 1023.936004 228.305731 1023.936004c-114.296856 0-130.871821-105.529404-133.111681-128.439973l-0.383976-0.575964 0.31998 0c-0.255984-2.367852-0.31998-4.031748-0.31998-4.031748l0-12.351228c-60.604212-36.093744-64.059996-115.320792-64.059996-115.320792L30.750078 126.328104C30.814074 3.967752 158.934067 0 158.934067 0l643.415787 0c64.63596 0 96.441972 38.269608 112.120992 72.63546 71.931504 28.47822 78.779076 117.496656 78.779076 117.496656l0 700.756203C993.249922 890.952315 974.56309 1023.936004 864.425973 1023.936004L864.425973 1023.936004 864.425973 1023.936004zM479.298044 256.687957l0 191.476033L222.994063 448.16399 222.994063 511.968002l256.303981 0 0 191.476033 256.303981-223.410037L479.298044 256.687957 479.298044 256.687957 479.298044 256.687957zM927.782014 129.015937l-64.059996 0 0 748.433223 0 17.470908-46.07712 0L158.934067 894.920067 158.934067 895.944003l0 62.844072 704.787951 0 64.059996 0L927.782014 129.015937 927.782014 129.015937zM927.782014 129.015937"
-                        p-id="22418"
-                      ></path>
+                        p-id="22418"></path>
                     </svg>
                   </div>
-                  <div
-                    style="
+                  <div style="
                       align-self: center;
                       font-size: 16px;
                       margin: 2px 0 0 5px;
-                    "
-                  >
+                    ">
                     未安排柜数
                   </div>
                 </div>
-                <div
-                  style="
+                <div style="
                     font-size: 36px;
                     align-self: center;
                     font-weight: 600;
                     color: #014da1;
-                  "
-                >
+                  ">
                   {{ upperLeftCntrs.surplusQuantity }}
                 </div>
               </div>
@@ -498,128 +398,82 @@
             <div class="content-bottom">
               <div style="display: flex; align-self: center; margin-left: 5px">
                 <div style="align-self: center">
-                  <svg
-                    t="1616402886142"
-                    class="icon"
-                    viewBox="0 0 1024 1024"
-                    version="1.1"
-                    xmlns="http://www.w3.org/2000/svg"
-                    p-id="31596"
-                    width="24"
-                    height="24"
-                  >
+                  <svg t="1616402886142" class="icon" viewBox="0 0 1024 1024" version="1.1"
+                    xmlns="http://www.w3.org/2000/svg" p-id="31596" width="24" height="24">
                     <path
                       d="M55.3 594.7V851c0 11 9 20 20 20h3.1c10 0 18.3-7.4 19.8-17.2 8.3-55.3 56.1-97.8 113.7-97.8s105.4 42.4 113.7 97.8c1.5 9.9 9.8 17.2 19.8 17.2H386c11 0 20-9 20-20V407c0-11-9-20-20-20H280c-33.1 0-64.8 13.7-87.5 37.9L71.6 553.7c-10.5 11.1-16.3 25.8-16.3 41zM336 478v144c0 11-9 20-20 20H145.3c-11 0-20-9-20-20v-13.6c0-10.5 4.2-20.7 11.6-28.1l85.9-86.7c22.5-22.8 53.2-35.6 85.3-35.6h7.9c11 0 20 8.9 20 20zM467.3 257v574c0 22.1 17.9 40 40 40h175.1c10 0 18.3-7.4 19.8-17.2 8.3-55.3 56.1-97.8 113.7-97.8 63.5 0 115 51.5 115 115 20.4 0 37-16.6 37-37V257c0-22.1-17.9-40-40-40H507.3c-22.1 0-40 17.9-40 40z"
-                      p-id="31597"
-                    ></path>
+                      p-id="31597"></path>
                     <path
                       d="M213.5 797c-45.4-0.8-82.3 36.1-81.5 81.5 0.8 42.8 35.7 77.7 78.5 78.5 45.4 0.8 82.3-36.1 81.5-81.5-0.8-42.8-35.7-77.7-78.5-78.5zM817.5 797c-45.4-0.8-82.3 36.1-81.5 81.5 0.8 42.8 35.7 77.7 78.5 78.5 45.4 0.8 82.3-36.1 81.5-81.5-0.8-42.8-35.7-77.7-78.5-78.5z"
-                      p-id="31598"
-                    ></path>
+                      p-id="31598"></path>
                   </svg>
                 </div>
-                <div
-                  style="
+                <div style="
                     align-self: center;
                     font-size: 16px;
                     margin: 2px 0 0 5px;
                     width: 110px;
-                  "
-                >
+                  ">
                   今日派车数
                 </div>
               </div>
-              <div
-                style="
+              <div style="
                   font-size: 36px;
                   align-self: center;
                   font-weight: 600;
                   color: #014da1;
-                "
-              >
+                ">
                 {{ fleetData.upperLeftCarQuantity }}
               </div>
               <div style="align-self: center; color: #409eff">派车详情></div>
             </div>
             <div class="content-bottom">
-              <div
-                style="
+              <div style="
                   display: flex;
                   align-self: center;
                   min-width: 120px;
                   margin-left: 5px;
-                "
-              >
+                ">
                 <div style="align-self: center">
-                  <svg
-                    t="1616402771353"
-                    class="icon"
-                    viewBox="0 0 1048 1024"
-                    version="1.1"
-                    xmlns="http://www.w3.org/2000/svg"
-                    p-id="29149"
-                    width="20"
-                    height="20"
-                  >
+                  <svg t="1616402771353" class="icon" viewBox="0 0 1048 1024" version="1.1"
+                    xmlns="http://www.w3.org/2000/svg" p-id="29149" width="20" height="20">
                     <path
                       d="M880.931574 1.385265c-82.95439-11.745754-55.058223 55.058223-55.058224 55.058223l60.931101 83.6885c88.093157 106.445898-33.034934 81.486171-33.034934 81.48617-77.081513 36.705482 0 82.95439 0 82.95439h110.116447v496.99223c-49.185346 69.740416-82.95439 0-82.95439 0V470.481328a106.445898 106.445898 0 0 0-82.95439-110.116447H715.022794a34.503153 34.503153 0 0 1-27.896167-27.896166V84.339655c0-41.11014-18.352741-51.387675-54.324113-53.590004S198.209604 30.749651 135.810284 30.749651a55.058223 55.058223 0 0 0-54.324113 55.058223v828.075679c-163.706451 56.526443-27.896166 110.116447-27.896167 110.116447h690.063066c107.914118-73.410964-55.058223-110.116447-55.058223-110.116447v-440.465787l4.404658-4.404657a73.410964 73.410964 0 0 1 105.711788 4.404657v357.511397a122.596311 122.596311 0 0 0 55.058224 82.95439h110.116447a198.209604 198.209604 0 0 0 82.954389-82.95439v-660.69868zM610.045115 345.682688a34.503153 34.503153 0 0 1-34.503154 34.503154H191.602617a34.503153 34.503153 0 0 1-34.503153-34.503154V148.207194a34.503153 34.503153 0 0 1 34.503153-34.503153h383.939344a34.503153 34.503153 0 0 1 34.503154 34.503153z"
-                      p-id="29150"
-                    ></path>
+                      p-id="29150"></path>
                   </svg>
                 </div>
-                <div
-                  style="
+                <div style="
                     align-self: center;
                     font-size: 16px;
                     margin: 2px 0 0 5px;
                     width: 110px;
-                  "
-                >
+                  ">
                   可用车辆数
                 </div>
               </div>
-              <div
-                style="
+              <div style="
                   font-size: 36px;
                   align-self: center;
                   font-weight: 600;
                   color: #014da1;
-                "
-              >
+                ">
                 {{ fleetData.upperLeftOldCarQuantity }}
               </div>
               <div style="align-self: center; color: #409eff">派车详情></div>
             </div>
           </div>
         </chi-card>
-        <chi-card
-          title="新闻公告"
-          iconName="el-icon-s-cooperation"
-          :More="true"
-          @seeMore="jumpMoreNews"
-        >
+        <chi-card title="新闻公告" iconName="el-icon-s-cooperation" :More="true" @seeMore="jumpMoreNews">
           <div slot="content" style="height: 260px" class="jingrun-news">
-            <div
-              style="padding: 4px 15px; font-size: 14px"
-              v-for="(item, index) in tableDataTwo"
-              :key="index"
-              :style="{
-                backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
-              }"
-              @click="openNewsDetails(item.noticeId)"
-            >
+            <div style="padding: 4px 15px; font-size: 14px" v-for="(item, index) in tableDataTwo" :key="index" :style="{
+              backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
+            }" @click="openNewsDetails(item.noticeId)">
               <span style="cursor: pointer">{{ item.noticeTitle }}</span>
             </div>
           </div>
         </chi-card>
       </div>
-      <el-dialog
-        title="新闻公告"
-        :visible.sync="newsVisible"
-        width="700px"
-        v-dialogDrag
-        :close-on-click-modal="false"
-      >
+      <el-dialog title="新闻公告" :visible.sync="newsVisible" width="700px" v-dialogDrag :close-on-click-modal="false">
         <h3>{{ newsDetails.noticeTitle }}</h3>
         <p class="html-box" v-html="newsDetails.noticeContent"></p>
         <span slot="footer">
@@ -629,14 +483,10 @@
       <div class="home-right">
         <chi-card title="运行车辆" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
-            <div
-              style="display: flex; padding: 4px 15px; font-size: 14px"
-              v-for="(item, index) in upperRights"
-              :key="index"
-              :style="{
+            <div style="display: flex; padding: 4px 15px; font-size: 14px" v-for="(item, index) in upperRights"
+              :key="index" :style="{
                 backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
-              }"
-            >
+              }">
               <div style="width: 30%" @click="goPage(item.id)">
                 <el-link type="primary" :underline="false">{{
                   item.mblno
@@ -646,14 +496,12 @@
               <div style="width: 15%; color: #67c23a">
                 {{ item.orderStatus | statusType }}
               </div>
-              <div
-                style="
+              <div style="
                   width: 35%;
                   overflow: hidden;
                   text-overflow: ellipsis;
                   white-space: nowrap;
-                "
-              >
+                ">
                 {{ item.corpName }}
               </div>
             </div>
@@ -661,14 +509,12 @@
         </chi-card>
         <chi-card title="业务待办" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right2">
-            <div
-              style="
+            <div style="
                 font-size: 14px;
                 display: flex;
                 margin: 4px 15px;
                 border-bottom: 1px dashed #e6ebf5;
-              "
-            >
+              ">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
@@ -725,16 +571,8 @@
         <el-table :data="bookingData">
           <el-table-column prop="fName" align="center" label="船名" />
           <el-table-column prop="fNo" align="center" label="航次" />
-          <el-table-column
-            prop="portofloadName"
-            align="center"
-            label="起运港"
-          />
-          <el-table-column
-            prop="distinationName"
-            align="center"
-            label="目的港"
-          />
+          <el-table-column prop="portofloadName" align="center" label="起运港" />
+          <el-table-column prop="distinationName" align="center" label="目的港" />
           <el-table-column prop="fWeight" align="center" label="容量TEU" />
           <el-table-column prop="boxNumber" align="center" label="实装TEU" />
           <el-table-column prop="fETD" align="center" label="预计开船">
@@ -770,8 +608,7 @@
       </div>
       <div style="width: 100%">
         <div style="width: 49%; float: left">
-          <div
-            style="
+          <div style="
               display: flex;
               color: #515a6e;
               font-weight: 600;
@@ -780,8 +617,7 @@
               font-size: 13px;
               justify-content: space-between;
               border-bottom: 1px dashed #dfe6ec;
-            "
-          >
+            ">
             <div class="home_stock_table">委托方</div>
             <div class="home_stock_table">日期</div>
             <div class="home_stock_table">提单号</div>
@@ -789,22 +625,15 @@
             <div class="home_stock_table">金额</div>
             <div class="home_stock_table_right">
               <div>操作</div>
-              <el-link type="primary" @click="jump('/morePage/stock')"
-                >更多></el-link
-              >
+              <el-link type="primary" @click="jump('/morePage/stock')">更多></el-link>
             </div>
           </div>
           <div v-if="tableData.length > 0">
-            <div
-              style="
+            <div style="
                 display: flex;
                 height: 42.6px;
                 border-bottom: 1px dashed #dfe6ec;
-              "
-              v-for="(item, index) in tableData"
-              :key="index"
-              v-if="index < 5"
-            >
+              " v-for="(item, index) in tableData" :key="index" v-if="index < 5">
               <div class="home_stock_table">
                 <p>{{ item.refno1 }}</p>
               </div>
@@ -847,39 +676,24 @@
               </div>
             </div>
           </div>
-          <div
-            v-else
-            style="
+          <div v-else style="
               display: flex;
               justify-content: center;
               height: 213px;
               border-bottom: 1px solid #dfe6ec;
-            "
-          >
+            ">
             <div style="align-self: center; color: #909399; font-size: 14px">
               暂无数据
             </div>
           </div>
         </div>
         <div style="width: 49%; float: right">
-          <el-table
-            :data="tableDataTwo"
-            :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
-            :cell-style="cellStyle"
-            style="margin-left: 20px"
-          >
-            <el-table-column
-              prop="noticeTitle"
-              :show-overflow-tooltip="true"
-              label="消息中心"
-            />
+          <el-table :data="tableDataTwo" :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
+            :cell-style="cellStyle" style="margin-left: 20px">
+            <el-table-column prop="noticeTitle" :show-overflow-tooltip="true" label="消息中心" />
             <el-table-column prop="address" label="操作" width="80">
               <template slot-scope="scope">
-                <span
-                  @click="querytoDo(scope.row.noticeContent)"
-                  style="cursor: pointer"
-                  >查看详情</span
-                >
+                <span @click="querytoDo(scope.row.noticeContent)" style="cursor: pointer">查看详情</span>
               </template>
             </el-table-column>
           </el-table>
@@ -903,17 +717,9 @@
       <div id="arrears" style="width: 100%; height: 600px"></div>
     </div>
     <!--快捷入库-->
-    <fast-in-stock
-      ref="fastInStock"
-      v-if="fastInStockVisble"
-      @closeDialog="closeInStock"
-    ></fast-in-stock>
+    <fast-in-stock ref="fastInStock" v-if="fastInStockVisble" @closeDialog="closeInStock"></fast-in-stock>
     <!--快速出库-->
-    <fast-out-stock
-      ref="fastOutStock"
-      v-if="fastOutStockVisble"
-      @closeDialog="closeOutStock"
-    ></fast-out-stock>
+    <fast-out-stock ref="fastOutStock" v-if="fastOutStockVisble" @closeDialog="closeOutStock"></fast-out-stock>
   </div>
 </template>
 
@@ -933,6 +739,7 @@ import {
   remindExpirationData,
   getFeeStatistics,
   getArrearsStatistics,
+  expirationReminder
 } from "../../src/api/index";
 import Cookies from "js-cookie";
 import fastInStock from "../../src/components/fastStorage/fastInStock/index";
@@ -945,6 +752,7 @@ export default {
   name: "index",
   data() {
     return {
+      expirationList: [],
       fastInStockVisble: false,
       fastOutStockVisble: false,
       wealthChart: false,
@@ -1051,6 +859,7 @@ export default {
     this.getList();
     this.warehouses();
     this.inquiry();
+    this.getExpirationReminder()
     if (this.sysType == 1) {
       remindExpirationData().then((res) => {
         this.remindList = res.rows;
@@ -1714,6 +1523,11 @@ export default {
         this.firstinventory(this.warehouse[0].fWarehouseid);
       });
     },
+    getExpirationReminder() {
+      expirationReminder().then((response) => {
+        this.expirationList = response.data
+      });
+    },
     goTarget(href) {
       window.open(href, "_blank");
     },
@@ -1938,7 +1752,7 @@ export default {
               {
                 value: parseFloat(
                   this.chart.whouseList[0].fTotalgross -
-                    this.chart.whouseList[0].fGrossweightD
+                  this.chart.whouseList[0].fGrossweightD
                 ).toFixed(1),
                 name: "空闲库容",
               },
@@ -2008,9 +1822,9 @@ export default {
             if (response.msg) {
               window.open(
                 "http://114.115.238.226:9527/view/" +
-                  response.msg +
-                  "?Authorization=" +
-                  getToken()
+                response.msg +
+                "?Authorization=" +
+                getToken()
               );
             } else {
               return this.$message.warning("模板开发中");
@@ -2122,6 +1936,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-around;
+
   li div:hover {
     background-color: #025184;
   }
@@ -2148,6 +1963,7 @@ export default {
     text-align: center;
     cursor: pointer;
     margin-bottom: 15px;
+
     div {
       //margin-top: 18px;
       background-color: #1c84c6;
@@ -2158,6 +1974,7 @@ export default {
       align-items: center;
       justify-content: center;
     }
+
     p {
       font-size: 10px;
     }
@@ -2188,7 +2005,11 @@ export default {
     margin: 0;
   }
 
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "open sans",
+  "Helvetica Neue",
+  Helvetica,
+  Arial,
+  sans-serif;
   font-size: 13px;
   color: #676a6c;
   overflow-x: hidden;
@@ -2227,18 +2048,23 @@ export default {
     }
   }
 }
+
 .home-fleet {
   display: flex;
+
   .home-left {
     width: 40%;
     padding: 0 10px;
   }
+
   .home-right {
     width: 60%;
     padding: 0 10px;
   }
+
   .content-top {
     display: flex;
+
     .content-top-left {
       display: flex;
       width: 50%;
@@ -2248,6 +2074,7 @@ export default {
       padding: 10px;
       justify-content: space-between;
     }
+
     .content-top-right {
       display: flex;
       width: 50%;
@@ -2257,6 +2084,7 @@ export default {
       justify-content: space-between;
     }
   }
+
   .content-bottom {
     display: flex;
     height: 81px;
@@ -2264,31 +2092,38 @@ export default {
     padding: 10px;
     justify-content: space-between;
   }
+
   .content-bottom:last-child {
     border-bottom: 0px;
   }
+
   .upper-right {
     padding: 10px 0;
     //height: 260px;
     height: 417px;
   }
+
   .upper-right2 {
     padding: 10px 0;
     height: 104px;
   }
 }
+
 .single_line {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
 @media screen and (max-width: 920px) {
   .home-fleet {
     display: flex;
     flex-direction: column;
+
     .home-left {
       width: 100%;
     }
+
     .home-right {
       width: 100%;
     }
@@ -2300,11 +2135,13 @@ export default {
   max-width: 100%;
   height: auto;
 }
+
 .home_stock_table {
   display: flex;
   width: 20%;
   justify-content: center;
   align-self: center;
+
   p {
     display: inline-block;
     white-space: nowrap;
@@ -2313,22 +2150,27 @@ export default {
     text-overflow: ellipsis;
   }
 }
+
 .home_stock_table:hover {
   color: #1c84c6;
   cursor: pointer;
 }
+
 .home_stock_table_right {
   display: flex;
   width: 20%;
   justify-content: space-around;
   align-self: center;
 }
+
 .jingrun-news {
   overflow: auto;
 }
+
 .html-box p {
   width: 100%;
 }
+
 .html-box p img {
   display: block;
   margin: 0 auto;

+ 12 - 4
src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -133,7 +133,7 @@
         <el-col :span="8">
           <el-form-item label="仓库名称" prop="fWarehouseFid" :rules="[{ required: true, message: '不能为空' }]">
             <el-select v-model="form.fWarehouseFid" filterable style="width:100%;" placeholder="请选择仓库名称">
-              <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+              <el-option v-for="(item, index) in warehouseOptions2" :key="index.fId" :label="item.fName"
                 :value="item.fId"></el-option>
             </el-select>
           </el-form-item>
@@ -204,7 +204,7 @@
         <el-table-column label="仓库名称" align="center" prop="fWarehouseFid">
           <template slot-scope="scope">
             <el-select v-model="scope.row.fWarehouseFid" filterable placeholder="请选择仓库名称">
-              <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+              <el-option v-for="(item, index) in warehouseOptions2" :key="index.fId" :label="item.fName"
                 :value="item.fId"></el-option>
             </el-select>
           </template>
@@ -303,7 +303,7 @@
     </div>
     <div slot="footer" class="dialog-footer">
     </div>
-    <el-dialog title="图片明细" :visible.sync="opentwo" append-to-body width="70%">
+    <el-dialog title="图片明细" :visible.sync="opentwo" append-to-body width="70%" @close="close">
       <el-form ref="form" :model="twarehousecheckdetailList" label-width="80px"
         style="display:flex;flex-wrap: wrap;justify-content: space-between">
         <el-form-item label="仓库名称" prop="fWarehouseFid">
@@ -384,6 +384,7 @@ export default {
       patrolInspection: [],
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
       warehouseOptions: [],
+      warehouseOptions2: [],
       fPlanneddate: [],
       fileList: [],
       dialogImageUrl: '',
@@ -565,11 +566,14 @@ export default {
     })
     selectUserByRole().then(res => {
       this.patrolInspection = res.rows
-      console.log(res)
+      console.log(res,1111111111111)
     })
     listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
       this.warehouseOptions = response.rows;
     });
+    listWarehousesss({ fStatus: 0, delFlag: 0, approvalStatus: '审核通过' }).then((response) => {
+      this.warehouseOptions2 = response.rows;
+    });
     this.getList();
   },
   mounted() {
@@ -581,6 +585,10 @@ export default {
     })
   },
   methods: {
+    close(){
+      this.twarehousecheckdetailList={}
+      this.fileList=[]
+    },
     selectionChange(list) {
       this.selectionList = list
     },