修改入库导入

src/views/Warehousing/inStock/uploadExcel.vue

@@ -8,7 +8,7 @@
         ">
         <div style="display: flex;;margin-bottom: 10px;">
           <el-upload :action="actionUrl" multiple :on-progress="progress" :headers="headers" :show-file-list="false"
-             :data="{fWarehouseid:form.fWarehouseid}"
+             :data="{fWarehouseid:form.fWarehouseid?form.fWarehouseid:''}"
              :on-success="
               (res) => {
                 handleSucces(res);
@@ -50,25 +50,44 @@
             </span>
             <span v-else-if="item.label == 'fMarks'">
               <el-input v-model="scope.row.fMarks" style="width: 100%" placeholder="请填写属性描述"
-                @change="dateSelected(scope, 'fMarks')" />
+                        @change="dateSelected(scope, 'fMarks')"/>
             </span>
             <span v-else-if="item.label == 'fCntqty'">
               <el-input v-model="scope.row.fCntqty" style="width: 100%" placeholder="请填写属性描述"
-                @change="dateSelected(scope, 'fCntqty')" />
+                        @change="dateSelected(scope, 'fCntqty')"/>
+            </span>
+            <span v-else-if="item.label == 'fWarehouseInformation'">
+              <el-input placeholder="请选择" v-model="scope.row.fWarehouseInformation" @focus="getTreeselect(scope)">
+              </el-input>
+            </span>
+            <span v-else-if="item.label == 'fCntrtype'">
+              <el-select
+                  placeholder="请选择箱型"
+                  v-model="scope.row.fCntrtype"
+                  size="mini"
+              >
+                      <el-option
+                          v-for="(item, index) in cntrList"
+                          :key="index.fId"
+                          :label="item.fName"
+                          :value="item.fId"
+                      >
+                      </el-option>
+                    </el-select>
             </span>
             <span v-else-if="item.label == 'fWarehouseInformation'">
               <el-input placeholder="请选择" v-model="scope.row.fWarehouseInformation" @focus="getTreeselect(scope)">
               </el-input>
             </span>
             <span v-else-if="item.label == 'fQty'">
-              <el-input v-input-limit="0" v-model.number="scope.row.fQty" style="width: 100%" placeholder="件数" />
+              <el-input v-input-limit="0" v-model.number="scope.row.fQty" style="width: 100%" placeholder="件数"/>
             </span>
             <span v-else-if="item.label == 'fGrossweight'">
               <el-input v-model.number="scope.row.fGrossweight" v-input-limit="2" style="width: 100%"
-                placeholder="毛重" />
+                        placeholder="毛重"/>
             </span>
             <span v-else-if="item.label == 'fNetweight'">
-              <el-input v-model.number="scope.row.fNetweight" v-input-limit="2" style="width: 100%" placeholder="净重" />
+              <el-input v-model.number="scope.row.fNetweight" v-input-limit="2" style="width: 100%" placeholder="净重"/>
             </span>
             <span v-else-if="item.label == 'fPackagespecs'">
               <el-input v-model="scope.row.fPackagespecs" style="width: 100%" placeholder="包装规格" />
@@ -156,6 +175,7 @@ import draggable from "vuedraggable";
 import Treeselect from "@riophae/vue-treeselect";
 import { listGoods } from "@/api/basicdata/goods";
 import { treeselect } from "@/api/basicdata/warehouse";
+import {listCntrs} from "@/api/basicdata/cntr";
 export default {
   name: "inStock",
   props: {
@@ -295,6 +315,7 @@ export default {
       form: {},
       selection: [],
       showDataElabel: null,
+      cntrList:[]
     };
   },
   created() {
@@ -350,6 +371,9 @@ export default {
       this.excelList = [];
       this.oldList = list;
       this.form = row;
+      listCntrs({ fStatus: 'T' }).then((response) => {
+        this.cntrList = response.rows
+      })
       treeselect(row.fWarehouseid).then((response) => {
         this.fWarehouseidOptions = response.data;
       });
@@ -364,6 +388,8 @@ export default {
           res.data.map((e) => {
             e.fBsdate = this.form.fBsdate;
             e.fGoodsid = this.form.fGoodsid;
+            e.fCntrtype = Number(e.fCntrtype)
+            e.fBusinessType = e.fCntrtype + ''
           });
         }
         this.excelList = res.data;