Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/api/index.js

@@ -69,3 +69,11 @@ export function getProfitData(query){
     params: query
   })
 }
+// 协议到期提醒
+export function remindExpirationData(query){
+  return request({
+    url:'/warehouseBusiness/agreement/remindList',
+    method:'get',
+    params: query
+  })
+}

src/views/Warehousing/components/payMoney.vue

@@ -27,7 +27,7 @@
         <el-button
           type="danger"
           size="small"
-          @click.prevent="handleSelect"
+          @click.prevent="handleSelect(1)"
           >作业费协议</el-button
         >
         <el-button
@@ -840,6 +840,7 @@ export default {
       isShowInvoice: null,
       // 是否启用费用确认单
       isShowFeesConfirm: null,
+      activeIndex: '1'
     };
   },
   created() {
@@ -1004,7 +1005,7 @@ export default {
       }
       this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
     },
-    handleSelect() {
+    handleSelect(key) {
       if (!this.form.fCorpid) {
         this.$message({
           message: "请维护客户",
@@ -1021,19 +1022,29 @@ export default {
         this.dialogWhgenlegList = [];
         this.whgenlegTotal = 0;
         this.warehousingagreements = true;
-        this.getWhgenlegList();
+        this.getWhgenlegList(key);
       }
     },
     // 查询作业费信息
-    getWhgenlegList() {
+    getWhgenlegList(key) {
       let data = {};
-      this.Navigation = false;
-      data = {
-        pageNum: this.pageNum,
-        pageSize: this.pageSize,
-        fTaskType: 1,
-        fFleet: this.form.fFleet,
-      };
+      if (key == 1) {
+        this.Navigation = true;
+        data = {
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+          fTaskType: 1,
+          fFleet: this.form.fFleet,
+        };
+      } else if (key == 2) {
+        this.Navigation = true;
+        data = {
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
+          fTaskType: 2,
+          fLabour: this.form.fLabour,
+        };
+      }
       operationAgreement(data).then((response) => {
         response.rows.map((e) => {
           if (e.fFeeUnitid) {
@@ -1087,6 +1098,7 @@ export default {
             fStltypeid: '1',
           });
         });
+        this.Navigation = false;
         this.warehousingagreements = false;
       }
     },

src/views/Warehousing/components/upLoad.vue

@@ -111,9 +111,8 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button size="small" type="text" @click="checkFile(scope)"
-          >查看</el-button
-          >
+          <el-button size="small" type="text" @click="checkFile(scope,0)"
+          >查看</el-button>
           <el-button
             @click.native.prevent="deleteRow(scope.$index, relevantAttachments)"
             :disabled="browseStatus"
@@ -121,9 +120,20 @@
             type="text"
             >删除
           </el-button>
+          <el-button size="small" type="text" @click="checkFile(scope,1)"
+          >下载</el-button>
         </template>
       </el-table-column>
     </el-table>
+    <el-dialog
+        width="80%"
+        title="附件"
+        :visible.sync="innerVisible"
+        append-to-body>
+      <div style="width: 50%;height: 50%;margin: 0 auto">
+        <img :src="url" alt="" style="width: 100%;height: 100%;">
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -147,6 +157,8 @@ export default {
   },
   data() {
     return {
+      innerVisible:false,
+      url:'',
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -177,9 +189,18 @@ export default {
       }
     },
     //附件查看
-    checkFile(scope) {
+    checkFile(scope,type) {
       if (this.relevantAttachments[scope.$index].fUrl) {
-        window.open(this.relevantAttachments[scope.$index].fUrl);
+        if(type === 0){
+          if (scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.jpg'||scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.png'||scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.JPG'||scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.PNG'){
+            this.innerVisible = true
+            this.url = this.relevantAttachments[scope.$index].fUrl
+          }else {
+            window.open(this.relevantAttachments[scope.$index].fUrl);
+          }
+        }else if(type === 1){
+          window.open(this.relevantAttachments[scope.$index].fUrl);
+        }
       } else {
         this.$message.error("请上传附件");
       }

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -9378,6 +9378,7 @@ export default {
           this.printFeeConfirm.fTax = res.data.corp.fTax
         })
       } else {
+        // this.form.fCompany = null
         this.fCompanyName = ''
         this.printFeeConfirm = {
           fAddr: '',

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -4885,10 +4885,10 @@ export default {
       this.unloadModes = response.data;
     });
     this.company = Cookies.get("companyName")
+    this.$set(this.form, 'fBstime', Date.parse(new Date()));
     this.queryUser();
     this.getRow();
     this.getRow2();
-    this.form.fBstime = Date.parse(new Date());
   },
   activated() {
     this.getDicts("st_out_type").then((response) => {
@@ -6329,20 +6329,20 @@ export default {
           if (e.fShipper) {
             fShipper.push(e.fShipper)
           }
-          if (e.fPlanqty) {
-            fPlanqty += e.fPlanqty
+          if (e.fQty) {
+            fPlanqty = Number(e.fQty) + Number(fPlanqty)
           }
-          if (e.fPlannetweight) {
-            fPlannetweight += e.fPlannetweight
+          if (e.fGrossweight) {
+            fPlannetweight = Number(e.fGrossweight) + Number(fPlannetweight)
           }
-          if (e.fPlangrossweight) {
-            fPlangrossweight += e.fPlangrossweight
+          if (e.fNetweight) {
+            fPlangrossweight = Number(e.fNetweight) + Number(fPlangrossweight)
           }
         });
         // 如果计划件数、计划净重、计划毛重 为空或为0带入明细
         this.form.fPlanqty == 0 || !this.form.fPlanqty? this.$set(this.form, "fPlanqty", fPlanqty): 0
-        this.form.fPlannetweight == 0 || !this.form.fPlannetweight? this.$set(this.form, "fPlannetweight", fPlanqty): 0
-        this.form.fPlangrossweight == 0 || !this.form.fPlangrossweight? this.$set(this.form, "fPlangrossweight", fPlanqty): 0
+        this.form.fPlannetweight == 0 || !this.form.fPlannetweight? this.$set(this.form, "fPlannetweight", fPlannetweight): 0
+        this.form.fPlangrossweight == 0 || !this.form.fPlangrossweight? this.$set(this.form, "fPlangrossweight", fPlangrossweight): 0
         this.$set(this.form, "fShipper", [...new Set(fShipper)].join(","))
         this.$set(this.form, "fMarks", [...new Set(fMarks)].join(","));
         this.$set(
@@ -6904,7 +6904,6 @@ export default {
     },
     // 查询作业费信息
     getWhgenlegList(key) {
-      console.log(key)
       let data = {};
       if (key == 2) {
         this.key_id = key;

src/views/index.vue

@@ -8,19 +8,19 @@
               <div>
                 <i
                   class="el-icon-download"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>常规入库</p>
               </div>
+              <p>常规入库</p>
             </li>
             <li @click="jump('/business/outStock')">
               <div>
                 <i
                   class="el-icon-upload2"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>常规出库</p>
               </div>
+              <p>常规出库</p>
             </li>
 <!--            <li @click="jump('/basicdata/corps')">-->
 <!--              <div>-->
@@ -44,55 +44,55 @@
               <div>
                 <i
                   class="el-icon-takeaway-box"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>货权转移</p>
               </div>
+              <p>货权转移</p>
             </li>
             <li @click="jump('/business/stockTransfer')">
               <div>
                 <i
                   class="el-icon-connection"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>库间调拨</p>
               </div>
+              <p>库间调拨</p>
             </li>
             <li @click="smartScreen()">
               <div>
                 <i
                     class="el-icon-s-order"
-                    style="font-size: 50px; text-align: center"
+                    style="font-size: 25px; text-align: center"
                 ></i>
-                <p>数据中心</p>
               </div>
+              <p>数据中心</p>
             </li>
             <li @click="jump('/finance/charge')">
               <div>
                 <i
                   class="el-icon-wallet"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>收款</p>
               </div>
+              <p>收款</p>
             </li>
             <li @click="jump('/finance/payment')">
               <div>
                 <i
                   class="el-icon-money"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>付款</p>
               </div>
+              <p>付款</p>
             </li>
             <li @click="jump('/finance/contrast')">
               <div>
                 <i
                   class="el-icon-s-management"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>对账</p>
               </div>
+              <p>对账</p>
             </li>
 <!--            <li @click="jump('/business/goodsTransfer')">-->
 <!--              <div>-->
@@ -116,21 +116,40 @@
               <div>
                 <i
                   class="el-icon-s-unfold"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>快速入库</p>
               </div>
+              <p>快速入库</p>
             </li>
             <li @click="openDialog('outStock')">
               <div>
                 <i
                   class="el-icon-s-fold"
-                  style="font-size: 50px; text-align: center"
+                  style="font-size: 25px; text-align: center"
                 ></i>
-                <p>快速出库</p>
               </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-column>
+            <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>
+            <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%">
@@ -847,7 +866,8 @@ import {
   shipDynamics,
   bookingSpace,
   locationRanking,
-  getProfitData
+  getProfitData,
+  remindExpirationData
 } from "../../src/api/index";
 import Cookies from "js-cookie";
 import fastInStock from '../../src/components/fastStorage/fastInStock/index'
@@ -902,6 +922,7 @@ export default {
         noticeTitle: '',
         noticeContent: ''
       },
+      remindList: [],
     };
   },
   filters: {
@@ -958,6 +979,9 @@ export default {
     this.getList();
     this.warehouses();
     this.inquiry();
+    remindExpirationData().then(res => {
+     this.remindList = res.rows
+    })
     this.dataList.addressName = []
     this.dataList.boxNumber = []
     this.dataList.bookingRanking.text = []
@@ -1660,9 +1684,14 @@ export default {
     },
     smartScreen(){
       currentLogin().then(res=>{
-        if (res.data.userName === 'admin'){
+        const role = res.data.roles.some(item => item.roleKey == 'admin' || item.roleKey == 'IDC')
+        if (role){
           this.getConfigKey("large.screen").then((response) => {
-            window.open( 'http://119.3.74.195:9527/view/'+ response.msg +'?Authorization=' + getToken())
+            if (response.msg) {
+              window.open( 'http://119.3.74.195:9527/view/'+ response.msg +'?Authorization=' + getToken())
+            } else {
+              return this.$message.warning('模板开发中')
+            }
           });
         }else {
           this.$message.warning('您无此权限查看面板');
@@ -1767,42 +1796,44 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-around;
-  li:hover {
+  li div:hover {
     background-color: #025184;
   }
 
-  li:nth-child(6),
-  li:nth-child(7),
-  li:nth-child(8),
-  li:nth-child(9),
-  li:nth-child(10) {
+  li:nth-child(6) div,
+  li:nth-child(7) div,
+  li:nth-child(8) div,
+  li:nth-child(9) div,
+  li:nth-child(10) div {
     background-color: #2f4554;
   }
 
-  li:nth-child(6):hover,
-  li:nth-child(7):hover,
-  li:nth-child(8):hover,
-  li:nth-child(9):hover,
-  li:nth-child(10):hover {
+  li:nth-child(6) div:hover,
+  li:nth-child(7) div:hover,
+  li:nth-child(8) div:hover,
+  li:nth-child(9) div:hover,
+  li:nth-child(10) div:hover {
     background-color: #2f4454d1;
   }
 
   li {
-    width: 18%;
-    height: 150px;
-    background-color: #1c84c6;
+    width: 8%;
     margin-left: 10px;
     text-align: center;
-    color: #ffffff;
-    border-radius: 10px;
     cursor: pointer;
     margin-bottom: 15px;
     div {
-      margin-top: 40px;
-
-      p {
-        font-size: 20px;
-      }
+      //margin-top: 18px;
+      background-color: #1c84c6;
+      color: #ffffff;
+      border-radius: 10px;
+      height: 35px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    p {
+      font-size: 10px;
     }
   }
 }

src/views/login.vue

@@ -2,6 +2,9 @@
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
       <h3 class="title">途宝智慧云仓平台</h3>
+<!--      靖润-->
+<!--      <h3 class="title" style="font-family: '微软雅黑 Light'; color: #265EE4">靖润科技陆运平台</h3>-->
+
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
 <!--          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />-->
@@ -21,21 +24,21 @@
           <i slot="prefix" class="el-icon-lock" style="font-size: 20px;padding-top: 11px;padding-left: 2px;color: #565656;"></i>
         </el-input>
       </el-form-item>
-      <el-form-item prop="code">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
-<!--          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
-          <i slot="prefix" class="el-icon-connection" style="font-size: 20px;padding-top: 11px;padding-left: 2px;color: #565656;"></i>
-        </el-input>
-        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-      </el-form-item>
+<!--      <el-form-item prop="code">-->
+<!--        <el-input-->
+<!--          v-model="loginForm.code"-->
+<!--          auto-complete="off"-->
+<!--          placeholder="验证码"-->
+<!--          style="width: 63%"-->
+<!--          @keyup.enter.native="handleLogin"-->
+<!--        >-->
+<!--&lt;!&ndash;          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />&ndash;&gt;-->
+<!--          <i slot="prefix" class="el-icon-connection" style="font-size: 20px;padding-top: 11px;padding-left: 2px;color: #565656;"></i>-->
+<!--        </el-input>-->
+<!--        <div class="login-code">-->
+<!--          <img :src="codeUrl" @click="getCode" class="login-code-img"/>-->
+<!--        </div>-->
+<!--      </el-form-item>-->
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;color: rgba(245, 248, 250, 0.8)">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
@@ -51,15 +54,16 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <!--青岛途宝软件开发有限公司-->
-    <div class="el-login-footer">
-      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛途宝软件开发有限公司</span>
-    </div>
+<!--    青岛途宝软件开发有限公司-->
+   <div class="el-login-footer">
+     <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021000559号</a>  青岛途宝软件开发有限公司</span>
+   </div>
     <!--青岛靖润科技物流有限公司-->
 <!--    <div class="el-login-footer">-->
 <!--      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021033363号-1</a>  青岛靖润科技物流有限公司</span>-->
 <!--    </div>-->
 <!--    凯和-->
+
 <!--    <div class="el-login-footer">-->
 <!--      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛凯和志诚物流有限公司</span>-->
 <!--    </div>-->
@@ -70,6 +74,7 @@
 import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import Logo from "../layout/components/Sidebar/Logo";
 
 export default {
   name: "Login",
@@ -95,7 +100,8 @@ export default {
         code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
       },
       loading: false,
-      redirect: undefined
+      redirect: undefined,
+      company: '',
     };
   },
   watch: {
@@ -109,6 +115,7 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
+
   },
   methods: {
     getCode() {
@@ -231,4 +238,9 @@ export default {
 .login-code-img {
   height: 38px;
 }
+// 靖润打开
+//.login-form {
+//  background-color: rgba(255,255,255,0.8);
+//  padding: 25px;
+//}
 </style>

src/views/reportManagement/whgenleg/index.vue

@@ -120,6 +120,7 @@
           style="width: 200px"
           clearable
           size="small"
+          placeholder="请选择分组条件"
         >
           <el-option
             v-for="(dict, index) in isCntrnoOptions"
@@ -148,15 +149,28 @@
             size="small"
         />
       </el-form-item>
-      <el-form-item>
-        <el-button
-          type="cyan"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      <el-form-item label="显示库存" prop="isMblno">
+        <el-select
+          v-model="queryParams.isMblno"
+          filterable
+          remote
+          style="width: 200px"
+          clearable
+          size="small"
+        >
+          <el-option
+            label="是"
+            :value="1"
+          ></el-option>
+          <el-option
+            label="否"
+            :value="0"
+          ></el-option>
+        </el-select>
       </el-form-item>
+<!--      <el-form-item>-->
+<!--        -->
+<!--      </el-form-item>-->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -170,6 +184,13 @@
             v-hasPermi="['warehouseBusiness:whgenleg:export']"
             >导出</el-button
           >
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+          >搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-col>
         <right-toolbar
           :showSearch.sync="showSearch"
@@ -265,7 +286,8 @@
       >
         <template slot-scope="scope">
           <span v-if="item.label == 'fMblno'">
-            <el-link :underline="false" type="primary"
+            <span v-if="queryParams.isCntrno == 2">{{ scope.row.fMblno }}</span>
+            <el-link v-else :underline="false" type="primary"
               ><div @click="goDetail(scope.row)">
                 {{ scope.row.fMblno }}
               </div></el-link
@@ -464,7 +486,7 @@ export default {
         pageNum: 1,
         pageSize: 50,
         fOriginalbillno: null,
-        isCntrno: 1,
+        isCntrno: null,
         fPreqty: null,
         fLocalcntrno: null,
         fPregrossweight: null,