浏览代码

修改承运商上传图片

Tiroble 3 年之前
父节点
当前提交
643d9a975f

+ 2 - 5
build/utils.js

@@ -18,11 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
 
 
 
-
-//  let devModules = ['all']
-// let devModules = ['index','inward','statisticalReport']
-let devModules = ['index','TMS','RMS']
-
+ let devModules = ['all']
+// let devModules = ['index','TMS','SporadicManage']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];
 // let devModules = ['index','RMS'];

+ 3 - 7
src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -416,17 +416,12 @@ export default {
               });
               });
               this.purchaseOrderNo = null
               this.purchaseOrderNo = null
               this.purchaseOrderId = null
               this.purchaseOrderId = null
+              this.remark = null
               this.form1 = [];
               this.form1 = [];
             } else {
             } else {
-              console.log();
               this.remark = res.data.data.remark;
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 6;
-              // } else {
-              //   this.orderType = 7;
-              // }
             }
             }
           } else {
           } else {
             this.$message.error("请求失败");
             this.$message.error("请求失败");
@@ -528,7 +523,7 @@ export default {
       if (num == 1) {
       if (num == 1) {
         this.frist.requestUrl =
         this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input + "&supplierId=" + this.supplierId;;
+          this.input + "&supplierId=" + this.supplierId;
       } else if (num == 2) {
       } else if (num == 2) {
         this.secend.requestUrl =
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -569,6 +564,7 @@ export default {
     currentRadioChange1(selection) {
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.materialId = selection.materialId;
+      this.remark = null
       this.getPurchaseOrderNo();
       this.getPurchaseOrderNo();
     },
     },
     currentRadioChange2(selection) {
     currentRadioChange2(selection) {

+ 2 - 6
src/views/TMS/components/importedIngredients/transportReserveFuAddIngredients.vue

@@ -425,16 +425,12 @@ export default {
               this.form1 = [];
               this.form1 = [];
               this.purchaseOrderId = null
               this.purchaseOrderId = null
               this.purchaseOrderNo = null
               this.purchaseOrderNo = null
+              this.remark = null
             } else {
             } else {
               console.log();
               console.log();
               this.remark = res.data.data.remark;
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 6;
-              // } else {
-              //   this.orderType = 7;
-              // }
             }
             }
           } else {
           } else {
             this.$message.error("请求失败");
             this.$message.error("请求失败");
@@ -541,7 +537,6 @@ export default {
       }
       }
       this.drawer = true;
       this.drawer = true;
       this.onDrawerNumber = num;
       this.onDrawerNumber = num;
-      this.refreshTable()
       if (num == 1) {
       if (num == 1) {
           this.frist.requestUrl =
           this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
@@ -584,6 +579,7 @@ export default {
       this.$router.push("/transportReserveRan");
       this.$router.push("/transportReserveRan");
     },
     },
     currentRadioChange1(selection) {
     currentRadioChange1(selection) {
+      this.remark = null ;
       this.materialName = selection.materialName;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
       this.getPurchaseOrderNo();

+ 4 - 0
src/views/TMS/components/importedMineral/addTransportAppoint.vue

@@ -423,6 +423,9 @@ export default {
                 type: "warning",
                 type: "warning",
               });
               });
               this.form1 = [];
               this.form1 = [];
+              this.remark = null;
+              this.purchaseOrderNo = null;
+              this.purchaseOrderId = null
             } else {
             } else {
               console.log();
               console.log();
               this.remark = res.data.data.remark;
               this.remark = res.data.data.remark;
@@ -580,6 +583,7 @@ export default {
       this.$router.push("/transportReserveRan");
       this.$router.push("/transportReserveRan");
     },
     },
     currentRadioChange1(selection) {
     currentRadioChange1(selection) {
+      this.remark = null
       this.materialName = selection.materialName;
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
       this.getPurchaseOrderNo();

+ 6 - 5
src/views/inward/app.js

@@ -19,12 +19,13 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 Vue.use(DilCommonUI);
 
 
-import 'xe-utils' 
+// import 'xe-utils' 
+
+// import VXETable from 'vxe-table'
+// import 'vxe-table/lib/style.css'
+// Vue.use(VXETable)
+// Vue.prototype.$XModal = VXETable.modal
 
 
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-Vue.use(VXETable)
-Vue.prototype.$XModal = VXETable.modal
 
 
 // 关闭生产模式下给出的提示
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.config.productionTip = false;