修改总库明细

src/components/layouts/RouteView.vue

@@ -17,7 +17,7 @@
       //update-begin--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842
       includedComponents() {
         const includedRouters = Vue.ls.get(CACHE_INCLUDED_ROUTES)
-        console.log("includedRouters：" + includedRouters)
+        console.log("includedRouters：" + includedRouters,this.$route.meta.keepAlive,this.$route.meta.componentName);
 
         //如果是缓存路由，则加入到 cache_included_routes
         if (this.$route.meta.keepAlive && this.$route.meta.componentName) {

src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@@ -889,14 +889,21 @@
               if (!formData.tableName) formData.tableName = this.processData.businessTable
               console.log('格式化后的数据', formData)
               let cx = false;
+              let bfsj = false;
               formData.processSmaterialsScrapListList.forEach(item =>{
                 if(!item.scrapNumber){
-
                   cx = true;
                 }
+                if(!item.scrapTime){
+                  bfsj = true;
+                }
               })
               if(cx){
-                this.$message.warning("请填写报废数量");
+                this.$message.warning("请填写报废数量！");
+                return ;
+              }
+              if(bfsj){
+                this.$message.warning("请填写报废时间！");
                 return ;
               }
               var url = this.url.addScrapApply

src/views/materialstorage/ProcessMaterialStorageList.vue

@@ -228,7 +228,7 @@
           delete: "/materialstorage/processMaterialStorage/delete",
           deleteBatch: "/materialstorage/processMaterialStorage/deleteBatch",
           exportXlsUrl: "/materialstorage/processMaterialStorage/exportXls",
-          importExcelUrl: "materialstorage/processMaterialStorage/importExcel",
+          importExcelUrl: "/materialstorage/processMaterialStorage/importExcel",
           addressUrl:"/materialstorage/processMaterialStorage/materialStorageAddress",
 
         },

src/views/supplier/ProcessSupplierList.vue

@@ -126,8 +126,8 @@
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)" v-has="'regulate:edit'">编辑</a>
 
-          <a-divider type="vertical" />
-           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+          <a-divider type="vertical"  v-has="'regulate:delete'" />
+           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-has="'regulate:delete'">
                   <a>删除</a>
            </a-popconfirm>
 <!--          <a  @click="handleDelete(record.id)">删除</a>-->

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -414,7 +414,8 @@
         ],
         url: {
           listUrl: "/actBusiness/listDataAll",
-          list: "/suppliesstronger/processSuppliesStronger/lists",
+          // list: "/suppliesstronger/processSuppliesStronger/lists",
+          list: "/suppliesstronger/processSuppliesStronger/inventoryDetails", // 明细
           delete: "/suppliesstronger/processSuppliesStronger/delete",
           deleteBatch: "/suppliesstronger/processSuppliesStronger/deleteBatch",
           exportXlsUrl: "/suppliesstronger/processSuppliesStronger/exportXls",

src/views/waste/ProcessWasteList.vue

@@ -224,7 +224,7 @@
           delete: "/waste/processWaste/delete",
           deleteBatch: "/waste/processWaste/deleteBatch",
           exportXlsUrl: "/waste/processWaste/exportXls",
-          importExcelUrl: "waste/processWaste/importExcel",
+          importExcelUrl: "/waste/processWaste/importExcel",
           userRoleUrl: "/sys/user/queryUserRolePart",
           listByuntil: '/unitwaste/processUnitWasteWarehouseCode/listAllNoPage',
         },

src/views/waste/ProcessWasteListCable.vue

@@ -252,7 +252,7 @@
         url: {
           list: "/waste/processWaste/listCable",
           exportXlsUrl: "/waste/processWaste/exportXlsByWaste",
-          importExcelUrl: "waste/processWaste/importCableExcel",
+          importExcelUrl: "/waste/processWaste/importCableExcel",
         },
         dictOptions:{},
         superFieldList:[],