入计划毛重计算

src/views/warehouseBusiness/inStock/index.vue

@@ -279,9 +279,9 @@
         prop="fItemsStatus"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.fItemsStatus === '1'">未入账</span>
-          <span v-if="scope.row.fItemsStatus === '2'">部分入账</span>
-          <span v-if="scope.row.fItemsStatus === '6'">全部入账</span>
+          <span v-if="scope.row.fItemsStatus === 1">未入账</span>
+          <span v-if="scope.row.fItemsStatus === 2">部分入账</span>
+          <span v-if="scope.row.fItemsStatus === 6">全部入账</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -291,12 +291,12 @@
         prop="fBillstatus"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.fBillstatus === '1'">录入</span>
-          <span v-if="scope.row.fBillstatus === '2'">录入</span>
-          <span v-if="scope.row.fBillstatus === '3'">驳回</span>
-          <span v-if="scope.row.fBillstatus === '4'">请核</span>
-          <span v-if="scope.row.fBillstatus === '5'">审核中</span>
-          <span v-if="scope.row.fBillstatus === '6'">全部入账</span>
+          <span v-if="scope.row.fBillstatus === 1">录入</span>
+          <span v-if="scope.row.fBillstatus === 2">录入</span>
+          <span v-if="scope.row.fBillstatus === 3">驳回</span>
+          <span v-if="scope.row.fBillstatus === 4">请核</span>
+          <span v-if="scope.row.fBillstatus === 5">审核中</span>
+          <span v-if="scope.row.fBillstatus === 6">全部入账</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -319,9 +319,9 @@
             type="text"
             icon="el-icon-edit"
             v-if="
-              scope.row.fBillstatus === '1' ||
-              scope.row.fBillstatus === '2' ||
-              scope.row.fBillstatus === '3'
+              scope.row.fBillstatus === 1 ||
+              scope.row.fBillstatus === 2 ||
+              scope.row.fBillstatus === 3
             "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
@@ -467,70 +467,43 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="存货编号" prop="fBscorpno">
-              <el-input
-                disabled
-                v-model="form.fBscorpno"
+            <el-form-item label="计划件数" prop="fPlanqty">
+             <el-input
+                v-model="form.fPlanqty"
                 style="width: 80%"
-                laceholder="存货编号"
+                laceholder="计划件数"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="破损" prop="fIfdamage">
-              <el-select
-                v-model="form.fIfdamage"
-                placeholder="请选择是否破损"
-                clearable
-                :disabled="browseStatus"
+            <el-form-item label="计划净重" prop="fPlannetweight">
+              <el-input
+                v-model="form.fPlannetweight"
                 style="width: 80%"
-              >
-                <el-option
-                  v-for="(dict, index) in fIfdamageOptions"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
+                laceholder="计划毛重"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="过磅" prop="fIfweigh">
-              <el-select
-                v-model="form.fIfweigh"
-                placeholder="请选择是否过磅"
-                clearable
-                :disabled="browseStatus"
+            <el-form-item label="计划毛重" prop="fPlangrossweight">
+              <el-input
+                v-model="form.fPlangrossweight"
                 style="width: 80%"
-              >
-                <el-option
-                  v-for="(dict, index) in fIfweighOptions"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
+                laceholder="计划毛重"
+              />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="质押" prop="fIfpledge">
-              <el-select
-                v-model="form.fIfpledge"
-                placeholder="请选择是否过磅"
-                clearable
-                :disabled="browseStatus"
+            <el-form-item label="存货编号" prop="fBscorpno">
+              <el-input
+                disabled
+                v-model="form.fBscorpno"
                 style="width: 80%"
-              >
-                <el-option
-                  v-for="(dict, index) in fIfpledgeOptions"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
+                laceholder="存货编号"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -742,44 +715,74 @@
                   size="large"
                   type="date"
                   disabled
