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

public/index.html

@@ -7,6 +7,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
+    <script>
+      if (document.domain.includes('wms') || document.domain.includes('dh')) {
+        let Link = document.getElementsByTagName('link')[0]
+        Link.href = `<%= BASE_URL %>favicon3.ico`
+      }
+    </script>
 	  <style>
     html,
     body,

src/layout/components/Sidebar/Logo.vue

@@ -8,27 +8,19 @@
     }"
   >
     <transition name="sidebarLogoFade">
-<!--      如果是靖润 添加style样式background="#fff"-->
       <router-link
         v-if="collapse"
         key="collapse"
         class="sidebar-logo-link"
-        :class="{ 'jingrun-logo': sysType == 2 }"
         to="/"
       >
 <!--        途宝-->
-        <img v-if="sysType != 2" :src="logo" class="sidebar-logo-mini" />
-<!--        靖润-->
-        <img v-if="sysType == 2" :src="jingrunLogo" class="sidebar-logo-mini" />
+        <img :src="logo" class="sidebar-logo-mini" />
         <!-- <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
 <!--        途宝-->
-        <img v-if="sysType != 2" :src="logo" class="sidebar-logo" />
-<!--        靖润logo-->
-        <div style="width: 80%;height: 100%;background-color: #fff;float: left" v-if="company === ''">
-          <img v-if="sysType == 2" :src="jingrunLogo" class="sidebar-logo" />
-        </div>
+        <img :src="logo" class="sidebar-logo" />
         <div style="float: right;background-color: #fff" class="other" v-if="company === ''"></div>
         <!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.sidebarTitle : variables.sidebarLightTitle }">{{ title }} </h1> -->
       </router-link>
@@ -38,9 +30,9 @@
 
 <script>
 import logoImg from "@/assets/logo/logo.png";
-import jingrunLogo from "@/assets/logo/jingrun-logo.png"
 import variables from "@/assets/styles/variables.scss";
 import Cookies from "js-cookie";
