单票选中，数量为1

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -4958,6 +4958,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/Warehousing/components/incomeMoney.vue

@@ -1008,6 +1008,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/Warehousing/components/payMoney.vue

@@ -982,6 +982,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -565,11 +565,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="createBy" label="录入人" align="center"></el-table-column>
-            <el-table-column prop="createTime" label="录入日期" align="center"></el-table-column>
-            <el-table-column prop="remarks" label="备注" align="center" width="180">
+            <el-table-column prop="createTime" label="录入日期" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="remark" label="备注" align="center" width="180">
               <template slot-scope="scope">
                 <el-input
-                  v-model="scope.row.remarks"
+                  v-model="scope.row.remark"
                   :disabled="disabledtwo"
                   placeholder="请输入内容"
                 ></el-input>
@@ -904,9 +904,9 @@ export default {
         fQty: null,
         fUnitprice: null,
         fCurrency: null,
-        fExrate: null,
+        fExrate: 1,
         fAmount: null,
-        fTaxrate: null,
+        fTaxrate: 0,
         fSrcTypeId: 10,
         fBillstatus: null,
         actId: 1000,

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -4391,6 +4391,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -7613,6 +7613,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -538,7 +538,6 @@
                     clearable
                     filterable
                     placeholder="请输入关键词"
-                    :disabled="browseStatus || form.warehouseStatus > 3"
                     style="width: 80%"
                     allow-create
                     default-first-option
@@ -1240,6 +1239,7 @@
               >导入Execl
               </el-button
               >
+              <el-button v-if="true" type="success" size="small" @click="openNoUpload" :disabled="browseStatus">智能大数据</el-button>
             </el-col>
             <el-col style="display: flex; justify-content: flex-end">
               <el-button
@@ -2130,7 +2130,7 @@
             </tr>
             <tr>
               <td>保管方</td>
-              <td width="200">{{ company }}</td>
+              <td width="200">{{ fCompanyName? fCompanyName: company }}</td>
               <td>联系人</td>
               <td>{{ form.fContacts }}</td>
               <td>电话</td>
@@ -2605,7 +2605,7 @@
           </div>
           <div style="width: 100%;display: flex">
             <div style="width: 33.333333%">
-              保管方：{{ company }}
+              保管方：{{ fCompanyName? fCompanyName: company }}
             </div>
             <div style="width: 33.333333%">
               联系人：
@@ -5424,30 +5424,30 @@
             <tr>
               <td>箱号</td>
               <td>铅封号</td>
-              <td>预计件数</td>
-              <td>实际件数</td>
+              <td>预计</td>
+              <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.fCntrno }}</td>
-              <td>{{ item.fSealno }}</td>
-              <td>{{ item.fQty }}</td>
-              <td>{{ item.fQty }}</td>
-              <td>{{ item.fWarehouseInformation }}</td>
+              <td width="13%">{{ item.fCntrno }}</td>
+              <td width="13%">{{ item.fSealno }}</td>
+              <td width="5%">{{ item.fQty }}</td>
+              <td width="5%">{{ isfQty == 0? item.fQty: '' }}</td>
+              <td width="10%">{{ isfQty == 0?item.fWarehouseInformation: '' }}</td>
 <!--              <td>{{ item.fBsdate }}&nbsp;{{ timeOut }}</td>-->
-              <td>{{ item.fBsdate }}&nbsp;{{ inTime }}</td>
-              <td>{{ item.fTruckno }}</td>
-              <td>{{ item.fDriverName }}</td>
-              <td>{{ item.remark }}</td>
+              <td width="10%">{{ isfQty == 0? item.fBsdate: '' }}&nbsp;{{ isfQty == 0? inTime: '' }}</td>
+              <td width="10%">{{ item.fTruckno }}</td>
+              <td width="10%">{{ item.fDriverName }}</td>
+              <td width="24%">{{ item.remark }}</td>
             </tr>
             <tr>
               <td colspan="2">合计：</td>
               <td>{{ allfQty }}</td>
-              <td>{{ allfQty }}</td>
+              <td>{{ isfQty == 0? allfQty: '' }}</td>
               <td></td>
               <td></td>
               <td></td>
@@ -5594,7 +5594,9 @@
       <el-radio v-model="radio" :label="1">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area99" class="print-div">