+                  style="width: 80%"
                   value-format="timestamp"
                   placeholder="制单日期"
                 >
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="8">
-              <el-form-item disabled label="仓储计费日期" prop="fChargedate">
-                <el-date-picker
-                  v-model="form.fChargedate"
-                  size="large"
-                  type="date"
-                  value-format="timestamp"
-                  placeholder="仓储计费日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col> -->
+             <el-col :span="8">
+            <el-form-item label="质押" prop="fIfpledge">
+              <el-select
+                v-model="form.fIfpledge"
+                placeholder="请选择是否过磅"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(dict, index) in fIfpledgeOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           </el-row>
-          <!-- <el-row>
+          <el-row>
+             <el-col :span="8">
+            <el-form-item label="质押银行" prop="fBankcorpid">
+              <el-select
+                v-model="queryParams.fBankcorpid"
+                filterable
+                remote
+                clearable
+                style="width: 80%"
+                :disabled="browseStatus"
+                @keyup.enter.native="handleQuery"
+                :remote-method="corpsRemoteMethodd"
+                placeholder="请输入模糊查找"
+              >
+                <el-option
+                  v-for="(dict, index) in Pledgebank"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
             <el-col :span="8">
-              <el-form-item label="计费方式" prop="fBillingway">
-                <el-select
-                  v-model="form.fBillingway"
-                  filterable
-                  style="width: 80%"
-                  remote
-                >
-                  <el-option
-                v-for="(dict, index) in jFeetunitOptions"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            </el-row> -->
+            <el-form-item label="过磅" prop="fIfweigh">
+              <el-select
+                v-model="form.fIfweigh"
+                placeholder="请选择是否过磅"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(dict, index) in fIfweighOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+            </el-row>
         </div>
       </el-form>
 
@@ -874,9 +877,9 @@
               style="width: 138px"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               type="date"
               value-format="timestamp"
@@ -898,9 +901,9 @@
               filterable
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               remote
               :remote-method="goodsRemoteMethod"
@@ -929,9 +932,9 @@
               remote
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               :remote-method="kqhouseRemoteMethod"
               placeholder="请选择库区"
@@ -958,9 +961,9 @@
               placeholder="唛头"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -979,9 +982,9 @@
               placeholder="箱型"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1001,15 +1004,15 @@
               placeholder="箱量"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="fPlangrossweight"
           header-align="center"
           align="center"
@@ -1023,15 +1026,15 @@
               placeholder="计划毛重"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
           </template>
-        </el-table-column>
-        <el-table-column
+        </el-table-column> -->
+        <!-- <el-table-column
           prop="fPlannetweight"
           header-align="center"
           align="center"
@@ -1044,9 +1047,9 @@
               v-model="scope.row.fPlannetweight"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               placeholder="计划净重"
               show-word-limit
@@ -1067,9 +1070,9 @@
               placeholder="尺码"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1089,14 +1092,14 @@
               placeholder="件数"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           prop="fGrossweight"
           header-align="center"
@@ -1111,9 +1114,9 @@
               placeholder="入库毛重"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1133,9 +1136,9 @@
               placeholder="入库净重"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1155,9 +1158,9 @@
               placeholder="入库件数"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1177,9 +1180,9 @@
               placeholder="包装规格"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1200,9 +1203,9 @@
               placeholder="*车号"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1222,9 +1225,9 @@
               placeholder="司机名"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1244,9 +1247,9 @@
               placeholder="司机电话"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1266,9 +1269,9 @@
               placeholder="司机身份证"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1288,9 +1291,9 @@
               placeholder="流水号"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1310,9 +1313,9 @@
               placeholder="箱号"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1332,9 +1335,9 @@
               placeholder="货值"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1354,9 +1357,9 @@
               placeholder="备注"
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               show-word-limit
             />
@@ -1370,10 +1373,10 @@
           label="状态"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.fBillstatus === '40'">已入账</span>
-            <span v-if="scope.row.fBillstatus === '20'">待入库</span>
-            <span v-if="scope.row.fBillstatus === '30'">已卸货</span>
-            <span v-if="scope.row.fBillstatus === '10'">未入账</span>
+            <span v-if="scope.row.fBillstatus === 40">已入账</span>
+            <span v-if="scope.row.fBillstatus === 20">待入库</span>
+            <span v-if="scope.row.fBillstatus === 30">已卸货</span>
+            <span v-if="scope.row.fBillstatus === 10">未入账</span>
             <!-- <span v-if="scope.row.fBillstatus === '30'">待入库</span> -->
 
             <!-- <span v-else>未入账</span> -->