+import testLogo from "@/assets/logo/testLogo.png";
 
 export default {
   name: "SidebarLogo",
@@ -62,7 +54,6 @@ export default {
     return {
       title: "途宝智慧云仓平台",
       logo: logoImg,
-      jingrunLogo: jingrunLogo,
       company: '',
       sysType: "",
     };
@@ -70,6 +61,9 @@ export default {
   mounted() {
     this.company = Cookies.get("companyName")
     this.sysType = Cookies.get("sysType");
+    if (Cookies.get("test") == 0) {
+      this.logo = testLogo;
+    }
   },
 };
 </script>
@@ -131,7 +125,4 @@ export default {
   border-bottom: 60px solid #014da1;
   border-left: 40px solid transparent;
 }
-.jingrun-logo {
-  background-color: #fff;
-}
 </style>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -916,6 +916,7 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="d" v-if="showPrint != 1">标准出库单</el-dropdown-item>
                   <el-dropdown-item command="i" v-if="showPrint != 1">标准出库单(详情)</el-dropdown-item>
+                  <el-dropdown-item command="k" v-if="showPrint != 1">标准出库单(结余件数)</el-dropdown-item>
                   <!--                  <el-dropdown-item command="b">出库单</el-dropdown-item>-->
                   <!--                  <el-dropdown-item command="c">理货单</el-dropdown-item>-->
                   <!--                  <el-dropdown-item command="e">出库确认</el-dropdown-item>-->
@@ -1213,7 +1214,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  :disabled="browseStatus || scope.row.fBillstatus == 40"
+                  :disabled="browseStatus || scope.row.fBillstatus == 40 || scope.row.fItemstatus == 4 || scope.row.fItemstatus == 5 || scope.row.fItemstatus == 6"
                   type="text"
                   @click.native.prevent="wDeleteRow(scope.$index, detailList)"
                   size="small"
@@ -3632,6 +3633,115 @@
           >
             <tr>
               <td>公司名称</td>
+              <td colspan="3">{{ form.fCorpidName }}</td>
+              <td>出库日期</td>
+              <td colspan="4" v-if="Printinglist.length">
+                {{ Printinglist[0].fBsdate | fBsdateFormat }}{{ ' ' + ckTime }}
+              </td>
+              <td colspan="4" v-else></td>
+            </tr>
+            <tr>
+              <td style="width: 15%">货物名称</td>
+              <td>提单号</td>
+              <td>箱号</td>
+              <td>货物属性</td>
+              <td>属性详情</td>
+              <td>件数</td>
+              <td v-if="radio == 1">计量单位(吨)</td>
+              <td v-else>计量单位(千克)</td>
+              <td>车型</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
+              <td>{{ item.fMblno }}</td>
+              <td>{{ item.fCntrno }}</td>
+              <td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
+              <td>{{ item.fMarks }}</td>
+              <td>{{ item.fQty }}</td>
+              <td v-if="item.fNetweight && radio == 1">
+                {{ (item.fNetweight / 1000).toFixed(4) }}
+              </td>
+              <td v-else-if="item.fNetweight && radio == 2">
+                {{ item.fNetweight }}
+              </td>
+              <td v-else></td>
+              <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
+              <td>{{ item.remark }}</td>
+            </tr>
+            <tr>
+              <td>车号</td>
+              <td colspan="3" v-if="Printinglist.length">
+                {{ Printinglist[0].fTruckno }}
+              </td>
+              <td colspan="3" v-else></td>
+              <td colspan="2">身份证号</td>
+              <td colspan="3" v-if="Printinglist.length">{{ Printinglist[0].fDriverIdCar }}</td>
+              <td colspan="3" v-else></td>
+            </tr>
+            <tr>
+              <td>地址</td>
+              <td colspan="8">{{ stockaddr }}</td>
+            </tr>
+            <tr>
+              <td colspan="9">
+                雨/雪天装货司机自愿装车，出现货物水湿与仓库无关！数量准确无误，货物包装完好！
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>操作：</div>
+          <div>理货：</div>
+          <div>叉车：</div>
+          <div>司机：</div>
+          <div style="width: 200px">电话：</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="
+            print_xqckd = false;
+            addprint('xqckd');
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_xqckd = false">取消 </el-button>
+      </span>
+    </el-dialog>
+    <!--    出库单（结余件数）-->
+    <el-dialog
+      :visible.sync="print_jyjsckd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
+      <div id="print_areaBalance" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ fCompanyName ? fCompanyName : company }}出库单
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>公司名称</td>
               <td colspan="4">{{ form.fCorpidName }}</td>
               <td>出库日期</td>
               <td colspan="4" v-if="Printinglist.length">
@@ -3705,12 +3815,12 @@
         <el-button
           type="primary"
           @click="
-            print_xqckd = false;
-            addprint('xqckd');
+            print_jyjsckd = false;
+            addprint('jyjsckd');
           "
         >打印
         </el-button>
-        <el-button @click="print_xqckd = false">取消 </el-button>
+        <el-button @click="print_jyjsckd = false">取消 </el-button>
       </span>
     </el-dialog>
 
@@ -5172,6 +5282,7 @@ export default {
       print_zccdckd: false,
       print_bzckd: false,
       print_xqckd: false,
+      print_jyjsckd: false,
       print_kbccd: false,
       print_kbzccd: false,
       company: '',
@@ -8529,6 +8640,9 @@ export default {
           deliveryDetails(this.form.fId).then(res => {
             if (res.code == 200) {
               this.msgSuccess('请核成功')
+              this.detailList.map(e => {
+                this.$set(e, 'fItemstatus', 4)
+              })
               this.$set(this.form, 'fItemstatus', 4)
             }
           })
@@ -8560,6 +8674,9 @@ export default {
             if (data.code === 200) {
               this.browseStatus = false
               this.msgSuccess('撤销成功')
+              this.detailList.map(e => {
+                this.$set(e, 'fItemstatus', 2)
+              })
               this.$set(this.form, 'fItemstatus', 2)
             }
           })
@@ -8684,6 +8801,16 @@ export default {
               this.print_kbccd = true
             } else if (command == 'hw') {
               this.print_kbzccd = true
+            } else if (command == 'k') {
+              let date = new Date()
+              let hours =
+                date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+              let minutes =
+                date.getMinutes() < 10
+                  ? '0' + date.getMinutes()
+                  : date.getMinutes()
+              this.ckTime = hours + ':' + minutes
+              this.print_jyjsckd = true
             }
           }
         })
