wsx 10 meses atrás
pai
commit
210e2507f0

+ 19 - 6
src/views/warehouseManagement/components/AssetsDialog.vue

@@ -1,5 +1,10 @@
 <template>
 <template>
-    <ele-modal :visible.sync="visible" title="物品信息" width="80vw"     :maxable="true">
+  <ele-modal
+    :visible.sync="visible"
+    title="物品信息"
+    width="80vw"
+    :maxable="true"
+  >
     <el-form :model="searchForm" label-width="100px">
     <el-form :model="searchForm" label-width="100px">
       <el-row :gutter="20">
       <el-row :gutter="20">
         <el-col :span="6">
         <el-col :span="6">
@@ -119,6 +124,17 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
 
 
+        <el-col :span="6">
+          <el-form-item label="关键字">
+            <el-input
+              clearable
+              type="text"
+              placeholder="请输入"
+              v-model="searchForm.keyWord"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+
         <el-col>
         <el-col>
           <div style="float: right">
           <div style="float: right">
             <el-button type="primary" @click="doSearch">搜索</el-button>
             <el-button type="primary" @click="doSearch">搜索</el-button>
@@ -545,11 +561,9 @@
             const isSelection = this.selectionList.find(
             const isSelection = this.selectionList.find(
               (product) => product.categoryId === item.categoryId
               (product) => product.categoryId === item.categoryId
             );
             );
-            if(isSelection){
+            if (isSelection) {
               this.$set(item, 'outboundNum', isSelection.outboundNum);
               this.$set(item, 'outboundNum', isSelection.outboundNum);
             }
             }
-
-
           }
           }
         } else {
         } else {
           for (let i = 0; i < list.length; i++) {
           for (let i = 0; i < list.length; i++) {
@@ -564,12 +578,11 @@
             const isSelection = this.selectionList.find(
             const isSelection = this.selectionList.find(
               (product) => product.id === item.id
               (product) => product.id === item.id
             );
             );
-            if(isSelection){
+            if (isSelection) {
               this.$set(item, 'outboundNum', isSelection.outboundNum);
               this.$set(item, 'outboundNum', isSelection.outboundNum);
             }
             }
           }
           }
         }
         }
-       
       },
       },
       open(val) {
       open(val) {
         this.productLists = val || [];
         this.productLists = val || [];

+ 7 - 0
src/views/warehouseManagement/outgoingManagement/index.vue

@@ -397,6 +397,13 @@
           },
           },
           {
           {
             prop: 'createTime',
             prop: 'createTime',
+            label: '创建时间',
+            align: 'center',
+            showOverflowTooltip: true,
+            width: 200
+          },
+            {
+            prop: 'storageTime',
             label: '出库时间',
             label: '出库时间',
             align: 'center',
             align: 'center',
             showOverflowTooltip: true,
             showOverflowTooltip: true,

+ 18 - 0
src/views/warehouseManagement/stockManagement/add.vue

@@ -1444,8 +1444,26 @@
       //   let arr = this.productList[index].outInDetail
       //   let arr = this.productList[index].outInDetail
       // },
       // },
       // 计算最小单元数量
       // 计算最小单元数量
+
+      // 小数处理,最大3位
+      format3(str) {
+        let value = str;
+        value = value.replace(/[^0-9.]/g, '');
+        const parts = value.split('.');
+        if (parts.length > 2) {
+          value = parts[0] + '.' + parts.slice(1).join('');
+        }
+        if (parts.length === 2) {
+          value = parts[0] + '.' + parts[1].slice(0, 3);
+        }
+        console.log(value);
+
+        return value;
+      },
       async computeNum(row, index, isClear) {
       async computeNum(row, index, isClear) {
         console.log('row,', row);
         console.log('row,', row);
+        row.packingQuantity = this.format3(row.packingQuantity);
+
         let data = row.packingSpecificationOption.find(
         let data = row.packingSpecificationOption.find(
           (item) => item.id == row.packingUnitId
           (item) => item.id == row.packingUnitId
         );
         );