@@ -1395,9 +1398,9 @@
             <el-button
               :disabled="
                 browseStatus ||
-                scope.row.fBillstatus === '20' ||
-                scope.row.fBillstatus === '30' ||
-                scope.row.fBillstatus === '40'
+                scope.row.fBillstatus === 20 ||
+                scope.row.fBillstatus === 30 ||
+                scope.row.fBillstatus === 40
               "
               @click.native.prevent="deleteRow(scope.$index, dataList)"
               size="small"
@@ -1609,7 +1612,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fFeeunitid"
+          prop="fFeeUnitid"
           header-align="center"
           align="center"
           width="180px"
@@ -2039,7 +2042,56 @@
         >
         <el-button @click="cancel">取 消</el-button>
       </div>
-      <!-- 选择库存总账数据 -->
+      <!-- 入库新行计划重量导入 -->
+      <el-dialog
+        title="计划费用导入"
+        :modal="false"
+        style="height:500px;"
+        height="50%"
+        :visible.sync="weightList"
+        @close="closeDialog"
+        width="70%"
+      >
+       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="计划件数" prop="fPlanqty">
+             <el-input
+                v-model="form.fPlanqty"
+                style="width: 80%"
+                laceholder="计划件数"
+                @input="changeList(form)"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划净重" prop="fPlannetweight">
+             <el-input
+                v-model="form.fPlannetweight"
+                style="width: 80%"
+                disabled
+                laceholder="计划毛重"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划毛重" prop="fPlangrossweight">
+             <el-input
+                v-model="form.fPlangrossweight"
+                style="width: 80%"
+                disabled
+                laceholder="计划毛重"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="costList">导入</el-button>
+          <el-button @click="weightList = false">取 消</el-button>
+        </div>
+      </el-dialog>
+      <!-- 选择作业费协议数据 -->
       <el-dialog
         title="作业费协议"
         :modal="false"
