Merge branch 'main' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangVUE

src/views/wmsManagement/WmMaterial.vue

@@ -275,6 +275,7 @@
 <script>
 import { listWmMaterial, addWmMaterial, delWmMaterial, updateWmMaterial, getWmMaterial } from '@/api/wmsManagement/wmMaterial.js'
 import { getToken } from '@/utils/auth'
+import { formatDate } from '@/utils/index'
 export default {
   name: 'wmmaterial',
   data() {
@@ -385,6 +386,8 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + '/mes/wm/WmMaterial/importData',
       },
+
+      fullloading: null,
     }
   },
   created() {
@@ -393,6 +396,9 @@ export default {
 
     var dictParams = []
   },
+  mounted() {
+    this.upload.time =window.localStrorage.getItem('material')
+  },
   methods: {
     // 查询数据
     getList() {
@@ -546,7 +552,6 @@ export default {
     importTemplate() {
       //  @/utils/ruoyi"
       this.download('/mes/wm/WmMaterial/download_template', '物料清单导入模板')
-    
     },
 
     // todo 文件上传中处理
@@ -556,12 +561,21 @@ export default {
     //todo  提交上传文件
     submitFileForm() {
       this.$refs.upload.submit()
+      this.fullloading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      })
+      //保存数据
+      window.localStorage.setItem('material', new Date())
     },
     //todo 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
+      this.fullloading.close()
       if (response.code == 200) {
         this.$alert(response.data, '导入结果', { dangerouslyUseHTMLString: true })
       } else {

src/views/wmsManagement/WmpatchSearch.vue

@@ -23,11 +23,11 @@
     </el-form>
 
     <vxe-table
+      keep-source
       resizable
-
       ref="xTable"
       :tree-config="{ transform: true, rowField: 'packageCodeClient_son', parentField: 'packageCodeClient_short_parent' }"
-
+      :edit-config="{ trigger: 'manual', mode: 'row' }"
       :data="dataList"
     >
       <vxe-column field="partnumber" title="零件号"></vxe-column>
@@ -38,12 +38,12 @@
       <vxe-column field="goodsNumLogic" title="理论库存"></vxe-column>
       <!-- <vxe-column field="goodsNumAction" title="实际库存"></vxe-column> -->
       <!--     :edit-config="{ trigger: 'manual', mode: 'row' }" -->
-      <!-- <vxe-column field="goodsNumAction" title="实际库存" :edit-render="{}">
+      <vxe-column field="goodsNumAction" title="实际库存" :edit-render="{}">
         <template #edit="{ row }">
           <vxe-input v-model="row.goodsNumAction" type="text"></vxe-input>
         </template>
-      </vxe-column> -->
-      <!-- <vxe-column title="操作" width="160"  >
+      </vxe-column>
+      <vxe-column title="操作" width="160">
         <template #default="{ row }">
           <template v-if="$refs.xTable.isActiveByRow(row)">
             <vxe-button @click="saveRowEvent(row)">保存</vxe-button>
@@ -53,7 +53,7 @@
             <vxe-button @click="editRowEvent(row)">编辑</vxe-button>
           </template>
         </template>
-      </vxe-column> -->
+      </vxe-column>
       <vxe-column field="entryWarehouseTime" title="入库时间"></vxe-column>
       <vxe-column field="remark" title="备注"></vxe-column>
     </vxe-table>
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { Node_patch_search,updateactualInventoryQuantity } from '@/api/wmsManagement/wmGoodsNowProduction.js'
+import { Node_patch_search, updateactualInventoryQuantity } from '@/api/wmsManagement/wmGoodsNowProduction.js'
 export default {
   name: 'WmpatchSearch',
   data() {
@@ -132,8 +132,8 @@ export default {
           return updateactualInventoryQuantity(query)
         })
         .then((res) => {
-          if(res.code==200&&res.data>0){
-            this.$notify.success("修改成功");
+          if (res.code == 200 && res.data > 0) {
+            this.$notify.success('修改成功')
             this.getList()
           }
         })