-        <div
+        <div v-for="(item, index) in Printinglist"
+             :key="index">
+          <div
             class="print-title"
             style="
                 display: flex;
@@ -5602,179 +5604,92 @@
                 font-size: 24px;
                 margin-bottom: 5px;
               "
-        >
-          {{ fCompanyName? fCompanyName: company }}货物标识卡
-        </div>
-        <div class="print_table" style="display: flex;flex-direction: column">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
-                 :key="index">
-            <tr>
-              <td>货物名称</td>
-              <td colspan="2">{{ form.goodName }}</td>
-              <td>库位</td>
-              <td colspan="2">{{ stockName }}</td>
-            </tr>
-            <tr>
-              <td>提单号</td>
-              <td colspan="2">{{ form.fMblno }}</td>
-              <td>清单号</td>
-              <td colspan="2">{{ form.fCustomsdeclartion }}</td>
-            </tr>
-            <tr>
-              <td>箱号</td>
-              <td colspan="2">{{ item.fCntrno }}</td>
-              <td>总箱量</td>
-              <td colspan="2">{{ item.fCntqty }}</td>
-            </tr>
-            <tr>
-              <td>总件数</td>
-              <td colspan="2">{{ item.fQty }}</td>
-              <td v-if="radio == 1">总净重(吨)</td>
-              <td v-if="radio == 2">总净重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
-            </tr>
-            <tr>
-              <td v-if="radio == 1">总毛重(吨)</td>
-              <td v-if="radio == 2">总毛重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
-              <td v-if="radio == 1">本垛毛重(吨)</td>
-              <td v-if="radio == 2">本垛毛重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
-            </tr>
-            <tr>
-              <td>本垛件数</td>
-              <td colspan="2">{{ item.fQty }}</td>
-              <td v-if="radio == 1">本垛净重(吨)</td>
-              <td v-if="radio == 2">本垛净重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
-            </tr>
-            <tr>
-              <td>入库日期</td>
-              <td colspan="2">{{ item.fBsdate }}</td>
-              <td>仓管员</td>
-              <td colspan="2">{{ form.createBy }}</td>
-            </tr>
-            <tr>
-              <td>出库日期</td>
-              <td>出库件数</td>
-              <td>剩余件数</td>
-              <td>出库仓管员</td>
-              <td>盘点日期</td>
-              <td>盘点人</td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>备注：</td>
-              <td colspan="5">{{ item.remark }}</td>
-            </tr>
-          </table>
-        </div>
-        <div
+          >
+            {{ fCompanyName? fCompanyName: company }}货物标识卡
+          </div>
+          <div class="print_table" style="display: flex;flex-direction: column">
+            <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+              <tr>
+                <td>货物名称</td>
+                <td colspan="2">{{ form.goodName }}</td>
+                <td>库位</td>
+                <td colspan="2">{{ stockName }}</td>
+              </tr>
+              <tr>
+                <td>提单号</td>
+                <td colspan="2">{{ form.fMblno }}</td>
+                <td>清单号</td>
+                <td colspan="2">{{ form.fCustomsdeclartion }}</td>
+              </tr>
+              <tr>
+                <td>箱号</td>
+                <td colspan="2">{{ item.fCntrno }}</td>
+                <td>总箱量</td>
+                <td colspan="2">{{ item.fCntqty }}</td>
+              </tr>
+              <tr>
+                <td>总件数</td>
+                <td colspan="2">{{ item.fQty }}</td>
+                <td v-if="radio == 1">总净重(吨)</td>
+                <td v-if="radio == 2">总净重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
+              </tr>
+              <tr>
+                <td v-if="radio == 1">总毛重(吨)</td>
+                <td v-if="radio == 2">总毛重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
+                <td v-if="radio == 1">本垛毛重(吨)</td>
+                <td v-if="radio == 2">本垛毛重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
+              </tr>
+              <tr>
+                <td>本垛件数</td>
+                <td colspan="2">{{ item.fQty }}</td>
+                <td v-if="radio == 1">本垛净重(吨)</td>
+                <td v-if="radio == 2">本垛净重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
+              </tr>
+              <tr>
+                <td>入库日期</td>
+                <td colspan="2">{{ item.fBsdate }}</td>
+                <td>仓管员</td>
+                <td colspan="2">{{ form.createBy }}</td>
+              </tr>
+              <tr>
+                <td>出库日期</td>
+                <td>出库件数</td>
+                <td>剩余件数</td>
+                <td>出库仓管员</td>
+                <td>盘点日期</td>
+                <td>盘点人</td>
+              </tr>
+              <tr v-for="index in 31" :key="index">
+                <td style="height:20px"></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+              </tr>
+              <tr style="height: 20px">
+                <td>备注：</td>
+                <td colspan="5">{{ item.remark }}</td>
+              </tr>
+            </table>
+          </div>
+          <div
             style="display: flex; justify-content: space-between; font-size: 12px"