@@ -9282,6 +9409,14 @@ export default {
             scanStyles: false
           })
           break
+        case 'jyjsckd':
+          print({
+            printable: 'print_areaBalance',
+            type: 'html',
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false
+          })
+          break
       }
     },
     cancel() {

src/views/Warehousing/outStock/index.vue

@@ -1096,9 +1096,12 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        delWarehousebills(ids);
-        this.msgSuccess("删除成功");
-        this.getList();
+        delWarehousebills(ids).then((res) => {
+          if (res.code === 200) {
+            this.msgSuccess("删除成功");
+            this.getList();
+          }
+        })
       });
     },
     /** 导出按钮操作 */

src/views/finance/contrast/index.vue

@@ -1519,6 +1519,7 @@
                     oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                     @change="imgChangeI(scope.row)"
                   />
+                  <span v-if="item.label == 'fTaxrate'">{{scope.row.fTaxrate}}</span>
                   <span v-if="item.label == 'fFeeName'">{{
                     scope.row.fFeeName
                   }}</span>
@@ -2099,90 +2100,97 @@ export default {
         },
         {
           surface: "10",
+          label: "fTaxrate",
+          name: "税率",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
           label: "fBusinessType",
           name: "作业类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "11",
+          surface: "12",
           label: "fBilltype",
           name: "业务类型",
           checked: 0,
           width: 100,
         },
         {
-          surface: "12",
+          surface: "13",
           label: "srcBillNo",
           name: "来源编号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "13",
+          surface: "14",
           label: "fProductName",
           name: "货物品名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "14",
+          surface: "15",
           label: "fMarks",
           name: "品牌",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "16",
           label: "fChargedate",
           name: "计费起始日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "17",
           label: "fBillingDeadline",
           name: "计费截止日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "18",
           label: "fBillingDays",
           name: "计费天数",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "19",
           label: "fInventoryDays",
           name: "库存天数",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "20",
           label: "fBillno",
           name: "业务编号",
           checked: 0,
           width: 120,
         },
         {
-          surface: "20",
+          surface: "21",
           label: "invoiceNo",
           name: "发票号",
           checked: 0,
           width: 120,
         },
         {
-          surface: "21",
+          surface: "22",
           label: "fRemarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "carLoadDate",
           name: "提箱日期",
           checked: 0,
@@ -2261,6 +2269,13 @@ export default {
           width: 100,
         },
         {
+          surface: "10",
+          label: "fTaxrate",
+          name: "税率",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "11",
           label: "fFeeName",
           name: "费用名称",

src/views/finance/query/index.vue

@@ -707,7 +707,6 @@ export default {
     },
     // 分项导出
     handleSubItemExport(){
-      console.log('分项导出点击了');
       this.$confirm("是否确认导出分项所有账单明细数据项？","警告",{
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智慧云仓平台</h3>
+      <h3 class="title">{{ test? '青岛道合': '智慧云仓平台' }}</h3>
 
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
@@ -52,14 +52,14 @@
     </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备2021000559号</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备2021017300号-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>-->
   </div>
 </template>
 
@@ -95,6 +95,7 @@ export default {
       loading: false,
       redirect: undefined,
       company: '',
+      test: false,
     };
   },
   watch: {
@@ -108,7 +109,9 @@ export default {
   created() {
     this.getCode();
     this.getCookie();
-
+    const host = document.domain;
+    this.test = host.includes('wms') || host.includes('dh');
+    Cookies.set('test', this.test? 0: 1);
   },
   methods: {
     getCode() {