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

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -830,6 +830,7 @@
                   <el-dropdown-item command="b">入库单</el-dropdown-item>
                   <el-dropdown-item command="c">移库单</el-dropdown-item>
                   <el-dropdown-item command="d">调拨单</el-dropdown-item>
+                  <el-dropdown-item command="e">进仓单</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <div style="margin: 0 10px">
@@ -2974,6 +2975,161 @@
         <el-button @click="print_ddd = false">取消 </el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="print_jcd"
+      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_jcd" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ fCompanyName? fCompanyName: company }}进仓单
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 5px;
+          "
+        >
+          <div>
+          </div>
+          <div>
+            <div>流水号：{{ form.fBillno }}</div>
+          </div>
+        </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>{{ form.fCorpidName }}</td>
+              <td>仓库</td>
+              <td>{{ form.fWarehouseid | warehouseFormat(warehouseOptions) }}</td>
+              <td>地址</td>
+              <td colspan="2">{{ stockaddr }}</td>
+            </tr>
+            <tr>
+              <td>保管方</td>
+              <td width="200">{{ company }}</td>
+              <td>联系人</td>
+              <td>{{ form.fContacts }}</td>
+              <td>电话</td>
+              <td colspan="2">{{ form.fTel }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td>品名</td>
+              <td>箱型</td>
+              <td>品牌</td>
+              <td>件数</td>
+              <td>重量</td>
+              <td>包装规格</td>
+            </tr>
+            <tr>
+              <td>{{ form.fMblno }}</td>
+              <td>{{ Printinglist.length > 0? Printinglist[0].fGoodsids: '' }}</td>
+              <td v-if="Printinglist.length > 0">{{Printinglist[0].fCntrtype | fCntrtypeFormat(cntrList)}}</td>
+              <td>{{ Printinglist.length > 0? Printinglist[0].fMarks: '' }}</td>
+              <td></td>
+              <td v-if="radio == 1">吨</td>
+              <td v-if="radio == 2">千克</td>
+              <td>{{ Printinglist.length > 0? Printinglist[0].fPackagespecs: '' }}</td>
+            </tr>
+            <tr>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>车号/箱号</td>
+              <td>入货日期</td>
+              <td>箱量</td>
+              <td>重量</td>
+              <td>件数</td>
+              <td>入库重量</td>
+              <td>入库件数</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td>{{ item.fTruckno }}/{{ item.fCntrno }}</td>
+              <td>{{ item.fBsdate }}</td>
+              <td>{{ item.fCntqty }}</td>
+              <td v-if="item.fGrossweight && radio == 1">
+                {{ (item.fGrossweight / 1000).toFixed(4) }}
+              </td>
+              <td v-else-if="item.fGrossweight && radio == 2">
+                {{ item.fGrossweight }}
+              </td>
+              <td v-else></td>
+              <td>{{ item.fPlanqty }}</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>{{ item.fQty }}</td>
+            </tr>
+            <tr>
+              <td colspan="2">合计</td>
+              <td>{{ allfCntqty }}</td>
+              <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
+              <td>{{ allfPlanqty }}</td>
+              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
+              <td>{{ allfQty }}</td>
+            </tr>
+            <tr>
+              <td>备注</td>
+              <td colspan="6"></td>
+            </tr>
+            <tr>
+              <td colspan="7">
+                本进仓单经仓管员签字并经保管方盖章后即专项作为货物所有人的货权证明，本单据不得转让。
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 5px"
+        >
+          <div>开单员：</div>
+          <div style="width: 150px">仓管员：{{ form.fStorekeeper }}</div>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>开单时间：{{ nowTime }}</div>
+          <div style="width: 150px">(盖章)</div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="
+            addprint('jcd');
+            print_jcd = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_jcd = false">取消 </el-button>
+      </span>
+    </el-dialog>
     <!-- 选择作业费协议数据 -->
     <el-dialog
       v-dialogDrag
@@ -3612,6 +3768,7 @@ export default {
       print_rkd: false,
       print_ykd: false,
       print_ddd: false,
+      print_jcd: false,
       company: "",
       Printinglist: [],
       //库位
@@ -5760,7 +5917,6 @@ export default {
             let _hour = ( 10 > now.getHours() ) ? '0' + now.getHours() : now.getHours();
             let _minute = ( 10 > now.getMinutes() ) ? '0' + now.getMinutes() : now.getMinutes();
             this.timeOut = _hour + ':' + _minute
-            console.log(this.data)
             this.fDriverTel = this.Printinglist[0].fDriverTel;
             // this.fBsdate = this.Printinglist[0].fBsdate;
             this.fTruckno = this.Printinglist[0].fTruckno;
@@ -5785,6 +5941,18 @@ export default {
               if (e.fQty) {
                 this.allfQty += e.fQty;
               }
+              if (e.fBsdate) {
+                // let date = new Date(this.Printinglist[0].fBsdate);
+                let date = new Date(e.fBsdate);
+                let Y = date.getFullYear();
+                let M =
+                  date.getMonth() + 1 < 10
+                    ? "0" + (date.getMonth() + 1)
+                    : date.getMonth() + 1;
+                let D =
+                  date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+                e.fBsdate = Y + "-" + M + "-" + D;
+              }
             });
             if (command == "a") {
               this.print_shd = true;
@@ -5792,8 +5960,11 @@ export default {
               this.print_rkd = true;
             } else if (command == "c") {
               this.print_ykd = true;
-            } else if(command="d"){
+            } else if(command=="d"){
               this.print_ddd = true;
+            } else if (command == 'e') {
+              this.nowTime = new Date(+new Date() + 8 * 3600 * 1000 ).toJSON().substr(0, 19).replace("T"," ")
+              this.print_jcd = true;
             }
           }
         });
@@ -6222,6 +6393,13 @@ export default {
           style: style, // 亦可使用引入的外部css;
           scanStyles: false,
         });
+      }else if (status == 'jcd') {
+        print({
+          printable: "print_jcd",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
       }
       else{
         print({

src/views/index.vue

@@ -979,9 +979,11 @@ export default {
     this.getList();
     this.warehouses();
     this.inquiry();
-    remindExpirationData().then(res => {
-     this.remindList = res.rows
-    })
+    if (this.sysType == 1) {
+      remindExpirationData().then(res => {
+        this.remindList = res.rows
+      })
+    }
     this.dataList.addressName = []
     this.dataList.boxNumber = []
     this.dataList.bookingRanking.text = []

src/views/reportManagement/singleTicket/index.vue

@@ -141,6 +141,9 @@
       <el-table-column prop="fQtyblc" label="结余件数" width="180" align="center"/>
       <el-table-column prop="fGrossweightblc" label="结余毛重" width="180" align="center"/>
       <el-table-column prop="fBilltype" label="业务类型" width="180" align="center"/>
+      <el-table-column prop="fTruckno" label="车号" width="180" align="center"/>
+      <el-table-column prop="fBillingDays" label="堆存天数" width="180" align="center"/>
+      <el-table-column prop="fAmt" label="出库堆存费" width="180" align="center"/>
       <el-table-column prop="remark" label="备注" width="180" align="center"/>
     </el-table>
     <h3>

src/views/warehouseBusiness/agreement/index.vue

@@ -244,6 +244,8 @@
             style="width: 200px"
             @keyup.enter.native="handleQuery"
             placeholder="请输入客户名称"
+            remote
+            :remote-method="corpsRemoteMethod"
           >
             <el-option
               v-for="(dict, index) in fMblnoOptions"