作业单修改

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(