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

src/api/singleTicket/index.js

@@ -24,3 +24,11 @@ export function exportTwo(query) {
     params: query
   })
 }
+// 根据提单号查找货主
+export function getCorps(query) {
+  return request({
+    url: '/warehouseBusiness/whgenleg/getCorpsByfMblno',
+    method: 'get',
+    params: query
+  })
+}

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1869,7 +1869,7 @@
             <div>
             </div>
             <div>
-              <div>办单号：{{ form.fBillno }}</div>
+              <div>办单号：{{ Printinglist.length > 0 ? Printinglist[0].fSerialNumber : '' }}</div>
               <div>办单日期：{{ nowTime }}</div>
             </div>
           </div>
@@ -1909,6 +1909,17 @@
               <td>{{ item.fCntrno }}</td>
             </tr>
             <tr>
+              <td>合计</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-else>{{ allfNetweight }}</td>
+              <td>{{ allfQty }}</td>
+              <td></td>
+            </tr>
+            <tr>
               <td>收费</td>
               <td colspan="3">
                 <span v-for="(item, index) in Collectionoptionss" :key="index">
@@ -8494,6 +8505,16 @@ export default {
             return this.$message.error("请选择车相同车号");
           }
         }
+        this.allfNetweight = 0;
+        this.allfQty = 0;
+        this.Printinglist.map(e => {
+          if (e.fNetweight) {
+            this.allfNetweight += e.fNetweight;
+          }
+          if (e.fQty) {
+            this.allfQty += e.fQty;
+          }
+        })
         this.radio = 1
         this.print_zyd = true;
         this.warehouseOptions.map((e) => {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -115,35 +115,35 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="业务日期" prop="fBsdate">
+          <el-form-item label="业务日期" prop="fBstime">
             <el-date-picker
-                v-model="form.fBsdate"
-                style="width: 80%"
-                type="date"
-                :disabled="browseStatus || form.warehouseStatus > 3"
-                value-format="timestamp"
-                format="yyyy-MM-dd"
-                placeholder="业务日期"
-                @change="changeDate"
+              v-model="form.fBstime"
+              style="width: 80%"
+              type="datetime"
+              :disabled="browseStatus || form.warehouseStatus > 3"
+              value-format="timestamp"
+              format="yyyy-MM-dd HH:mm:ss"
+              placeholder="业务日期"
+              @change="changeDate"
             >
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="业务时间" prop="fBstime">
-            <el-time-picker
-                style="width: 80%"
-                :disabled="browseStatus || form.warehouseStatus > 3"
-                v-model="form.fBstime"
-                :picker-options="{
-                selectableRange: '00:00:00 - 23:59:59',
-              }"
-                value-format="timestamp"
-                placeholder="任意时间点"
-            >
-            </el-time-picker>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="8">-->
+<!--          <el-form-item label="业务时间" prop="fBstime">-->
+<!--            <el-time-picker-->
+<!--                style="width: 80%"-->
+<!--                :disabled="browseStatus || form.warehouseStatus > 3"-->
+<!--                v-model="form.fBstime"-->
+<!--                :picker-options="{-->
+<!--                selectableRange: '00:00:00 - 23:59:59',-->
+<!--              }"-->
+<!--                value-format="timestamp"-->
+<!--                placeholder="任意时间点"-->
+<!--            >-->
+<!--            </el-time-picker>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="8">
           <el-form-item label="车辆类型" prop="fCartype">
             <el-select
@@ -160,6 +160,16 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="出口单号" prop="fEmblno">
+            <el-input
+              v-model="form.fEmblno"
+              style="width: 80%"
+              placeholder="请输入出口单号"
+              :disabled="browseStatus || form.warehouseStatus > 3"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -2679,6 +2689,19 @@
               <td>{{ item.fCartypeId | fCartypeFormat(fCartypeOptions) }}</td>
             </tr>
             <tr>
+              <td>合计</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-else>{{ allfNetweight }}</td>
+              <td>{{ allfQty }}</td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+            <tr>
               <td>收费</td>
               <td colspan="4">
                 <span v-for="(item, index) in Collectionoptionss" :key="index">
