r=tijiao

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['all'];
-let devModules = ['index','SporadicManage','sale'];
+let devModules = ['index','SporadicManage','sale','inward'];
 // let devModules = ['index','appoint','TMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

src/components/DilCommonUI/packages/table/src/table.js

@@ -19,7 +19,7 @@ export default {
       // 自己的每页显示条目个数
       dataPageSize: 10,
       // 保存表格所有页面所选中的数据
-      dataSelection: [],
+      dataRadioId: [],
       // 保存表格单选的数据 保存数据的id
       dataRadioId: ""
     };
@@ -65,24 +65,18 @@ export default {
           // 判断是否需要在请求体中放入参数
           if(this.requestQuery){
             console.log(" 判断是否需要在请求体中放入参数")
-            
             this.dataRequestQuery=this.requestQuery;
             // console.log(this.dataRequestQuery.resultBreakId)
           }
-
           let data = undefined;
           for (const key in this.dataRequestQuery) {
-         
             const val = this.dataRequestQuery[key];
             console.log(val)
             if (val||val==0) {
-             
               if (!data) data = {};
-            
               data[key] = val;
             }
           }
-        
           // 发送请求
           this.axios
             .post(url, data, {
@@ -99,7 +93,6 @@ export default {
               //执行成功的回调
               this.$emit('func',response.data.data);
               this.refreshColumnData(d.columnData);
-
               this.isShow = true;
             });
         }
@@ -111,10 +104,8 @@ export default {
     refreshColumnData(columnData) {
       // 表头只赋值一次(在查出全部数据的情况下才只赋值一次)
       // if (this.dataColumnData.length > 0) return;
-
       // 如果前端有写表头，则加在后端表头前面
       const d = this.columnData.concat(columnData);
-
       // 把操作列拼接到最后一列
       this.dataColumnData = d;
       this.dataDropColumn = [].concat(this.dataColumnData);
@@ -186,7 +177,7 @@ export default {
     },
     // 多选的选中行改变回调
     selectionChange(selection) {
-      this.dataSelection = selection;
+      // this.dataSelection = selection;
       // 将多选中的数据抛出
       this.$emit("selection-change", selection);
     },
@@ -233,11 +224,11 @@ export default {
     },
     // current-page 改变时会触发
     currentChange(val, isRequest = true) {
-      this.dataCurrentPage = val;
       if (isRequest) {
         this.requestData({ pageNum: val });
       }
       // 最后通知父节点页面改变
+      this.dataCurrentPage = val;
       this.$emit("update:current-page", val);
     },
     // pageSize 改变时会触发

src/components/DilCommonUI/packages/table/src/table.vue

@@ -116,6 +116,9 @@ export default {
   name: "DilTable",
   extends: table,
   props: {
+    isChang:{
+      default:false,
+    },
     // 请求地址
     requestUrl: {
       default: "",
@@ -142,9 +145,9 @@ export default {
     selectionType: {
       default: "",
     },
-    // 是否 在数据翻页后保留之前选中的数据（需指定 row-key）
+    // 是否在数据翻页后保留之前选中的数据（需指定 row-key）
     reserveSelection: {
-      default: true,
+      default: false,
     },
     // 是否为斑马纹 table
     stripe: {
@@ -205,7 +208,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [10, 20, 50, 100, 200,1000];
+        return [10, 20, 50, 100, 200, 1000];
       },
     },
     // 每页显示条目个数，支持 .sync 修饰符

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15"
       }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15"
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+    if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16"
       }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16"
           }else{
           this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&userId=" + getCookie("orgCode")

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue

@@ -27,7 +27,7 @@ export default {
     };
   },
   created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16"
       }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&userId=" + getCookie("orgCode")
@@ -36,14 +36,14 @@ export default {
   methods: {
     onclick() {
       if(this.input != null){
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&con=" + this.input
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&userId=" + getCookie("orgCode") + "&con=" + this.input
                }
       }else{
           this.$message.warning("未输入查询条件")
-          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+          if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16"
           }else{
           this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=16&userId=" + getCookie("orgCode")

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -364,7 +364,7 @@ export default {
         }
       } else if (this.onDrawerNumber == 4) {
         this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
       } else if (this.onDrawerNumber == 5) {
         this.option.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
@@ -395,7 +395,7 @@ export default {
         }
       } else if (num == 4) {
         this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&i=" + new Date();
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
         this.option.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -364,7 +364,7 @@ export default {
         }
       } else if (this.onDrawerNumber == 4) {
         this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
       } else if (this.onDrawerNumber == 5) {
         this.option.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
@@ -394,14 +394,11 @@ export default {
             null  + "&i=" + new Date();
         }
       } else if (num == 4) {
-        this.unloadPoint.requestUrl =
-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&i=" + new Date();
+        this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
-        this.option.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        this.option.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl =
-        "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
       }
     },
     // 返回

src/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue

@@ -30,7 +30,7 @@ export default {
         }
     },
     created(){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
             this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10"
         }else{
             this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=434&orderType=10&userId=" + getCookie("orgCode")

src/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue

@@ -30,7 +30,7 @@ export default {
         }
     },
     created(){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
+        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "baoweibu"){
             this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=110&orderType=10"
         }else{
             this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=110&orderType=10&userId=" + getCookie("orgCode")