@@ -2561,7 +2613,9 @@ export default {
       fBsdates: "",
       fCntrtype: "",
       fGoodsids: "",
-      fPlannetweight: "",
+      fPlaNnumber: '',
+      fPlangNumber: '',
+      // fPlannetweight: "",
       fPlanvolumn: "",
       fPlanqty: "",
       fFeeUnitid: "",
@@ -2571,7 +2625,6 @@ export default {
       fCntqty: "",
       fNetweight: "",
       fQty: "",
-      fPlangrossweight: 0,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -2588,6 +2641,8 @@ export default {
       editDialogVisible_ss: false,
       editDialogVisible_sss: false,
       editDialogClosed_ss: false,
+      // 新增计划净重
+      weightList: false,
       dataList: [],
       warehouseCrList: [],
       warehouseDrList: [],
@@ -2735,6 +2790,9 @@ export default {
           },
         ],
         fFeetunit: [{ required: true, message: " ", trigger: "blur" }],
+        fPlanqty: [{ required: true, message: " ", trigger: "blur" }],
+        fPlangrossweight: [{ required: true, message: " ", trigger: "blur" }],
+        fPlannetweight: [{ required: true, message: " ", trigger: "blur" }],
         fChargedate: [{ required: true, message: " ", trigger: "blur" }],
         fMarks: [{ required: true, message: " ", trigger: "blur" }],
         fBillingway: [{ required: true, message: " ", trigger: "blur" }],
@@ -2882,33 +2940,34 @@ export default {
 
     // 新增list
     addRelevant(status) {
+      let corpidStatus =
+        typeof this.form.fPlannetweight === "undefined" ||
+        this.form.fPlannetweight == null ||
+        this.form.fPlannetweight === "";
+      let ftrademodeids =
+        typeof this.form.fPlangrossweight === "undefined" ||
+        this.form.fPlangrossweight == null ||
+        this.form.fPlangrossweight === "";
+      let warehouseidStatus =
+        typeof this.form.fPlanqty === "undefined" ||
+        this.form.fPlanqty == null ||
+        this.form.fPlanqty === "";
+        if (corpidStatus || warehouseidStatus || ftrademodeids) {
+        this.$message({
+          message: "请维护计划净重，计划毛重，计划件数",
+          type: "warning",
+        });
+        return false;
+      }
+      this.fPlaNnumber = this.form.fPlannetweight/this.form.fPlanqty;
+      this.fPlangNumber = this.form.fPlangrossweight/this.form.fPlanqty;
+      this.weightList = true;
       let time = null;
       // console.log(this.dataList)
       // console.log(this.dataList[0].fBillstatus)
-      if (this.form.fBsdate) {
-        time = this.form.fBsdate;
-      }
-      this.dataList.push({
-        fBsdate: time,
-        fGoodsid: null,
-        fCntrtype: null,
-        fCntqty: 1,
-        fPlangrossweight: 0,
-        fPlannetweight: 0,
-        fNetweight: 0,
-        fPlanvolumn: 0,
-        fPlanqty: 0,
-        fGrossweight: 0,
-        fQty: 0,
-        fPackagespecs: null,
-        fWarehouselocid: null,
-        fBoxno: null,
-        fGoodsval: null,
-        fTruckno: null,
-        remark: null,
-        fBillstatus: "10",
-      });
-      console.log(this.dataList[0].fBillstatus);
+      
+     
+      // console.log(this.dataList[0].fBillstatus);
     },
 
     // 收货单打印界面
@@ -3093,6 +3152,35 @@ export default {
         this.whgenlegTotal = response.total;
       });
     },
+    // 导入计划重量
+    costList() {
+      // if (this.form.fBsdate) {
+      //   time = this.form.fBsdate;
+      // }
+       this.dataList.push({
+        fBsdate: this.form.fBsdate,
+        fGoodsid: null,
+        fCntrtype: null,
+        fCntqty: 1,
+        // fPlangrossweight: 0,
+        // fPlannetweight: 0,
+        fNetweight: this.form.fPlannetweight,
+        fPlanvolumn: 0,
+        // fPlanqty: 0,
+        fGrossweight: this.form.fPlangrossweight,
+        fQty: this.form.fPlanqty,
+        fPackagespecs: null,
+        fWarehouselocid: null,
+        fBoxno: null,
+        fGoodsval: null,
+        fTruckno: null,
+        remark: null,
+        fBillstatus: 10,
+      });
+      this.weightList = false;
+      
+    },
+
     // 导入付款信息
     whgenlegData() {
       console.log(this.dialogWhgenlegList);
@@ -3284,6 +3372,7 @@ export default {
           }
         }
         if (this.dataListSelection.length > 0) {
+          console.log(selection)
           this.fTruckno = selection[0].fTruckno;
           this.fCntrtype = selection[0].fCntrtype;
           this.fGoodsids = selection[0].fGoodsids;
@@ -3336,16 +3425,21 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row, status) {
+      console.log(row)
       this.browseStatus = status;
       this.reset();
       this.detailsHidden = false;
       const fId = row.fId || this.ids;
+      console.log(fId)
+      console.log(this.ids)
       getWarehousebills(fId).then((response) => {
         console.log(response);
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
-          if (this.form.fItemsStatus !== "1") {
+          if (this.form.fItemsStatus !== 1) {
             this.formBrowseStatus = true;
+          }else {
+            this.formBrowseStatus = false;
           }
         }
         if (response.data.corps) {
@@ -3415,18 +3509,18 @@ export default {
           sums[index] = "";
           return;
         }
-        if (column.property === "fPlangrossweight") {
-          values = data.map((item) => Number(item["fPlangrossweight"]));
-        }
-        if (column.property === "fPlannetweight") {
-          values = data.map((item) => Number(item["fPlannetweight"]));
-        }
+        // if (column.property === "fPlangrossweight") {
+        //   values = data.map((item) => Number(item["fPlangrossweight"]));
+        // }
+        // if (column.property === "fPlannetweight") {
+        //   values = data.map((item) => Number(item["fPlannetweight"]));
+        // }
         if (column.property === "fPlanvolumn") {
           values = data.map((item) => Number(item["fPlanvolumn"]));
         }
-        if (column.property === "fPlanqty") {
-          values = data.map((item) => Number(item["fPlanqty"]));
-        }
+        // if (column.property === "fPlanqty") {
+        //   values = data.map((item) => Number(item["fPlanqty"]));
+        // }
         if (column.property === "fGrossweight") {
           values = data.map((item) => Number(item["fGrossweight"]));
         }
@@ -3440,10 +3534,10 @@ export default {
           values = data.map((item) => Number(item["fCntqty"]));
         } // const values = data.map(item => Number(item[column.property]))
         if (
-          column.property === "fPlangrossweight" ||
-          column.property === "fPlannetweight" ||
+          // column.property === "fPlangrossweight" ||
+          // column.property === "fPlannetweight" ||
           column.property === "fPlanvolumn" ||
-          column.property === "fPlanqty" ||
+          // column.property === "fPlanqty" ||
           column.property === "fGrossweight" ||
           column.property === "fNetweight" ||
           column.property === "fQty" ||
@@ -3452,18 +3546,18 @@ export default {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              if (column.property === "fPlangrossweight") {
-                this.fPlangrossweight = prev + curr;
-              }
-              if (column.property === "fPlannetweight") {
-                this.fPlannetweight = prev + curr;
-              }
+              // if (column.property === "fPlangrossweight") {
+              //   this.fPlangrossweight = prev + curr;
+              // }
+              // if (column.property === "fPlannetweight") {
+              //   this.fPlannetweight = prev + curr;
+              // }
               if (column.property === "fPlanvolumn") {
                 this.fPlanvolumn = prev + curr;
               }
-              if (column.property === "fPlanqty") {
-                this.fPlanqty = prev + curr;
-              }
+              // if (column.property === "fPlanqty") {
+              //   this.fPlanqty = prev + curr;
+              // }
               if (column.property === "fGrossweight") {
                 this.fGrossweight = prev + curr;
               }
@@ -3514,6 +3608,13 @@ export default {
       });
       return sums;
     },
+    // 计划废用导入计算
+    changeList(row) {
+      console.log(row)
+      console.log(this.fPlaNnumber)
+     this.form.fPlannetweight = Number(this.form.fPlanqty)*Number(this.fPlaNnumber);
+     this.form.fPlangrossweight = Number(this.form.fPlanqty)*Number(this.fPlangNumber);
+    },
     // 数量计算
     changeContractAmt(row) {
       let fQty = 0;
@@ -3588,7 +3689,7 @@ export default {
       this.$refs["form"].validate((valid) => {
         console.log(this.dataListSelection);
         for (let warehouseCr in this.dataListSelection) {
-          if (this.dataListSelection[warehouseCr].fBillstatus != "30") {
+          if (this.dataListSelection[warehouseCr].fBillstatus != 30) {
             this.$message.error("请先卸货");
             return false;
           }
@@ -3677,7 +3778,7 @@ export default {
                   fNetweight &&
                   fQty
                 ) {
-                  this.$set(this.dataList[i], "fBillstatus", "40");
+                  this.$set(this.dataList[i], "fBillstatus", 40);
                 }
               }
             }
@@ -3739,7 +3840,7 @@ export default {
                   fNetweight &&
                   fQty
                 ) {
-                  this.$set(this.dataList[i], "fBillstatus", "20");
+                  this.$set(this.dataList[i], "fBillstatus", 20);
                 }
               }
               // }
@@ -3799,7 +3900,7 @@ export default {
               fNetweight &&
               fQty
             ) {
-              this.$set(this.dataList[i], "fBillstatus", "10");
+              this.$set(this.dataList[i], "fBillstatus", 10);
             }
           }
         }
@@ -3872,7 +3973,7 @@ export default {
                       fNetweight &&
                       fQty
                     ) {
-                      this.$set(this.dataList[i], "fBillstatus", "30");
+                      this.$set(this.dataList[i], "fBillstatus", 30);
                     }
                   }
                 }
@@ -3954,10 +4055,10 @@ export default {
         if (valid) {
           this.form.fBillstatus = status;
           this.form.fNetweight = this.fNetweight;
-          this.form.fPlangrossweight = this.fPlangrossweight;
-          this.form.fPlannetweight = this.fPlannetweight;
+          // this.form.fPlangrossweight = this.fPlangrossweight;
+          // this.form.fPlannetweight = this.fPlannetweight;
           this.form.fPlanvolumn = this.fPlanvolumn;
-          this.form.fPlanqty = this.fPlanqty;
+          // this.form.fPlanqty = this.fPlanqty;
           this.form.fGrossweight = this.fGrossweight;
           this.form.fQty = this.fQty;
           if (!this.form.fId) {
@@ -3966,6 +4067,7 @@ export default {
           let formData = new window.FormData();
           // 附件数据
           formData.append("tWarehouseBills", JSON.stringify(this.form));
+          console.log(this.form)
           // 库存明细
           formData.append(
             "tWarehousebillsitems",
@@ -3992,7 +4094,7 @@ export default {
             console.log(this.dataList);
             if (status === 2) {
               this.open = true;
-              this.form = response.data.warehouseBills;
+              // this.form = response.data.warehouseBills;
               this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
               this.$set(this.form, "fEta", Date.parse(this.form.fEta));
               this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));

src/views/warehouseBusiness/outStock/index.vue

@@ -279,9 +279,9 @@
         prop="fItemsStatus"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.fItemsStatus === '1'">未入账</span>
-          <span v-if="scope.row.fItemsStatus === '2'">部分入账</span>
-          <span v-if="scope.row.fItemsStatus === '6'">全部入账</span>
+          <span v-if="scope.row.fItemsStatus === 1">未入账</span>
+          <span v-if="scope.row.fItemsStatus === 2">部分入账</span>
+          <span v-if="scope.row.fItemsStatus === 6">全部入账</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -291,12 +291,12 @@
         prop="fBillstatus"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.fBillstatus === '1'">录入</span>
-          <span v-if="scope.row.fBillstatus === '2'">录入</span>
-          <span v-if="scope.row.fBillstatus === '3'">驳回</span>
-          <span v-if="scope.row.fBillstatus === '4'">请核</span>
-          <span v-if="scope.row.fBillstatus === '5'">审核中</span>
-          <span v-if="scope.row.fBillstatus === '6'">全部入账</span>
+          <span v-if="scope.row.fBillstatus === 1">录入</span>
+          <span v-if="scope.row.fBillstatus === 2">录入</span>
+          <span v-if="scope.row.fBillstatus === 3">驳回</span>
+          <span v-if="scope.row.fBillstatus === 4">请核</span>
+          <span v-if="scope.row.fBillstatus === 5">审核中</span>
+          <span v-if="scope.row.fBillstatus === 6">全部入账</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -310,7 +310,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus === '6'"
+            v-if="scope.row.fBillstatus === 6"
             @click="handleUpdate(scope.row, true)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
             >查看
@@ -320,9 +320,9 @@
             type="text"
             icon="el-icon-edit"
             v-if="
-              scope.row.fBillstatus === '1' ||
-              scope.row.fBillstatus === '2' ||
-              scope.row.fBillstatus === '3'
+              scope.row.fBillstatus === 1 ||
+              scope.row.fBillstatus === 2 ||
+              scope.row.fBillstatus === 3
             "
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
@@ -334,7 +334,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-if="
-              scope.row.fBillstatus !== '6' && scope.row.fItemsStatus === '1'
+              scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1
             "
             v-hasPermi="['warehouseBusiness:warehousebills:remove']"
             >删除
@@ -1241,10 +1241,10 @@
           <template slot-scope="scope">
             <!-- <span v-if="scope.row.fBillstatus === '6'">已出库</span>
             <span v-if="scope.row.fBillstatus !== '6'">未出库</span> -->
-            <span v-if="scope.row.fBillstatus === '40'">已入账</span>
-            <span v-if="scope.row.fBillstatus === '20'">待入库</span>
-            <span v-if="scope.row.fBillstatus === '30'">已卸货</span>
-            <span v-if="scope.row.fBillstatus === '10'">未入账</span>
+            <span v-if="scope.row.fBillstatus === 40">已入账</span>
+            <span v-if="scope.row.fBillstatus === 20">待入库</span>
+            <span v-if="scope.row.fBillstatus === 30">已卸货</span>
+            <span v-if="scope.row.fBillstatus === 10">未入账</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -2338,7 +2338,7 @@
           </tr>
           <tr v-for="(item, index) in Printinglist" :key="index">
             <td width="100">{{ index + 1 }}</td>
-            <td width="100">{{ item.fBsdate }}</td>
+            <td width="100">{{ item.fChargedate }}</td>
             <td width="100">{{ item.fCntqty }}</td>
             <td width="100">{{ item.fGrossweight }}</td>
             <td width="100">{{ item.fPlanqty }}</td>
@@ -3110,7 +3110,7 @@ export default {
           fNetweight: 0,
           fQty: 0,
           fCntqty: 1,
-          fBillstatus: '10',
+          fBillstatus: 10,
           fPackagespecs: null,
           fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
           fWarehouselocids: this.dialogWhgenlegList[whgen]
@@ -3444,6 +3444,7 @@ export default {
     // 库存总账多选框
     whgenlegSelectionChange(selection) {
       this.dialogWhgenlegList = selection;
+      console.log(selection)
     },
     /** 新增按钮操作 */
     handleAdd(status) {
@@ -3471,7 +3472,7 @@ export default {
           this.$set(this.form, "fEta", Date.parse(this.form.fEta));
           this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
           this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
-          if (this.form.fItemsStatus !== "1") {
+          if (this.form.fItemsStatus !== 1) {
             this.formBrowseStatus = true;
           } else {
             this.formBrowseStatus = false;
@@ -3727,7 +3728,7 @@ export default {
     creditClick() {
       this.$refs["form"].validate((valid) => {
         for (let warehouseCr in this.dataListSelection) {
-          if (this.dataListSelection[warehouseCr].fBillstatus != '30') {
+          if (this.dataListSelection[warehouseCr].fBillstatus != 30) {
             this.$message.error("请先卸货");
             return false;
           }
@@ -3815,7 +3816,7 @@ export default {
                   fNetweight &&
                   fQty
                 ) {
-                  this.$set(this.dataList[i], "fBillstatus", "40");
+                  this.$set(this.dataList[i], "fBillstatus", 40);
                 }
               }
             }
@@ -3869,7 +3870,7 @@ export default {
                   fNetweight &&
                   fQty
                 ) {
-                  this.$set(this.dataList[i], "fBillstatus", "20");
+                  this.$set(this.dataList[i], "fBillstatus", 20);
                 }
               }
               // }
@@ -3920,7 +3921,7 @@ export default {
               fNetweight &&
               fQty
             ) {
-              this.$set(this.dataList[i], "fBillstatus", "1");
+              this.$set(this.dataList[i], "fBillstatus", 10);
             }
           }
         }
@@ -3988,7 +3989,7 @@ export default {
                   fNetweight &&
                   fQty
                 ) {
-                  this.$set(this.dataList[i], "fBillstatus", "30");
+                  this.$set(this.dataList[i], "fBillstatus", 30);
                 }
               }
               // }
@@ -4041,10 +4042,11 @@ export default {
           }
         }
         if (this.Printinglist.length > 0) {
+          console.log(selection)
           this.fTruckno = selection[0].fTruckno;
           this.fCntrtype = selection[0].fCntrtype;
           this.fGoodsids = selection[0].fGoodsids;
-          var date = new Date(selection[0].fBsdate);
+          var date = new Date(selection[0].fChargedate);
           var Y = date.getFullYear() + "-";
           var M =
             (date.getMonth() + 1 < 10
@@ -4053,6 +4055,7 @@ export default {
           var D =
             (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
           this.fBsdate = Y + M + D;
+          console.log(this.fBsdate)
         }
         // 打印回显仓库
         for (let corp in this.warehouseOptions) {