@@ -4240,6 +4263,7 @@ export default {
         fChargedate: [{required: true, message: " ", trigger: "blur"}],
         fMarks: [{required: true, message: " ", trigger: "blur"}],
         fBsdate: [{required: true, message: " ", trigger: "blur"}],
+        fBstime: [{required: true, message: " ", trigger: "blur"}],
         fTrademodeid: [{required: true, message: " ", trigger: "blur"}],
         fSbu: [{required: true, message: " ", trigger: "blur"}],
         fBusinessType: [{required: true, message: " ", trigger: "blur"}],
@@ -5229,7 +5253,8 @@ export default {
       if (this.stagingList.length > 0) {
         this.stagingList.map((e) => {
           this.detailList.push({
-            fBsdate: this.form.fBsdate,
+            // fBsdate: this.form.fBsdate,
+            fBsdate: this.form.fBstime,
             fId: null,
             fMblno: e.fMblno,
             fGoodsid: e.fGoodsid,
@@ -5269,7 +5294,8 @@ export default {
       } else {
         this.dialogWhgenlegList.map((e) => {
           this.detailList.push({
-            fBsdate: this.form.fBsdate,
+            // fBsdate: this.form.fBsdate,
+            fBsdate: this.form.fBstime,
             fId: null,
             fMblno: e.fMblno,
             fGoodsid: e.fGoodsid,
@@ -5325,7 +5351,7 @@ export default {
               this.browseStatus = false;
             }
             this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-            this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
+            this.$set(this.form, "fBstime", Date.parse(this.form.fBstime));
             this.$set(this.form, "createTime", Date.parse(this.form.createTime));
             this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
             this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
@@ -6017,7 +6043,7 @@ export default {
           this.browseStatus = false;
         }
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-        this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
+        this.$set(this.form, "fBstime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
         this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
@@ -6406,6 +6432,7 @@ export default {
           this.$refs["form"].validate((valid) => {
             if (valid) {
               this.updateDeduplication();
+              this.form.fBsdate = this.form.fBstime
               this.form.fBillingway = this.form.fFeetUnit;
               this.form.fFeetunit = this.form.fFeetUnit;
               if (this.detailList.length == 0) {
@@ -6593,7 +6620,7 @@ export default {
                         this.browseStatus = false;
                       }
                       this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-                      this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
+                      this.$set(this.form, "fBstime", Date.parse(this.form.fBstime));
                       this.$set(this.form, "createTime", Date.parse(this.form.createTime));
                       this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
                       this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(4);
@@ -6896,15 +6923,6 @@ export default {
         this.whgenlegTotal = response.total;
       });
     },
-    // 无限滚动加载
-    load() {
-      this.isFlag = true;
-      setTimeout(() => {
-        this.getDetailsList()
-        this.whgenlegParams.pageNum++
-        this.isFlag = false
-      }, 2000)
-    },
     async printZyd() {
       this.radio = 1;
       this.nowTime = new Date(+new Date() + 8 * 3600 * 1000 ).toJSON().substr(0, 19).replace("T"," ")
@@ -6919,6 +6937,16 @@ export default {
             return this.$message.error("请选择车相同车号");
           }
         }
+        this.allfNetweight = 0;
+        this.allfQty = 0;
+        this.Printinglist.map(e => {
+          if (e.fNetweight) {
+            this.allfNetweight += e.fNetweight;
+          }
+          if (e.fQty) {
+            this.allfQty += e.fQty;
+          }
+        })
         let formData = new window.FormData();
         formData.append("warehouseBills", JSON.stringify(this.form));
         formData.append(

src/views/Warehousing/outStock/index.vue

@@ -222,6 +222,19 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="出库单号" prop="fEmblno">
+                  <el-input
+                    v-model="queryParams.fEmblno"
+                    placeholder="请输入出库单号"
+                    clearable
+                    style="width: 200px"
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
           </div>
         </el-collapse-transition>
       </el-form>
@@ -604,6 +617,13 @@ export default {
           width: 100,
         },
         {
+          surface: "5",
+          label: "fEmblno",
+          name: "出口单号",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "6",
           label: "fProductName",
           name: "品名",
@@ -1128,6 +1148,7 @@ export default {
         fItemsStatus: null,
         timeInterval: null,
         fFeeStatus: null,
+        fEmblno: null,
       };
       this.handleQuery();
     },

src/views/reportManagement/singleTicket/index.vue

@@ -7,10 +7,20 @@
       :inline="true"
     >
       <el-row>
+        <el-form-item label="提单号" prop="fMblno">
+          <el-input
+            v-model="query.fMblno"
+            placeholder="请输入提单号"
+            clearable
+            size="small"
+            @change="fMblnoChange"
+          />
+        </el-form-item>
         <el-form-item label="货主" prop="fCorpid">
           <el-select
             v-model="query.fCorpid"
             filterable
+            clearable
             remote
             style="width: 80%"
             :remote-method="corpsRemoteMethod"
@@ -24,14 +34,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="提单号" prop="fMblno">
-          <el-input
-            v-model="query.fMblno"
-            placeholder="请输入提单号"
-            clearable
-            size="small"
-          />
-        </el-form-item>
         <el-form-item label="日期" prop="bsdateList">
           <el-date-picker
             v-model="query.bsdateList"
@@ -95,6 +97,9 @@
       ></right-toolbar>
     </el-row>
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
+      <el-form-item label="提单号">
+        <el-input v-model="query.fMblno" placeholder="提单号" disabled></el-input>
+      </el-form-item>
       <el-form-item label="货主">
         <el-select
           v-model="query.fCorpid"
@@ -113,9 +118,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="提单号">
-        <el-input v-model="query.fMblno" placeholder="提单号" disabled></el-input>
-      </el-form-item>
       <el-form-item label="品名">
         <el-input v-model="formInline.goodsName" placeholder="请输入品名" disabled></el-input>
       </el-form-item>
@@ -171,8 +173,9 @@
 </template>
 
 <script>
-import { listpayable , exportOne , exportTwo} from '@/api/singleTicket'
+import { listpayable , exportOne , exportTwo, getCorps} from '@/api/singleTicket'
 import {listCorps} from "@/api/basicdata/corps";
+
 export default {
   name: "index",
   data(){
@@ -301,6 +304,7 @@ export default {
       });
     },
     corpsRemoteMethod(name) {
+      if (this.query.fMblno) return
       if (name == null || name === "") {
         return false;
       }
@@ -310,6 +314,20 @@ export default {
       });
     },
     resetQuery(){},
+    // 提单号变化触发
+    fMblnoChange() {
+      this.$set(this.query, 'fCorpid', '')
+      if (this.query.fMblno) {
+        getCorps({fMblno: this.query.fMblno}).then(res => {
+          this.fMblnoOptions = res.data;
+          if (this.fMblnoOptions.length > 0) this.query.fCorpid = this.fMblnoOptions[0].fId
+        })
+      } else {
+        listCorps({type: 1}).then((response) => {
+          this.fMblnoOptions = response.rows;
+        });
+      }
+    },
   }
 }
 </script>