修改

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -205,7 +205,10 @@
               maxlength="9"
               laceholder="计划件数"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfQty"
+            >
+              <template slot="append">{{ tfQtynum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -217,7 +220,10 @@
               v-input-limit="2"
               laceholder="计划净重"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfNetweight"
+            >
+              <template slot="append">{{ tfNetweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -229,7 +235,10 @@
               laceholder="计划毛重"
               maxlength="9"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfGrossweight"
+            >
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -1615,22 +1624,20 @@
             fixed
             align="center"
           />
-          <el-table-column
+       <el-table-column
             prop="fCorpid"
             header-align="center"
             align="center"
             width="180px"
             label="客户名称"
-            :disabled="browseStatus"
           >
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
-                remote
                 clearable
-                :remote-method="corpremoteMethod2"
                 placeholder="客户名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1688,7 +1695,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column
+                    <el-table-column
             prop="fFeeUnitid"
             header-align="center"
             align="center"
@@ -1698,11 +1705,9 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
-                filterable
-                remote
+                placeholder="请选择计价单位"
+                clearable
                 :disabled="browseStatus"
-                :remote-method="corpsRemoteMethod"
-                placeholder="计价单位"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1710,7 +1715,7 @@
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -3204,6 +3209,9 @@ export default {
       unloadModes: [],
       detailsHidden2: true,
       dataShowcar: null,
+      tfQtynum: 0,
+      tfNetweightnum: 0,
+      tfGrossweightnum: 0,
     };
   },
   created() {
@@ -3336,6 +3344,15 @@ export default {
         orgStorageDate: null,
       };
     },
+    tfQty(row) {
+      this.tfQtynum = (row / 1000).toFixed(2);
+    },
+    tfNetweight(row) {
+      this.tfNetweightnum = (row / 1000).toFixed(2);
+    },
+    tfGrossweight(row) {
+      this.tfGrossweightnum = (row / 1000).toFixed(2);
+    },
     //列设置全选
     allChecked() {
       if (this.allCheck == true) {
@@ -4025,6 +4042,9 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+        this.tfQtynum = (this.form.fPlanqty / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -598,10 +598,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  :disabled="
-                    browseStatus ||
-                    scope.row.fBillstatus == 6
-                  "
+                  :disabled="browseStatus || scope.row.fBillstatus == 6"
                   type="text"
                   @click.native.prevent="wDeleteRow(scope.$index, detailList)"
                   size="small"
@@ -1187,16 +1184,14 @@
             align="center"
             width="180px"
             label="客户名称"
-            :disabled="browseStatus"
           >
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
-                remote
                 clearable
-                :remote-method="corpremoteMethod2"
                 placeholder="客户名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1264,11 +1259,9 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
-                filterable
-                remote
+                placeholder="请选择计价单位"
+                clearable
                 :disabled="browseStatus"
-                :remote-method="corpsRemoteMethod"
-                placeholder="计价单位"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1276,7 +1269,7 @@
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -2359,7 +2352,7 @@ export default {
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
     });
-    this.getDicts("st_trans_type").then((response) => {
+    this.getDicts("st_goodstf_type").then((response) => {
       this.businessTypeOption = response.data;
       localStorage.setItem("businessTypeList", JSON.stringify(response.data));
     });
@@ -3146,6 +3139,7 @@ export default {
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+        this.$set(this.form, "fBusinessType", "1");
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }
@@ -3909,6 +3903,7 @@ export default {
           this.$set(this.form, "fTrademodeid", "1");
           this.$set(this.form, "createTime", Date.parse(new Date()));
           this.$set(this.form, "fBstime", Date.parse(new Date()));
+          this.$set(this.form, "fBusinessType", "1");
         }
         if (response.dept !== null) {
           this.deptOptions = [];

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -201,6 +201,7 @@
           </el-form-item>
         </el-col>
       </el-row>
+      {{ form.fPlanqty }}
       <el-row>
         <el-col :span="8">
           <el-form-item label="计划件数" prop="fPlanqty">
@@ -210,7 +211,10 @@
               maxlength="9"
               laceholder="计划件数"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfQty"
+            >
+              <template slot="append">{{ tfQtynum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -222,7 +226,10 @@
               v-input-limit="2"
               laceholder="计划净重"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfNetweight"
+            >
+              <template slot="append">{{ tfNetweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -234,7 +241,10 @@
               laceholder="计划毛重"
               maxlength="9"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfGrossweight"
+            >
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -891,14 +901,14 @@
                 @click="addRelevant('copy')"
                 >复制录入</el-button
               >
-                 <el-button
+              <el-button
                 :disabled="browseStatus"
                 type="primary"
                 size="small"
                 @click="tishi"
                 >导入模板</el-button
               >
-                 <el-button
+              <el-button
                 :disabled="browseStatus"
                 type="primary"
                 size="small"
@@ -945,6 +955,7 @@
                   <el-dropdown-item command="d">货物确认</el-dropdown-item>
                   <el-dropdown-item command="e">劳务确认</el-dropdown-item>
                   <el-dropdown-item command="f">吊牌信息</el-dropdown-item>
+                  <el-dropdown-item command="h">入库垛卡</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <div style="margin: 0 10px">
@@ -1619,16 +1630,14 @@
             align="center"
             width="180px"
             label="客户名称"
-            :disabled="browseStatus"
           >
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
-                remote
                 clearable
-                :remote-method="corpremoteMethod2"
                 placeholder="客户名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1696,11 +1705,9 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
-                filterable
-                remote
+                placeholder="请选择计价单位"
+                clearable
                 :disabled="browseStatus"
-                :remote-method="corpsRemoteMethod"
-                placeholder="计价单位"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1708,7 +1715,7 @@
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -3042,6 +3049,99 @@
         <el-button @click="print_dpxx = false">取消 </el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="print_dk"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_area1" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          垛卡
+        </div>
+        <div class="print_table" style="display: flex">
+          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+            <tr>
+              <td>客户</td>
+              <td colspan="2">{{ form.fCorpidName }}</td>
+              <td>箱量</td>
+              <td v-if="Printinglist.length">{{ Printinglist[0].fCntqty }}</td>
+              <td v-else></td>
+              <td>车号</td>
+              <td>{{ form.fTruckno }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td colspan="2">{{ form.fMblno }}</td>
+              <td>品名</td>
+              <td colspan="3">
+                {{ form.fGoodsid | goodsFormat(goodsOptions) }}
+              </td>
+            </tr>
+            <tr>
+              <td>箱号</td>
+              <td colspan="2" v-if="Printinglist.length">
+                {{ Printinglist[0].fCntrno }}
+              </td>
+              <td colspan="2" v-else></td>
+              <td>报关号</td>
+              <td colspan="3"></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.fBsdate }}</td>
+              <td>{{ item.fQty }}</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.remark }}</td>
+            </tr>
+          </table>
+        </div>
+        <div
+            style="
+              display: flex;
+              justify-content: space-between;
+              font-size: 12px;
+            "
+          >
+            <div>操作：{{ form.createBy }}</div>
+            <div>司机：</div>
+            <div>理货：</div>
+            <div>掏箱叉车：</div>
+            <div style="width: 150px">码垛叉车：</div>
+          </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          :disabled="browseStatus"
+          @click="
+            addprint();
+            print_dk = false;
+          "
+          >打印
+        </el-button>
+        <el-button @click="print_dk = false">取消 </el-button>
+      </span>
+    </el-dialog>
     <!-- 选择作业费协议数据 -->
     <el-dialog
       v-dialogDrag
@@ -3370,6 +3470,7 @@ export default {
       print_lwqr: false,
       print_dpxx: false,
       print_bzrkd: false,
+      print_dk: false,
       company: "",
       Printinglist: [],
       //库位
@@ -3602,6 +3703,9 @@ export default {
       getRowList: [],
       allCheck: false,
       showSetting: false,
+      tfQtynum: 0,
+      tfNetweightnum: 0,
+      tfGrossweightnum: 0,
     };
   },
   created() {
@@ -3813,6 +3917,15 @@ export default {
         remark: null,
       };
     },
+    tfQty(row) {
+      this.tfQtynum = (row / 1000).toFixed(2);
+    },
+    tfNetweight(row) {
+      this.tfNetweightnum = (row / 1000).toFixed(2);
+    },
+    tfGrossweight(row) {
+      this.tfGrossweightnum = (row / 1000).toFixed(2);
+    },
     //列设置全选
     allChecked() {
       if (this.allCheck == true) {
@@ -3825,7 +3938,7 @@ export default {
         });
       }
     },
-    tishi(){
+    tishi() {
       return this.$message.error("正在开发中");
     },
     //查询列数据
@@ -4236,6 +4349,9 @@ export default {
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fChargedate", Date.parse(this.form.fChargedate));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+        this.tfQtynum = (this.form.fPlanqty / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
         if (this.form.fTrademodeid) {
           this.$set(
             this.form,
@@ -4990,6 +5106,8 @@ export default {
               this.print_dpxx = true;
             } else if (command == "g") {
               this.print_bzrkd = true;
+            } else if (command == "h") {
+              this.print_dk = true;
             }
           }
         });

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -182,7 +182,10 @@
               maxlength="9"
               laceholder="计划件数"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfQty"
+            >
+              <template slot="append">{{ tfQtynum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -194,7 +197,10 @@
               v-input-limit="2"
               laceholder="计划净重"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfNetweight"
+            >
+              <template slot="append">{{ tfNetweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -206,7 +212,10 @@
               laceholder="计划毛重"
               maxlength="9"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfGrossweight"
+            >
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -1598,16 +1607,14 @@
             align="center"
             width="180px"
             label="客户名称"
-            :disabled="browseStatus"
           >
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
-                remote
                 clearable
-                :remote-method="corpremoteMethod2"
                 placeholder="客户名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1665,7 +1672,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column
+                    <el-table-column
             prop="fFeeUnitid"
             header-align="center"
             align="center"
@@ -1675,11 +1682,9 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
-                filterable
-                remote
+                placeholder="请选择计价单位"
+                clearable
                 :disabled="browseStatus"
-                :remote-method="corpsRemoteMethod"
-                placeholder="计价单位"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -1687,7 +1692,7 @@
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -2262,13 +2267,13 @@
               <td>包装规格</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{item.fMblno}}</td>
-              <td>{{item.fGoodsids}}</td>
-              <td>{{item.fCntrtype}}</td>
-              <td>{{item.fMarks}}</td>
-              <td>{{item.fQty}}</td>
-              <td>{{item.fGrossweight}}</td>
-              <td>{{item.fPackagespecs}}</td>
+              <td>{{ item.fMblno }}</td>
+              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fCntrtype }}</td>
+              <td>{{ item.fMarks }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{ item.fGrossweight }}</td>
+              <td>{{ item.fPackagespecs }}</td>
             </tr>
             <tr>
               <td>序号</td>
@@ -2279,7 +2284,7 @@
               <td>入库重量</td>
               <td>入库件数</td>
             </tr>
-            <tr v-for="(item, index) in Printinglist" :key="'info2-'+index">
+            <tr v-for="(item, index) in Printinglist" :key="'info2-' + index">
               <td>{{ index + 1 }}</td>
               <td>{{ item.fBsdate }}</td>
               <td>{{ item.fCntqty }}</td>
@@ -3299,7 +3304,10 @@ export default {
       showSetting2: false,
       detailsHidden2: true,
       unloadModes: [],
-      dataShowcar:null,
+      dataShowcar: null,
+      tfQtynum: 0,
+      tfNetweightnum: 0,
+      tfGrossweightnum: 0,
     };
   },
   created() {
@@ -3437,7 +3445,7 @@ export default {
       this.warehouseCrList = [];
       this.warehouseDrList = [];
       this.CntrTable = [];
-       if (this.dataShowcar == "1") {
+      if (this.dataShowcar == "1") {
         this.detailsHidden2 = false;
       }
       this.getForm();
@@ -3454,6 +3462,15 @@ export default {
         orgStorageDate: null,
       };
     },
+    tfQty(row) {
+      this.tfQtynum = (row / 1000).toFixed(2);
+    },
+    tfNetweight(row) {
+      this.tfNetweightnum = (row / 1000).toFixed(2);
+    },
+    tfGrossweight(row) {
+      this.tfGrossweightnum = (row / 1000).toFixed(2);
+    },
     //列设置全选
     allChecked() {
       if (this.allCheck == true) {
@@ -4101,6 +4118,9 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+          this.tfQtynum = (this.form.fPlanqty / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -205,7 +205,10 @@
               maxlength="9"
               laceholder="计划件数"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfQty"
+            >
+              <template slot="append">{{ tfQtynum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -217,7 +220,10 @@
               v-input-limit="2"
               laceholder="计划净重"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfNetweight"
+            >
+              <template slot="append">{{ tfNetweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -229,12 +235,15 @@
               laceholder="计划毛重"
               maxlength="9"
               :disabled="browseStatus || current !== before"
-            />
+              @change="tfGrossweight"
+            >
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
+            </el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-if="detailsHidden2">
-         <el-col :span="8">
+        <el-col :span="8">
           <el-form-item
             label="作业类型"
             prop="fBusinessType"
@@ -421,23 +430,23 @@
           </el-row>
           <el-row>
             <el-col :offset="17" :span="6">
-               <el-button
-                  @click="
-                    detailsHidden2
-                      ? (detailsHidden2 = false)
-                      : (detailsHidden2 = true)
-                  "
-                  v-if="this.dataShowcar == 1"
-                  >{{ detailsHidden2 ? "隐藏" : "更多" }}
-                </el-button>
-                <el-button
-                  @click="
-                    detailsHidden
-                      ? (detailsHidden = false)
-                      : (detailsHidden = true)
-                  "
-                  >{{ detailsHidden ? "隐藏" : "展开" }}
-                </el-button>
+              <el-button
+                @click="
+                  detailsHidden2
+                    ? (detailsHidden2 = false)
+                    : (detailsHidden2 = true)
+                "
+                v-if="this.dataShowcar == 1"
+                >{{ detailsHidden2 ? "隐藏" : "更多" }}
+              </el-button>
+              <el-button
+                @click="
+                  detailsHidden
+                    ? (detailsHidden = false)
+                    : (detailsHidden = true)
+                "
+                >{{ detailsHidden ? "隐藏" : "展开" }}
+              </el-button>
             </el-col>
           </el-row>
         </el-col>
@@ -1929,16 +1938,14 @@
             align="center"
             width="180px"
             label="客户名称"
-            :disabled="browseStatus"
           >
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
-                remote
                 clearable
-                :remote-method="corpremoteMethod2"
                 placeholder="客户名称"
+                :disabled="browseStatus"
               >
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
@@ -1996,7 +2003,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column
+                  <el-table-column
             prop="fFeeUnitid"
             header-align="center"
             align="center"
@@ -2006,11 +2013,9 @@
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
-                filterable
-                remote
+                placeholder="请选择计价单位"
+                clearable
                 :disabled="browseStatus"
-                :remote-method="corpsRemoteMethod"
-                placeholder="计价单位"
                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
@@ -2018,7 +2023,7 @@
                   :key="index.dictValue"
                   :label="item.dictLabel"
                   :value="item.dictValue"
-                ></el-option>
+                />
               </el-select>
             </template>
           </el-table-column>
@@ -3511,6 +3516,9 @@ export default {
       unloadModes: [],
       detailsHidden2: true,
       dataShowcar: null,
+      tfQtynum: 0,
+      tfNetweightnum: 0,
+      tfGrossweightnum: 0,
     };
   },
   created() {
@@ -3643,6 +3651,15 @@ export default {
         orgStorageDate: null,
       };
     },
+    tfQty(row) {
+      this.tfQtynum = (row / 1000).toFixed(2);
+    },
+    tfNetweight(row) {
+      this.tfNetweightnum = (row / 1000).toFixed(2);
+    },
+    tfGrossweight(row) {
+      this.tfGrossweightnum = (row / 1000).toFixed(2);
+    },
     //列设置全选
     allChecked() {
       if (this.allCheck == true) {
@@ -4332,6 +4349,9 @@ export default {
         this.$set(this.form, "fBstifime", Date.parse(this.form.fBstime));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
+        this.tfQtynum = (this.form.fPlanqty / 1000).toFixed(2);
+        this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
+        this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
         if (this.form.fCartype || this.form.fCartype == 0) {
           this.$set(this.form, "fCartype", this.form.fCartype.toString());
         }

src/views/reportManagement/whgenleg/index.vue

@@ -7,6 +7,61 @@
       v-show="showSearch"
       label-width="68px"
     >
+      <el-form-item label="客户" prop="fCorpid">
+        <el-select
+          v-model="queryParams.fCorpid"
+          filterable
+          remote
+          style="width: 200px"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+          :remote-method="corpsRemoteMethod"
+          placeholder="请选择客户"
+        >
+          <el-option
+            v-for="(dict, index) in fMblnoOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="提单号" prop="fMblno">
+        <el-input
+          v-model="queryParams.fMblno"
+          placeholder="请输入提单号"
+          clearable
+          style="width: 200px"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="箱号" prop="fCntrno">
+        <el-input
+          v-model="queryParams.fCntrno"
+          placeholder="请输入箱号"
+          clearable
+          style="width: 200px"
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库日期" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          size="small"
+          style="width: 240px"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="仓库" prop="fwarehouseid">
         <treeselect
           style="width: 200px"
@@ -55,46 +110,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="货权方" prop="fCorpid">
-        <el-select
-          v-model="queryParams.fCorpid"
-          filterable
-          remote
-          style="width: 200px"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-          :remote-method="corpsRemoteMethod"
-          placeholder="请选择货权方"
-        >
-          <el-option
-            v-for="(dict, index) in fMblnoOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="提单号" prop="fMblno">
-        <el-input
-          v-model="queryParams.fMblno"
-          placeholder="请输入提单号"
-          clearable
-          style="width: 200px"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="箱号" prop="fCntrno">
-        <el-input
-          v-model="queryParams.fCntrno"
-          placeholder="请输入箱号"
-          clearable
-          style="width: 200px"
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="按照箱号">
         <el-select
           v-model="queryParams.isCntrno"
@@ -112,21 +127,6 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="入库日期" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.timeInterval"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          size="small"
-          style="width: 240px"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery"
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button
           type="cyan"
@@ -556,7 +556,7 @@ export default {
     return {
       //仓库树状下拉
       fWarehouseidOption: [],
-      // 货权方(客户数据)
+      // 客户(客户数据)
       fMblnoOptions: [],
       // 贸易方式(数据字典),对应t_trademodels 字典
       fTrademodeidOptions: [],
@@ -613,139 +613,163 @@ export default {
       drag: false,
       setRowList: [],
       getRowList: [],
-      tableDate: [{
+      tableDate: [
+        {
           surface: "0",
           label: "fMblno",
           name: "提单号",
           checked: 0,
           width: 100,
           fixed: "left",
-        }, {
+        },
+        {
           surface: "1",
           label: "fCorpid",
           name: "客户",
           checked: 0,
           width: 100,
           fixed: "left",
-        }, {
+        },
+        {
           surface: "2",
           label: "fOriginalbilldate",
           name: "入库日期",
           checked: 0,
           width: 100,
           fixed: "left",
-        }, {
+        },
+        {
           surface: "3",
           label: "fChargedate",
           name: "仓储费计算日期",
           checked: 0,
           width: 100,
           fixed: "left",
-        }, {
+        },
+        {
           surface: "4",
           label: "fBusinessTypes",
           name: "货物属性",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "5",
           label: "fMarks",
           name: "属性详情",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "6",
           label: "fGoodsids",
           name: "品名",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "8",
           label: "fWarehouseids",
           name: "仓库",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "9",
           label: "fTrademodeid",
           name: "贸易方式",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "10",
           label: "fQtyD",
           name: "入库件数",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "11",
           label: "fGrossweightD",
           name: "入库毛重(kg)",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "12",
           label: "fNetweightD",
           name: "入库净重(kg)",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "13",
           label: "fQtyC",
           name: "出库件数",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "14",
           label: "fGrossweightC",
           name: "出库毛重(kg)",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "15",
           label: "fNetweightC",
           name: "出库净重(kg)",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "16",
           label: "fQtyblc",
           name: "结余件数",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "17",
           label: "fGrossweightblc",
           name: "结余毛重(kg)",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "18",
           label: "fNetweightblc",
           name: "结余净重(kg)",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "19",
           label: "fCntrno",
           name: "箱号",
           checked: 0,
           width: 100,
-        }, {
+        },
+        {
           surface: "20",
           label: "remark",
           name: "备注",
           checked: 0,
           width: 100,
-        },],
+        },
+      ],
       allCheck: false,
-      isCntrnoOptions: [{
-        id: 0,
-        name: '否'
-      }, {
-        id: 1,
-        name: '是'
-      }]
+      isCntrnoOptions: [
+        {
+          id: 0,
+          name: "否",
+        },
+        {
+          id: 1,
+          name: "是",
+        },
+      ],
     };
   },
   created() {