-        >
-          <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
-          <div style="width: 100px">叉车：</div>
+          >
+            <!--          <div>操作：{{ form.createBy }}</div>-->
+            <div>库管：{{ form.fContacts }}</div>
+            <div style="width: 100px">叉车：</div>
+          </div>
         </div>
+
       </div>
       <span slot="footer" class="dialog-footer">
             <el-button
@@ -5826,7 +5741,10 @@
               "
             class="print_form"
         >
-          <div>客户名称：{{ form.fCorpidName }}</div>
+          <div v-if="form.fShipper">
+            客户名称：{{ form.fShipper | fShipperFormat(fMblnoOptions) }}
+          </div>
+          <div v-else>客户名称：{{ form.fCorpidName }}</div>
           <div>存货地点：{{ stockName }}</div>
         </div>
         <div class="print_table" style="display: flex">
@@ -6196,6 +6114,14 @@
         @changeShow="showAddOrUpdate2"
         @adddetailList="adddetailList"
     ></upload-excel>
+    <no-upload
+      ref="noUpload"
+      v-if="noUploadVisible"
+      :oldList="detailList"
+      :form="form"
+      @closeDialog="closeNoUpload"
+      @addDetailList="addDetailList"
+    ></no-upload>
     <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update
@@ -6316,6 +6242,7 @@ import upLoad from "../components/upLoad";
 import incomeMoney from "../components/incomeMoney";
 import payMoney from "../components/payMoney";
 import uploadExcel from "./uploadExcel";
+import noUpload from "./noUpload";
 import { getDept } from "@/api/basicdata/dept";
 
 export default {
@@ -6339,7 +6266,8 @@ export default {
     upLoad,
     incomeMoney,
     payMoney,
-    uploadExcel
+    uploadExcel,
+    noUpload
   },
   data() {
     return {
@@ -6734,6 +6662,7 @@ export default {
       weighedRequired: 1,
       inTime: '',
       bring: null,
+      isfQty:null,
       // 选择打印抬头中文名
       fCompanyName: '',
       printFeeConfirm: {
@@ -6743,6 +6672,7 @@ export default {
         fTel: '',
         fTax: '',
       },
+      noUploadVisible: false, //上传弹窗
     };
   },
   created() {
@@ -6810,6 +6740,9 @@ export default {
     this.getConfigKey("warehouse.inStock.bring").then((response) => {
       this.bring = response.msg;
     });
+    this.getConfigKey("warehouse.inStock.isfQty").then((response) => {
+      this.isfQty = response.msg;
+    });
     //货值是否显示
     // this.getConfigKey("show_fValue").then((response) => {
     //   this.showfValue = response.msg;
@@ -6970,6 +6903,15 @@ export default {
       });
       return name;
     },
+    fShipperFormat(row, fMblnoOptions) {
+      let name;
+      fMblnoOptions.map((e) => {
+        if (row == e.fCname) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
     fBsdateFormat(row) {
       if (row) {
         const dateMat = new Date(row);
@@ -9406,7 +9348,20 @@ export default {
           this.goodsOptions = response.rows;
         });
       }
-      console.log(this.form.fFeetUnit)
+    },
+    openNoUpload() {
+      if (!this.form.fMblno) return this.$message.error('请维护提单号')
+      this.noUploadVisible = true;
+      this.$nextTick(() => {
+        this.$refs.noUpload.init()
+      })
+    },
+    // 关闭弹窗
+    closeNoUpload() {
+      this.noUploadVisible = false
+    },
+    addDetailList(list) {
+      this.detailList.push(...list);
     },
   },
   watch: {

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -7486,6 +7486,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }